feat(subdomain): remove lastAuthenticateWorkspace on logout

twentyhq · Nov 7, 2024 · 1866118 · 1866118
1 parent 76438a7
commit 1866118
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx
@@ -21,7 +21,7 @@ import {
   isTwentyHosting,
 } from '~/utils/workspace-url.helper';
 import { lastAuthenticateWorkspaceState } from '@/auth/states/lastAuthenticateWorkspaceState';
-import { useRecoilState } from 'recoil';
+import { useRecoilValue } from 'recoil';
 import { useEffect } from 'react';
 
 const StyledLayout = styled.div`
@@ -73,7 +73,7 @@ export const DefaultLayout = () => {
   const windowsWidth = useScreenSize().width;
   const showAuthModal = useShowAuthModal();
 
-  const [lastAuthenticateWorkspace] = useRecoilState(
+  const lastAuthenticateWorkspace = useRecoilValue(
     lastAuthenticateWorkspaceState,
   );
 

diff --git a/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts b/packages/twenty-front/src/modules/workspace/graphql/mutations/updateWorkspace.ts
@@ -9,6 +9,10 @@ export const UPDATE_WORKSPACE = gql`
       displayName
       logo
       allowImpersonation
+      isPublicInviteLinkEnabled
+      isGoogleAuthEnabled
+      isMicrosoftAuthEnabled
+      isPasswordAuthEnabled
     }
   }
 `;
diff --git a/packages/twenty-front/src/utils/cookie-storage.ts b/packages/twenty-front/src/utils/cookie-storage.ts
@@ -16,9 +16,9 @@ class CookieStorage {
     Cookies.set(key, value, attributes);
   }
 
-  removeItem(key: string): void {
+  removeItem(key: string, attributes?: Cookies.CookieAttributes): void {
     this.keys.delete(key);
-    Cookies.remove(key);
+    Cookies.remove(key, attributes);
   }
 
   clear(): void {

diff --git a/packages/twenty-front/src/utils/recoil-effects.ts b/packages/twenty-front/src/utils/recoil-effects.ts
@@ -40,11 +40,11 @@ export const cookieStorageEffect =
 
     onSet((newValue, _, isReset) => {
       if (!newValue) {
-        cookieStorage.removeItem(key);
+        cookieStorage.removeItem(key, attributes);
         return;
       }
       isReset
-        ? cookieStorage.removeItem(key)
+        ? cookieStorage.removeItem(key, attributes)
         : cookieStorage.setItem(key, JSON.stringify(newValue), {
             expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7),
             ...attributes,