remove extra logs + add storage server url

torusresearch · Mar 7, 2024 · e63fa62 · e63fa62
1 parent 4cc7638
commit e63fa62
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/handlers/PasskeysHandler.ts b/src/handlers/PasskeysHandler.ts
@@ -1,6 +1,5 @@
 import base64url from "base64url";
 import deepmerge from "lodash.merge";
-import log from "loglevel";
 
 import { LOGIN_TYPE, UX_MODE_TYPE } from "../utils/enums";
 import { fetchDataFromBroadcastServer } from "../utils/sessionHelper";
@@ -24,7 +23,8 @@ export default class WebAuthnHandler extends AbstractLoginHandler {
 
   setFinalUrl(): void {
     const { passkeysHostUrl } = this.customState || {};
-    const finalUrl = passkeysHostUrl ? new URL(passkeysHostUrl) : new URL("https://passkeys.web3auth.io");
+    if (!passkeysHostUrl) throw new Error("Invalid passkeys url.");
+    const finalUrl = new URL(passkeysHostUrl);
     const clonedParams = JSON.parse(JSON.stringify(this.jwtParams || {}));
     const finalJwtParams = deepmerge(
       {
@@ -37,15 +37,13 @@ export default class WebAuthnHandler extends AbstractLoginHandler {
     Object.keys(finalJwtParams).forEach((key) => {
       if (finalJwtParams[key]) finalUrl.searchParams.append(key, finalJwtParams[key]);
     });
-    log.info("final url", finalUrl);
     this.finalURL = finalUrl;
   }
 
-  async getUserInfo(parameters: LoginWindowResponse): Promise<TorusVerifierResponse> {
+  async getUserInfo(parameters: LoginWindowResponse, storageServerUrl?: string): Promise<TorusVerifierResponse> {
     const { idToken, extraParams } = parameters;
 
     const { sessionId } = JSON.parse(base64url.decode(extraParams)) || {};
-    log.info("sessionId", sessionId);
     if (!sessionId) {
       throw new Error("sessionId not found");
     }
@@ -62,7 +60,7 @@ export default class WebAuthnHandler extends AbstractLoginHandler {
       credId,
       transports,
       username,
-    } = await fetchDataFromBroadcastServer<PasskeySessionData>(sessionId);
+    } = await fetchDataFromBroadcastServer<PasskeySessionData>(sessionId, storageServerUrl);
 
     if (signature !== idToken) {
       throw new Error("idtoken should be equal to signature");

diff --git a/src/handlers/interfaces.ts b/src/handlers/interfaces.ts
@@ -68,7 +68,7 @@ export interface ILoginHandler {
   clientId: string;
   nonce: string;
   finalURL: URL;
-  getUserInfo(params: LoginWindowResponse): Promise<TorusVerifierResponse>;
+  getUserInfo(params: LoginWindowResponse, storageServerUrl?: string): Promise<TorusVerifierResponse>;
   handleLoginWindow(params: { locationReplaceOnRedirect?: boolean; popupFeatures?: string }): Promise<LoginWindowResponse>;
 }
 

diff --git a/src/login.ts b/src/login.ts
@@ -58,7 +58,7 @@ class CustomAuth {
     uxMode = UX_MODE.POPUP,
     locationReplaceOnRedirect = false,
     popupFeatures,
-    storageServerUrl = "https://broadcast-server.tor.us",
+    storageServerUrl = "https://session.web3auth.io",
     sentry,
     enableOneKey = false,
     web3AuthClientId,

diff --git a/src/utils/sessionHelper.ts b/src/utils/sessionHelper.ts
@@ -1,11 +1,11 @@
 import { OpenloginSessionManager } from "@toruslabs/openlogin-session-manager";
 import log from "loglevel";
 
-export async function fetchDataFromBroadcastServer<T>(identifier: string) {
+export async function fetchDataFromBroadcastServer<T>(identifier: string, storageServerUrl?: string) {
   try {
     const configManager = new OpenloginSessionManager<T>({
       sessionId: identifier,
-      sessionNamespace: "",
+      sessionServerBaseUrl: storageServerUrl,
     });
 
     const data = await configManager.authorizeSession();