add user role as service user if empty

controllers/user.go

@@ -1124,6 +1124,9 @@ func userInviteSignUp(w http.ResponseWriter, r *http.Request) {
 		user.PlatformRoleID = userG.PlatformRole
 		user.UserGroups[inviteGroupID] = struct{}{}
 	}
+	if user.PlatformRoleID == "" {
+		user.PlatformRoleID = models.ServiceUser
+	}
 	user.NetworkRoles = make(map[models.NetworkID]map[models.UserRole]struct{})
 	err = logic.CreateUser(&user)
 	if err != nil {

logic/user_mgmt.go

@@ -139,7 +139,7 @@ func GetRole(roleID models.UserRole) (models.UserRolePermissionTemplate, error)
 	// check if role already exists
 	data, err := database.FetchRecord(database.USER_PERMISSIONS_TABLE_NAME, roleID.String())
 	if err != nil {
-		return models.UserRolePermissionTemplate{}, errors.New("role already exists")
+		return models.UserRolePermissionTemplate{}, err
 	}
 	ur := models.UserRolePermissionTemplate{}
 	err = json.Unmarshal([]byte(data), &ur)

pro/auth/azure-ad.go

@@ -107,6 +107,9 @@ func handleAzureCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == "" {
+					user.PlatformRoleID = models.ServiceUser
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

pro/auth/github.go

@@ -107,6 +107,9 @@ func handleGithubCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == "" {
+					user.PlatformRoleID = models.ServiceUser
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

pro/auth/google.go

@@ -108,6 +108,9 @@ func handleGoogleCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == "" {
+					user.PlatformRoleID = models.ServiceUser
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return

pro/auth/oidc.go

@@ -119,6 +119,9 @@ func handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
 					user.PlatformRoleID = userG.PlatformRole
 					user.UserGroups[inviteGroupID] = struct{}{}
 				}
+				if user.PlatformRoleID == "" {
+					user.PlatformRoleID = models.ServiceUser
+				}
 				if err = logic.CreateUser(user); err != nil {
 					handleSomethingWentWrong(w)
 					return