Login: fix consent screen, add redirect, remove useless requests

packages/common/api/oauth/index.ts

@@ -157,5 +157,6 @@ export const onOAuthSubmit = (
     method: "post",
     url: `/oauth2/authorize`,
     data: formData,
+    withRedirect: true,
   });
 };

packages/common/utils/axiosClient.js

@@ -121,8 +121,13 @@ class AxiosClient {
   request = (options) => {
     const onSuccess = (response) => {
       const error = this.getResponseError(response);
+
       if (error) throw new Error(error);
 
+      if (response.headers["x-redirect-uri"] && options.withRedirect) {
+        return window.location.replace(response.headers["x-redirect-uri"]);
+      }
+
       if (!response || !response.data || response.isAxiosError) return null;
 
       if (response.data.hasOwnProperty("total"))

packages/login/src/client/components/sub-components/Consent.tsx

@@ -79,24 +79,30 @@ const Consent = ({ oauth, theme, setIsConsentScreen }: IConsentProps) => {
 
   const { t } = useTranslation(["Consent", "Common"]);
 
-  const onAllowClick = () => {
+  const onAllowClick = async () => {
     const clientId = oauth.clientId;
 
     let clientState = oauth.state;
     const scope = oauth.client.scopes;
 
+    if (!clientState) {
+      const getCookie = () => {
         const cookie = document.cookie.split(";");
 
-    if (!clientState) {
-      console.log(document.cookie);
         cookie.forEach((c) => {
-        if (c.includes("client_state")) clientState = c.split("=")[1];
+          if (c.includes("client_state"))
+            clientState = c.replace("client_state=", "").trim();
         });
+      };
+
+      getCookie();
+
+      if (!clientState) await api.oauth.onOAuthLogin();
+
+      getCookie();
     }
 
-    console.log(clientState);
-
-    // api.oauth.onOAuthSubmit(clientId, clientState, scope);
+    await api.oauth.onOAuthSubmit(clientId, clientState, scope);
   };
 
   const onDenyClick = () => {

packages/login/src/server/index.ts

@@ -59,13 +59,12 @@ app.get("*", async (req: ILoginRequest, res: Response, next) => {
   initSSR(headers);
 
   try {
-    const isAuth = await checkIsAuthenticated();
-
     const oauthClientId = (query.client_id as string) || "";
-    const oauthClientState = (query.state as string) || "";
+    let oauthClientState = (query.state as string) || "";
 
     const isOAuth = query.type === "oauth2" && !!oauthClientId;
-    const isConsent = isAuth && isOAuth && oauthClientState;
+
+    const isAuth = await checkIsAuthenticated();
 
     if (isAuth && !isOAuth && url !== "/login/error") {
       res.redirect("/");
@@ -89,7 +88,19 @@ app.get("*", async (req: ILoginRequest, res: Response, next) => {
         isAuth
       );
 
-      oauthState.state = oauthClientState;
+      if (isAuth && !oauthClientState) {
+        const cookieState = headers.cookie
+          ?.split(";")
+          .find((c) => c.includes("client_state"))
+          ?.replace("client_state=", "")
+          .trim();
+
+        if (cookieState) oauthClientState = cookieState;
+      }
+
+      const isConsent = isAuth && isOAuth;
+
+      oauthState.state = oauthClientState || "";
       oauthState.isConsent = !!isConsent;
 
       isCorrectOAuth = !!oauthState?.client.name;

packages/login/src/server/lib/helpers/index.ts

@@ -14,11 +14,7 @@ import { getUser } from "@docspace/common/api/people";
 import { checkIsAuthenticated } from "@docspace/common/api/user";
 import { getClient, getScopeList } from "@docspace/common/api/oauth";
 import { TenantStatus } from "@docspace/common/constants";
-import {
-  IClientProps,
-  INoAuthClientProps,
-  IScope,
-} from "@docspace/common/utils/oauth/interfaces";
+import { IScope } from "@docspace/common/utils/oauth/interfaces";
 
 export const getAssets = (): assetsType => {
   const manifest = fs.readFileSync(