feat: add support for Group and User app role assignments in Azure App

cmd/api/src/services/graphify/azure_convertors.go

@@ -36,6 +36,7 @@ const (
 	ExtractError                  = "failed to extract owner id/type from directory object: %v"
 	PrincipalTypeServicePrincipal = "ServicePrincipal"
 	PrincipalTypeUser             = "User"
+	PrincipalTypeGroup            = "Group"
 )
 
 func getKindConverter(kind enums.Kind) func(json.RawMessage, *ConvertedAzureData, time.Time) {
@@ -212,11 +213,27 @@ func convertAzureAppRoleAssignment(raw json.RawMessage, converted *ConvertedAzur
 
 	if err := json.Unmarshal(raw, &data); err != nil {
 		slog.Error(fmt.Sprintf(SerialError, "app role assignment", err))
-	} else if data.AppId == azure.MSGraphAppUniversalID && data.PrincipalType == PrincipalTypeServicePrincipal {
+		return
+	}
+
+	if data.AppId == azure.MSGraphAppUniversalID && data.PrincipalType == PrincipalTypeServicePrincipal {
 		converted.NodeProps = append(converted.NodeProps, ein.ConvertAzureAppRoleAssignmentToNodes(data)...)
 		if rel := ein.ConvertAzureAppRoleAssignmentToRel(data); rel.IsValid() {
 			converted.RelProps = append(converted.RelProps, rel)
 		}
+		return
+	}
+
+	if data.PrincipalType == PrincipalTypeGroup {
+		if rel := ein.ConvertAzureGroupAppRoleAssignmentToRel(data); rel.IsValid() {
+			converted.RelProps = append(converted.RelProps, rel)
+		}
+	}
+
+	if data.PrincipalType == PrincipalTypeUser {
+		if rel := ein.ConvertAzureUserAppRoleAssignmentToRel(data); rel.IsValid() {
+			converted.RelProps = append(converted.RelProps, rel)
+		}
 	}
 }
 

packages/go/ein/azure.go

@@ -296,6 +296,40 @@ func ConvertAzureAppRoleAssignmentToRel(data models.AppRoleAssignment) Ingestibl
 	)
 }
 
+func ConvertAzureGroupAppRoleAssignmentToRel(data models.AppRoleAssignment) IngestibleRelationship {
+	return NewIngestibleRelationship(
+		IngestibleEndpoint{
+			Value: strings.ToUpper(data.PrincipalId.String()),
+			Kind:  azure.Group,
+		},
+		IngestibleEndpoint{
+			Kind:  azure.App,
+			Value: strings.ToUpper(data.AppId),
+		},
+		IngestibleRel{
+			RelProps: map[string]any{},
+			RelType:  azure.MemberOf,
+		},
+	)
+}
+
+func ConvertAzureUserAppRoleAssignmentToRel(data models.AppRoleAssignment) IngestibleRelationship {
+	return NewIngestibleRelationship(
+		IngestibleEndpoint{
+			Value: strings.ToUpper(data.PrincipalId.String()),
+			Kind:  azure.User,
+		},
+		IngestibleEndpoint{
+			Kind:  azure.App,
+			Value: strings.ToUpper(data.AppId),
+		},
+		IngestibleRel{
+			RelProps: map[string]any{},
+			RelType:  azure.MemberOf,
+		},
+	)
+}
+
 func ConvertAzureFunctionAppToNode(data models.FunctionApp, ingestTime time.Time) IngestibleNode {
 	return IngestibleNode{
 		ObjectID: strings.ToUpper(data.Id),