Fix custom user update reconciliation

vshn · Apr 15, 2024 · 55529f0 · 55529f0
1 parent c9d0cab
commit 55529f0
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/controllers/organization_controller.go b/controllers/organization_controller.go
@@ -278,17 +278,19 @@ func (r *OrganizationReconciler) sync(or *OrganizationReconciliation, instance s
 
 	//create read permission for public user for this organisation
 	roleNameCustomUser := database.Spec.AddUserForNonHiddenGraphs
-	permsCustomUser := getOrganizationPerms(database, org, false, true)
-	err = createDefaultPermissions(stardogClient, auth, roleNameCustomUser, permsCustomUser)
-	if err != nil {
-		r.Log.Error(err, "Adding permission to role failed", "role", roleNameCustomUser, "permission", permsCustomUser)
-		return err
-	}
+	if roleNameCustomUser != "" {
+		permsCustomUser := getOrganizationPerms(database, org, false, true)
+		err = createDefaultPermissions(stardogClient, auth, roleNameCustomUser, permsCustomUser)
+		if err != nil {
+			r.Log.Error(err, "Adding permission to role failed", "role", roleNameCustomUser, "permission", permsCustomUser)
+			return err
+		}
 
-	err = adjustPermissionsForCustomUser(org, database, stardogClient, auth, roleNameCustomUser)
-	if err != nil {
-		r.Log.Error(err, "Cannot remove permissions")
-		return err
+		err = adjustPermissionsForCustomUser(org, database, stardogClient, auth, roleNameCustomUser)
+		if err != nil {
+			r.Log.Error(err, "Cannot remove permissions")
+			return err
+		}
 	}
 
 	return nil