admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "fix(signinup): several issues (#12698)" (#12745)

Browse Source 
This reverts commit 9612a4928d.

(Causes a google auth sign-up issue)
This commit is contained in:
Marie
2025-06-19 18:15:15 +02:00
committed by GitHub
parent b778b6ebad
commit adcf6107e7
5 changed files with 28 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
View File

@ -399,24 +399,23 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
displayName: workspace.displayName,
workspaceUrls: this.domainManagerService.getWorkspaceUrls(workspace),
logo: workspace.logo,
sso:
workspace.workspaceSSOIdentityProviders?.reduce(
(acc, identityProvider) =>
acc.concat(
identityProvider.status === 'Inactive'
? []
: [
{
id: identityProvider.id,
name: identityProvider.name,
issuer: identityProvider.issuer,
type: identityProvider.type,
status: identityProvider.status,
},
],
),
[] as AvailableWorkspace['sso'],
) ?? [],
sso: workspace.workspaceSSOIdentityProviders.reduce(
(acc, identityProvider) =>
acc.concat(
identityProvider.status === 'Inactive'
? []
: [
{
id: identityProvider.id,
name: identityProvider.name,
issuer: identityProvider.issuer,
type: identityProvider.type,
status: identityProvider.status,
},
],
),
[] as AvailableWorkspace['sso'],
),
};
}
@ -440,12 +439,7 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
({ workspace, appToken }) => {
return {
...this.castWorkspaceToAvailableWorkspace(workspace),
...(appToken
? {
personalInviteToken: appToken.value,
inviteHash: workspace.inviteHash,
}
: {}),
...(appToken ? { personalInviteToken: appToken.value } : {}),
};
},
),