feat: v3 auth rework - fix #146

openhotel · Nov 25, 2024 · 64f3dad · 64f3dad
1 parent 565337c
commit 64f3dad
Show file tree

Hide file tree

Showing 16 changed files with 82 additions and 82 deletions.
diff --git a/app/client/src/modules/connection/components/ping/index.ts b/app/client/src/modules/connection/components/ping/index.ts
@@ -1,2 +1 @@
-
-export * from './ping.component'
+export * from "./ping.component";
diff --git a/app/client/src/modules/home/components/admin/components/hotels/hotels.module.scss b/app/client/src/modules/home/components/admin/components/hotels/hotels.module.scss
@@ -1,16 +1,14 @@
-
 .hotels {
+  .list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
 
-    .list {
-        display: flex;
-        flex-direction: column;
-        gap: .5rem;
-
-        .item {
-            display: flex;
-            gap: 1rem;
-            background-color: var(--bg);
-            padding: 1rem 2rem;
-        }
+    .item {
+      display: flex;
+      gap: 1rem;
+      background-color: var(--bg);
+      padding: 1rem 2rem;
     }
-}
+  }
+}
diff --git a/app/client/src/modules/home/components/admin/components/tokens/tokens.module.scss b/app/client/src/modules/home/components/admin/components/tokens/tokens.module.scss
@@ -1,16 +1,14 @@
-
 .tokens {
+  .list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
 
-    .list {
-        display: flex;
-        flex-direction: column;
-        gap: .5rem;
-
-        .item {
-            display: flex;
-            gap: 1rem;
-            background-color: var(--bg);
-            padding: 1rem 2rem;
-        }
+    .item {
+      display: flex;
+      gap: 1rem;
+      background-color: var(--bg);
+      padding: 1rem 2rem;
     }
-}
+  }
+}
diff --git a/app/client/src/modules/home/components/admin/components/users/index.ts b/app/client/src/modules/home/components/admin/components/users/index.ts
@@ -1,2 +1 @@
-
-export * from './users.component'
+export * from "./users.component";
diff --git a/app/client/src/modules/home/components/admin/components/users/users.module.scss b/app/client/src/modules/home/components/admin/components/users/users.module.scss
@@ -1,16 +1,14 @@
-
 .users {
+  .list {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
 
-    .list {
-        display: flex;
-        flex-direction: column;
-        gap: .5rem;
-
-        .item {
-            display: flex;
-            gap: 1rem;
-            background-color: var(--bg);
-            padding: 1rem 2rem;
-        }
+    .item {
+      display: flex;
+      gap: 1rem;
+      background-color: var(--bg);
+      padding: 1rem 2rem;
     }
-}
+  }
+}
diff --git a/app/client/src/modules/home/components/connections/connections.module.scss b/app/client/src/modules/home/components/connections/connections.module.scss
@@ -1,4 +1,3 @@
-
 .list {
   display: flex;
   flex-direction: column;

diff --git a/app/client/src/modules/home/components/license/license.module.scss b/app/client/src/modules/home/components/license/license.module.scss
@@ -1,15 +1,14 @@
-
 .container {
-    display: flex;
-    flex-direction: column;
-    gap: .5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
 
-    .license {
-        border-radius: .5rem;
-        padding: .5rem 1rem;
-        background-color: var(--inv-bg);
-        color: var(--bg-main);
-        font-weight: bold;
-        text-align: center;
-    }
-}
+  .license {
+    border-radius: 0.5rem;
+    padding: 0.5rem 1rem;
+    background-color: var(--inv-bg);
+    color: var(--bg-main);
+    font-weight: bold;
+    text-align: center;
+  }
+}
diff --git a/app/client/src/modules/home/components/otp/index.ts b/app/client/src/modules/home/components/otp/index.ts
@@ -1,2 +1 @@
-
-export * from './otp.component'
+export * from "./otp.component";
diff --git a/app/client/src/modules/home/components/otp/otp.module.scss b/app/client/src/modules/home/components/otp/otp.module.scss
@@ -1,10 +1,9 @@
-
 .form {
-    display: flex;
-    flex-direction: column;
-    gap: 1rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
 
-    .qr {
-        max-width: 20rem;
-    }
-}
+  .qr {
+    max-width: 20rem;
+  }
+}
diff --git a/app/client/src/modules/login/login.component.tsx b/app/client/src/modules/login/login.component.tsx
@@ -36,7 +36,7 @@ export const LoginComponent: React.FC = () => {
           setErrorMessage(message);
         });
     },
-    [captchaId, navigate, setSubmittedAt, setErrorMessage]
+    [captchaId, navigate, setSubmittedAt, setErrorMessage],
   );
 
   if (isLogged === null) return <div>Loading...</div>;

diff --git a/app/client/src/modules/register/register.component.tsx b/app/client/src/modules/register/register.component.tsx
@@ -33,7 +33,7 @@ export const RegisterComponent: React.FC = () => {
           setSubmittedAt(performance.now());
         });
     },
-    [captchaId, navigate]
+    [captchaId, navigate],
   );
 
   if (isLogged) return <RedirectComponent to="/" />;

diff --git a/app/client/src/shared/hooks/useAccount.ts b/app/client/src/shared/hooks/useAccount.ts
@@ -41,14 +41,17 @@ export const useAccount = () => {
       Cookies.set("account-id", accountId, {
         expires: refreshTokenDuration,
         sameSite: "strict",
+        secure: true,
       });
       Cookies.set("refresh-token", refreshToken, {
         expires: refreshTokenDuration,
         sameSite: "strict",
+        secure: true,
       });
       Cookies.set("token", token, {
         expires: tokenDuration,
         sameSite: "strict",
+        secure: true,
       });
     },
     [fetch],
@@ -99,14 +102,17 @@ export const useAccount = () => {
     Cookies.set("account-id", accountId, {
       expires: refreshTokenDuration,
       sameSite: "strict",
+      secure: true,
     });
     Cookies.set("refresh-token", refreshToken, {
       expires: refreshTokenDuration,
       sameSite: "strict",
+      secure: true,
     });
     Cookies.set("token", token, {
       expires: tokenDuration,
       sameSite: "strict",
+      secure: true,
     });
   }, [fetch]);
 

diff --git a/app/client/src/shared/hooks/useAdmin.tsx b/app/client/src/shared/hooks/useAdmin.tsx
@@ -74,7 +74,7 @@ export const AdminProvider: React.FunctionComponent<ProviderProps> = ({
       ]);
       return token;
     },
-    [fetch, getAccountHeaders, setTokens]
+    [fetch, getAccountHeaders, setTokens],
   );
 
   const removeToken = useCallback(
@@ -86,7 +86,7 @@ export const AdminProvider: React.FunctionComponent<ProviderProps> = ({
       });
       setTokens((tokens) => tokens.filter((token) => token.id !== id));
     },
-    [fetch, getAccountHeaders, setTokens]
+    [fetch, getAccountHeaders, setTokens],
   );
 
   const fetchHotels = useCallback(async () => {

diff --git a/app/client/src/shared/hooks1/useApi.ts b/app/client/src/shared/hooks1/useApi.ts
@@ -46,16 +46,19 @@ export const useApi = () => {
           Cookies.set("sessionId", data.sessionId, {
             expires: 7,
             sameSite: "strict",
+            secure: true,
           });
           Cookies.set("refreshToken", data.refreshToken, {
             expires: 7,
             sameSite: "strict",
+            secure: true,
           });
           if (data.redirectUrl) setFallbackRedirectUrl(data.redirectUrl);
           else
             Cookies.set("token", data.token, {
               expires: 1,
               sameSite: "strict",
+              secure: true,
             });
           resolve(data);
         })
@@ -87,16 +90,19 @@ export const useApi = () => {
             Cookies.set("sessionId", sessionId, {
               expires: 7,
               sameSite: "strict",
+              secure: true,
             });
             Cookies.set("refreshToken", data.refreshToken, {
               expires: 7,
               sameSite: "strict",
+              secure: true,
             });
             if (data.redirectUrl) setFallbackRedirectUrl(data.redirectUrl);
             else
               Cookies.set("token", data.token, {
                 expires: 1,
                 sameSite: "strict",
+                secure: true,
               });
             return resolve(data);
           }

diff --git a/app/server/src/modules/api/v3/account/misc/bsky.request.ts b/app/server/src/modules/api/v3/account/misc/bsky.request.ts
@@ -14,7 +14,7 @@ export const bskyPostRequest: RequestType = {
         {
           status: 403,
         },
-        { status: 403 }
+        { status: 403 },
       );
 
     const { did } = await request.json();
@@ -24,7 +24,7 @@ export const bskyPostRequest: RequestType = {
         { status: 403 },
         {
           status: 403,
-        }
+        },
       );
     const account = await System.accounts.getFromRequest(request);
 
@@ -39,7 +39,7 @@ export const bskyPostRequest: RequestType = {
       },
       {
         status: 200,
-      }
+      },
     );
   },
 };
diff --git a/app/server/src/modules/api/v3/admin/main.request.ts b/app/server/src/modules/api/v3/admin/main.request.ts
@@ -13,7 +13,7 @@ export const adminPostRequest: RequestType = {
         {
           status: 403,
         },
-        { status: 403 }
+        { status: 403 },
       );
 
     const adminList = await System.admins.getList();
@@ -27,7 +27,7 @@ export const adminPostRequest: RequestType = {
         {
           status: 200,
         },
-        { status: 200 }
+        { status: 200 },
       );
     }
 
@@ -36,7 +36,7 @@ export const adminPostRequest: RequestType = {
         {
           status: 403,
         },
-        { status: 403 }
+        { status: 403 },
       );
 
     const accountId = url.searchParams.get("accountId");
@@ -49,7 +49,7 @@ export const adminPostRequest: RequestType = {
         {
           status: 400,
         },
-        { status: 400 }
+        { status: 400 },
       );
 
     await System.admins.set(accountId);
@@ -58,7 +58,7 @@ export const adminPostRequest: RequestType = {
       {
         status: 200,
       },
-      { status: 200 }
+      { status: 200 },
     );
   },
 };
@@ -73,7 +73,7 @@ export const adminDeleteRequest: RequestType = {
         {
           status: 403,
         },
-        { status: 403 }
+        { status: 403 },
       );
 
     const accountId = url.searchParams.get("accountId");
@@ -82,7 +82,7 @@ export const adminDeleteRequest: RequestType = {
         {
           status: 400,
         },
-        { status: 400 }
+        { status: 400 },
       );
 
     await System.admins.remove(accountId);
@@ -91,7 +91,7 @@ export const adminDeleteRequest: RequestType = {
       {
         status: 200,
       },
-      { status: 200 }
+      { status: 200 },
     );
   },
 };
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@

		export * from './ping.component'
		export * from "./ping.component";
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@

		export * from './users.component'
		export * from "./users.component";
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@

		export * from './otp.component'
		export * from "./otp.component";