Merge pull request #1303 from brave/master

Production Release 2024-08-06
brave · Aug 6, 2024 · 861f04e · 861f04e
2 parents f82b411 + c9ae2e9
commit 861f04e
Show file tree

Hide file tree

Showing 10 changed files with 231 additions and 128 deletions.
diff --git a/src/auth/hooks/queries/useAuthorize.ts b/src/auth/hooks/queries/useAuthorize.ts
@@ -1,28 +1,22 @@
-import { useEffect, useState } from "react";
+import { useCallback, useState } from "react";
 import { useAuthContext } from "@/auth/context/auth.hook";
-import { authorize, ResponseUser } from "@/auth/lib";
+import { authorize } from "@/auth/lib";
 
 interface Options {
-  variables: {
-    code: string;
-    id: string;
-  };
   onCompleted?: () => void;
   onError?: () => void;
 }
 
-export function useAuthorize({ variables, onCompleted, onError }: Options) {
+export function useAuthorize({ onCompleted, onError }: Options) {
   const { setSessionUser } = useAuthContext();
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string>();
-  const [data, setData] = useState<ResponseUser>();
 
-  useEffect(() => {
-    authorize(variables)
+  const verify = useCallback((code: string, id: string) => {
+    authorize({ code, id })
       .then((data) => {
         if (data) {
           setSessionUser(data);
-          setData(data);
         }
         if (onCompleted) {
           onCompleted();
@@ -40,5 +34,5 @@ export function useAuthorize({ variables, onCompleted, onError }: Options) {
       });
   }, []);
 
-  return { data, loading, error };
+  return { loading, error, verify };
 }
diff --git a/src/auth/lib/index.ts b/src/auth/lib/index.ts
@@ -120,29 +120,30 @@ export const clearCredentials = async (): Promise<void> => {
 };
 
 export const getLink = async (user: { email: string }): Promise<void> => {
-  const encodedEmail = encodeURIComponent(user.email.trim());
-  await fetch(
-    buildAdServerV2Endpoint(`/auth/magic-link?email=${encodedEmail}`),
-    {
-      method: "GET",
-      mode: "cors",
-      credentials: "include",
+  await fetch(buildAdServerV2Endpoint(`/auth/magic-link`), {
+    method: "POST",
+    mode: "cors",
+    credentials: "include",
+    headers: {
+      "Content-Type": "application/json",
     },
-  );
+    body: JSON.stringify({ email: user.email.trim() }),
+  });
 };
 
 export const authorize = async (req: {
   code: string;
   id: string;
 }): Promise<ResponseUser> => {
-  const res = await fetch(
-    buildAdServerV2Endpoint(`/auth/authorize?code=${req.code}&id=${req.id}`),
-    {
-      method: "GET",
-      mode: "cors",
-      credentials: "include",
+  const res = await fetch(buildAdServerV2Endpoint(`/auth/authorize`), {
+    method: "POST",
+    mode: "cors",
+    credentials: "include",
+    headers: {
+      "Content-Type": "application/json",
     },
-  );
+    body: JSON.stringify({ code: req.code, id: req.id }),
+  });
 
   if (!res.ok) {
     throw new Error(t`Invalid Token`);

diff --git a/src/auth/registration/Register.tsx b/src/auth/registration/Register.tsx
@@ -7,8 +7,8 @@ export function Register() {
     <Switch>
       <Route path="/register/browser" component={BrowserRegister} />
       <Route path="/register/complete" component={AdvertiserRegistered} />
-      <Redirect exact={true} from="" to="/register/browser" />
-      <Redirect to="/search" from="/register/search" exact={true} />
+      <Redirect exact from="/register/search" to="/search" />
+      <Redirect exact from="" to="/register/browser" />
     </Switch>
   );
 }
diff --git a/src/auth/views/AuthVerify.tsx b/src/auth/views/AuthVerify.tsx
@@ -1,11 +1,11 @@
 import { AuthContainer } from "@/auth/views/components/AuthContainer";
 import { useAuthorize } from "@/auth/hooks/queries/useAuthorize";
-import { Link as RouterLink, useHistory } from "react-router-dom";
-import { CircularProgress, Link, Stack, Typography } from "@mui/material";
-import VerifiedIcon from "@mui/icons-material/Verified";
-import CancelOutlinedIcon from "@mui/icons-material/CancelOutlined";
+import { Link as RouterLink, Switch, useHistory } from "react-router-dom";
+import { Alert, AlertTitle, Button, Typography } from "@mui/material";
 import { useTrackWithMatomo } from "@/hooks/useTrackWithMatomo";
 import { Trans } from "@lingui/macro";
+import { LoadingButton } from "@mui/lab";
+import logo from "@/assets/images/brave-icon-release-color.svg";
 
 export function AuthVerify() {
   const { trackMatomoEvent } = useTrackWithMatomo({
@@ -14,11 +14,7 @@ export function AuthVerify() {
   const history = useHistory();
   const params = new URLSearchParams(history.location.search);
 
-  const { loading, error } = useAuthorize({
-    variables: {
-      code: params.get("code") ?? "",
-      id: params.get("id") ?? "",
-    },
+  const { loading, error, verify } = useAuthorize({
     onCompleted() {
       history.push("/user/main");
       trackMatomoEvent("magic-link", "verified");
@@ -28,49 +24,61 @@ export function AuthVerify() {
     },
   });
 
+  const id = params.get("id");
+  const code = params.get("code");
+
+  if (!id || !code) {
+    return (
+      <Switch>
+        <RouterLink to="/auth/link" />
+      </Switch>
+    );
+  }
+
   return (
     <AuthContainer>
-      {loading && (
-        <Stack direction="column" alignItems="center" sx={{ mt: 7 }}>
-          <Typography variant="h4" sx={{ mb: 7 }}>
-            <Trans>Logging in</Trans>
-          </Typography>
-
-          <CircularProgress size={100} />
-        </Stack>
-      )}
-      {!loading && !error && (
-        <Stack direction="column" alignItems="center" sx={{ mt: 5 }}>
-          <Typography variant="h4" sx={{ mb: 5 }}>
-            <Trans>Successfully logged in!</Trans>
-          </Typography>
-          <VerifiedIcon sx={{ fontSize: "100px", mb: 5 }} color="success" />
-          <Link
-            variant="h5"
-            component={RouterLink}
-            sx={{ textAlign: "center" }}
-            to="/user/main"
-            replace
-          >
-            <Trans>
-              Not automatically redirected? Click this link to go to the
-              dashboard.
-            </Trans>
-          </Link>
-        </Stack>
-      )}
+      <img src={logo} height={50} />
+      <Typography gutterBottom variant="h6">
+        <Trans>You are logging into the Brave Ads Manager Dashboard.</Trans>
+      </Typography>
+      <Typography gutterBottom variant="subtitle1">
+        <Trans>
+          Click the continue button below to complete the login process.
+        </Trans>
+      </Typography>
+      <LoadingButton
+        loading={loading}
+        disabled={loading || !!error}
+        onClick={() => verify(code, id)}
+        variant="contained"
+        sx={{ mt: 2, pl: 5, pr: 5, borderRadius: "12px", mb: 2 }}
+        size="large"
+      >
+        <Trans>Continue</Trans>
+      </LoadingButton>
       {!loading && error && (
-        <Stack direction="column" alignItems="center" sx={{ mt: 5 }}>
-          <Typography variant="h4" sx={{ textAlign: "center", mb: 5 }}>
-            <Trans>
-              Unable to login, link has expired or has already been used.
-            </Trans>
-          </Typography>
-          <CancelOutlinedIcon sx={{ fontSize: "100px", mb: 5 }} color="error" />
-          <Link variant="h5" component={RouterLink} to="/auth/link" replace>
-            <Trans>Request another link.</Trans>
-          </Link>
-        </Stack>
+        <Alert
+          severity="error"
+          action={
+            <Button
+              variant="outlined"
+              color="inherit"
+              component={RouterLink}
+              to="/auth/link"
+              sx={{ alignSelf: "center" }}
+            >
+              <Trans>Return</Trans>
+            </Button>
+          }
+        >
+          <AlertTitle>
+            <Trans>Unable to login.</Trans>
+          </AlertTitle>
+          <Trans>
+            The magic link you have requested has either expired or has already
+            been used. Please return to the login page and try again.
+          </Trans>
+        </Alert>
       )}
     </AuthContainer>
   );

diff --git a/src/auth/views/MagicLink.tsx b/src/auth/views/MagicLink.tsx
@@ -40,17 +40,21 @@ export function MagicLink() {
           </Trans>
         </Typography>
         <Typography variant="subtitle1">
+          <Trans>Don&rsquo;t see the email?</Trans>
+        </Typography>
+        <Typography variant="subtitle2">
           <Trans>
-            Don&rsquo;t see the email? Check your spam folder or{" "}
+            Check your spam folder or{" "}
             <Link
               sx={{ cursor: "pointer" }}
               variant="inherit"
               onClick={() => {
                 setRequested(false);
               }}
             >
-              try again.
-            </Link>
+              return to the login page
+            </Link>{" "}
+            to try again.
           </Trans>
         </Typography>
       </AuthContainer>

diff --git a/src/auth/views/components/AuthContainer.tsx b/src/auth/views/components/AuthContainer.tsx
@@ -17,7 +17,7 @@ export function AuthContainer({ children, belowCard, aboveCard }: Props) {
       <LandingPageAppBar />
       <Box
         display="flex"
-        maxWidth="725px"
+        maxWidth="750px"
         minWidth={{ xs: "400px", sm: "700px" }}
         flexDirection="column"
         p={1}

diff --git a/src/locales/en.po b/src/locales/en.po