Login:OAuth2: fix deny

packages/common/api/oauth/index.ts

@@ -28,7 +28,7 @@ export const getClient = async (
 
     return {
       ...client,
-      websiteUrl: client.website_url,
+      websiteUrl: client?.website_url || "",
     };
   }
 
@@ -164,6 +164,20 @@ export const onOAuthSubmit = (
   });
 };
 
+export const onOAuthCancel = (clientId: string, clientState: string) => {
+  const formData = new FormData();
+
+  formData.append("client_id", clientId);
+  formData.append("state", clientState);
+
+  return request({
+    method: "post",
+    url: `/oauth2/authorize`,
+    data: formData,
+    withRedirect: true,
+  });
+};
+
 export const getConsentList = async (): Promise<IClientProps[]> => {
   const clients: any = await request({
     method: "get",

packages/login/src/client/components/Login.tsx

@@ -240,8 +240,6 @@ const Login: React.FC<ILoginProps> = ({
   if (!mounted) return <></>;
   if (isRestoringPortal) return <></>;
 
-  console.log(portalSettings);
-
   return (
     <LoginFormWrapper
       id="login-page"

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

@@ -103,16 +103,34 @@ const Consent = ({
         clientState = c.replace("client_state=", "").trim();
     });
 
-    deleteCookie("client_id");
+    console.log(clientState);
-    deleteCookie("client_state");
+
+    // deleteCookie("client_id");
+    // deleteCookie("client_state");
 
     await api.oauth.onOAuthSubmit(clientId, clientState, scope);
   };
 
-  const onDenyClick = () => {
+  const onDenyClick = async () => {
+    const clientId = oauth.clientId;
+
+    let clientState = "";
+
+    setCookie("client_id", clientId);
+
+    await api.oauth.onOAuthLogin();
+
+    const cookie = document.cookie.split(";");
+
+    cookie.forEach((c) => {
+      if (c.includes("client_state"))
+        clientState = c.replace("client_state=", "").trim();
+    });
+
     deleteCookie("client_id");
     deleteCookie("client_state");
-    window.location.href = oauth.client.websiteUrl;
+
+    await api.oauth.onOAuthCancel(clientId, clientState);
   };
 
   const onChangeUserClick = async () => {

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

@@ -221,7 +221,6 @@ const LoginForm: React.FC<ILoginFormProps> = ({
 
     setIsLoading(true);
 
-    console.log(pass, hashSettings);
     const hash = createPasswordHash(pass, hashSettings);
 
     isDesktop && checkPwd();