Merge pull request #368 from refly-ai/fix/online-logout

fix(api): enhance cookie management in auth service
refly-ai · Jan 14, 2025 · cd0de5a · cd0de5a
2 parents 9ef0479 + 80ded9f
commit cd0de5a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/apps/api/src/auth/auth.service.ts b/apps/api/src/auth/auth.service.ts
@@ -164,7 +164,11 @@ export class AuthService {
 
     const tokens = await this.login(payload);
     this.setAuthCookie(res, tokens);
-    res.clearCookie(LEGACY_TOKEN_COOKIE);
+    res.clearCookie(LEGACY_TOKEN_COOKIE, {
+      domain: this.configService.get('auth.cookieDomain'),
+      secure: true,
+      sameSite: 'strict',
+    });
   }
 
   setAuthCookie(res: Response, { uid, accessToken, refreshToken }: TokenData) {
@@ -206,6 +210,11 @@ export class AuthService {
         httpOnly: true,
         secure: true,
         sameSite: 'strict',
+      })
+      .clearCookie(LEGACY_TOKEN_COOKIE, {
+        domain: this.configService.get('auth.cookieDomain'),
+        secure: true,
+        sameSite: 'strict',
       });
   }
 

diff --git a/apps/web/index.html b/apps/web/index.html
@@ -44,6 +44,18 @@
       type="font/woff2"
       crossorigin="anonymous" />
   </head>
+  <script
+    async
+    src="https://www.googletagmanager.com/gtag/js?id=G-ER782LXJ5F"></script>
+  <script>
+    window.dataLayer = window.dataLayer || []
+    function gtag() {
+      dataLayer.push(arguments)
+    }
+    gtag("js", new Date())
+
+    gtag("config", "G-ER782LXJ5F")
+  </script>
   <body class="font-inter">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>

diff --git a/packages/ai-workspace-common/src/components/sider-menu-setting-list/index.tsx b/packages/ai-workspace-common/src/components/sider-menu-setting-list/index.tsx
@@ -4,9 +4,7 @@ import { LuSettings, LuLogOut } from 'react-icons/lu';
 import { useUserStore } from '@refly-packages/ai-workspace-common/stores/user';
 import { useSiderStoreShallow } from '@refly-packages/ai-workspace-common/stores/sider';
 import { useLogout } from '@refly-packages/ai-workspace-common/hooks/use-logout';
-
-// styles
-import { AiOutlineTwitter } from 'react-icons/ai';
+import { IconDiscord } from '@refly-packages/ai-workspace-common/components/common/icon';
 
 export const SiderMenuSettingList = (props: { children: React.ReactNode }) => {
   const { t } = useTranslation();
@@ -44,7 +42,7 @@ export const SiderMenuSettingList = (props: { children: React.ReactNode }) => {
     },
     {
       key: 'getHelp',
-      icon: <AiOutlineTwitter />,
+      icon: <IconDiscord />,
       label: t('loggedHomePage.siderMenu.getHelp'),
     },
   ];
@@ -55,7 +53,7 @@ export const SiderMenuSettingList = (props: { children: React.ReactNode }) => {
     } else if (key === 'logout') {
       handleLogout();
     } else if (key === 'getHelp') {
-      window.open(`https://twitter.com/reflyai`, '_blank');
+      window.open(`https://discord.gg/bWjffrb89h`, '_blank');
     }
   };