fixed adding new workspace at login
This commit is contained in:
1 parent
e6211d7f5e
commit
62afc94f2f
3 files changed
+69
-2
No files matched your search
+3
-2
@@ -74,6 +74,7 @@ import {
|
||||
createWorkspace,
|
||||
deleteWorkspaceMember,
|
||||
deleteWorkspaceIfEmpty,
|
||||
ensureDefaultWorkspaceForUser,
|
||||
ensurePersonalWorkspaceForUser,
|
||||
findAlternateWorkspaceForUser,
|
||||
getPlatformAdminSummary,
|
||||
@@ -2061,7 +2062,7 @@ app.get('/api/auth/magic-link/verify', async (req: Request, res: Response, next:
|
||||
}
|
||||
|
||||
await claimWorkspaceInvites(user!);
|
||||
const receivingWorkspaceId = await ensurePersonalWorkspaceForUser(user!);
|
||||
const receivingWorkspaceId = await ensureDefaultWorkspaceForUser(user!);
|
||||
const transferCompletion = await completePendingBirdTransfersForOwner(user!.email, receivingWorkspaceId);
|
||||
const memberships = await normalizeWorkspaceMembershipList(user!.id);
|
||||
const activeWorkspaceId = transferCompletion.completed > 0 ? receivingWorkspaceId : memberships[0]?.workspace.id ?? receivingWorkspaceId;
|
||||
@@ -2269,7 +2270,7 @@ const handleOAuthCallback = async (req: Request, res: Response, next: NextFuncti
|
||||
|
||||
await linkAuthAccount(user!.id, providerKey, providerSubject, email);
|
||||
await claimWorkspaceInvites(user!);
|
||||
const activeWorkspaceId = await ensurePersonalWorkspaceForUser(user!);
|
||||
const activeWorkspaceId = await ensureDefaultWorkspaceForUser(user!);
|
||||
await completePendingBirdTransfersForOwner(user!.email, activeWorkspaceId);
|
||||
const { token } = await createAuthSession(user!.id, activeWorkspaceId);
|
||||
const redirectUrl = new URL(oauthState.redirect_to || frontendBaseUrl);
|
||||
|
||||
Reference in new issue
Block a user