From 405e452eee6d5b101c204702def0fcaaebca8d0b Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Thu, 6 Jun 2024 16:45:35 +0530
Subject: [PATCH] Simplify

---
 .../accounts/src/pages/passkeys/index.tsx     | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/web/apps/accounts/src/pages/passkeys/index.tsx b/web/apps/accounts/src/pages/passkeys/index.tsx
index a3ddfb6ba1..7465588505 100644
--- a/web/apps/accounts/src/pages/passkeys/index.tsx
+++ b/web/apps/accounts/src/pages/passkeys/index.tsx
@@ -4,37 +4,36 @@ import EnteSpinner from "@ente/shared/components/EnteSpinner";
 import HTTPService from "@ente/shared/network/HTTPService";
 import { LS_KEYS, getData, setData } from "@ente/shared/storage/localStorage";
 import { useRouter } from "next/router";
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 
-const AccountHandoff = () => {
+const Page: React.FC = () => {
     const router = useRouter();
 
     useEffect(() => {
         const urlParams = new URLSearchParams(window.location.search);
+
         const pkg = urlParams.get("package");
-        if (!pkg) return;
-        setData(LS_KEYS.CLIENT_PACKAGE, { name: pkg });
-        HTTPService.setHeaders({
-            "X-Client-Package": pkg,
-        });
-
-        try {
-            const urlParams = new URLSearchParams(window.location.search);
-            const token = urlParams.get("token");
-            if (!token) {
-                throw new Error("token not found");
-            }
-
-            const user = getData(LS_KEYS.USER) || {};
-            user.token = token;
-
-            setData(LS_KEYS.USER, user);
-
-            router.push("/passkeys/setup");
-        } catch (e) {
-            log.error("Failed to deserialize and set passed user data", e);
-            router.push("/login");
+        if (pkg) {
+            // TODO-PK: mobile is not passing it. is that expected?
+            setData(LS_KEYS.CLIENT_PACKAGE, { name: pkg });
+            HTTPService.setHeaders({
+                "X-Client-Package": pkg,
+            });
         }
+
+        const token = urlParams.get("token");
+        if (!token) {
+            log.error("Missing accounts token");
+            router.push("/login");
+            return;
+        }
+
+        const user = getData(LS_KEYS.USER) || {};
+        user.token = token;
+
+        setData(LS_KEYS.USER, user);
+
+        router.push("/passkeys/setup");
     }, []);
 
     return (
@@ -44,4 +43,4 @@ const AccountHandoff = () => {
     );
 };
 
-export default AccountHandoff;
+export default Page;