Skip adding user to domain account if already exists

Signed-off-by: bcmmbaga <[email protected]>

Author: bcmmbaga

management/server/account.go

@@ -1046,21 +1046,29 @@ func (am *DefaultAccountManager) addNewUserToDomainAccount(ctx context.Context,
 	unlockAccount := am.Store.AcquireWriteLockByUID(ctx, domainAccountID)
 	defer unlockAccount()
 
-	newUser := types.NewRegularUser(userAuth.UserId)
-	newUser.AccountID = domainAccountID
-	err := am.Store.SaveUser(ctx, store.LockingStrengthUpdate, newUser)
+	user, err := am.Store.GetUserByUserID(ctx, store.LockingStrengthShare, userAuth.UserId)
 	if err != nil {
-		return "", err
-	}
+		if sErr, ok := status.FromError(err); ok && sErr.Type() == status.NotFound {
+			newUser := types.NewRegularUser(userAuth.UserId)
+			newUser.AccountID = domainAccountID
+			err = am.Store.SaveUser(ctx, store.LockingStrengthUpdate, newUser)
+			if err != nil {
+				return "", err
+			}
+
+			err = am.addAccountIDToIDPAppMeta(ctx, userAuth.UserId, domainAccountID)
+			if err != nil {
+				return "", err
+			}
+
+			am.StoreEvent(ctx, userAuth.UserId, userAuth.UserId, domainAccountID, activity.UserJoined, nil)
+			return domainAccountID, nil
+		}
 
-	err = am.addAccountIDToIDPAppMeta(ctx, userAuth.UserId, domainAccountID)
-	if err != nil {
 		return "", err
 	}
 
-	am.StoreEvent(ctx, userAuth.UserId, userAuth.UserId, domainAccountID, activity.UserJoined, nil)
-
-	return domainAccountID, nil
+	return user.AccountID, nil
 }
 
 // redeemInvite checks whether user has been invited and redeems the invite