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

[permissions] Fix redirection at sign-up after configuring billing (#10569)

Browse Source 
During sign-up, new users setting new workspaces are required to choose
a billing plan (30-days or 7 days). They are then redirected to
billing.twenty.com to confirm and configure their plan choice.
Then they are quickly redirected to /settings/billing before being
redirected to /create-workspace.

The problem is that even though /create-workspace is not a gated path,
/settings/billing is: it is a path gated by WORKSPACE permission which
has not been granted to the user at this stage. therefore the user is
not redirected to /create-workspace since they do not reach
/settings/billing path but is redirected to the profile page instead.
(To see this feature flag must be removed + billing enabled: you can use
this branch [from this closed
PR](https://github.com/twentyhq/twenty/pull/10570)).

The chosen workaround is to bypass, in the FE, the permission check for
WORKSPACE permission if the workspace's activation status is
PENDING_CREATION. There is no need for any BE change.
This commit is contained in:
Marie
2025-02-28 07:52:28 +01:00
committed by GitHub
parent a3a05c63f6
commit ef7581f4ef
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-front/src/modules/settings/roles/hooks/useHasSettingsPermission.ts
View File

@ -1,16 +1,27 @@
import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState'; import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { WorkspaceActivationStatus } from 'twenty-shared';
import { SettingsPermissions } from '~/generated/graphql'; import { SettingsPermissions } from '~/generated/graphql';
export const useHasSettingsPermission = ( export const useHasSettingsPermission = (
settingsPermission?: SettingsPermissions, settingsPermission?: SettingsPermissions,
) => { ) => {
const currentWorkspace = useRecoilValue(currentWorkspaceState);
const currentUserWorkspace = useRecoilValue(currentUserWorkspaceState); const currentUserWorkspace = useRecoilValue(currentUserWorkspaceState);
if (!settingsPermission) { if (!settingsPermission) {
return true; return true;
} }
if (
settingsPermission === SettingsPermissions.WORKSPACE &&
currentWorkspace?.activationStatus ===
WorkspaceActivationStatus.PENDING_CREATION
) {
return true;
}
const currentUserWorkspaceSettingsPermissions = const currentUserWorkspaceSettingsPermissions =
currentUserWorkspace?.settingsPermissions; currentUserWorkspace?.settingsPermissions;