@turnkey/sdk-react 5.0.0 → 5.0.2

package/dist/components/auth/Auth.js

@@ -79,7 +79,6 @@ const Auth = ({
     indexedDbClient,
     turnkey: turnkey$1
   } = useTurnkey.useTurnkey();
-  const [publicKey, setPublicKey] = React.useState("");
   const [email, setEmail] = React.useState("");
   const [phone, setPhone] = React.useState("");
   const [otpId, setOtpId] = React.useState(null);
@@ -99,22 +98,18 @@ const Auth = ({
     }
   };
   React.useEffect(() => {
-    if (indexedDbClient && turnkey$1) {
-      setComponentReady(true);
-      const manageClient = async () => {
-        const session = await turnkey$1.getSession();
-        if (session) {
-          const publicKey = await indexedDbClient.getPublicKey();
-          setPublicKey(publicKey);
+    const manageClient = async () => {
+      if (indexedDbClient && turnkey$1) {
+        const retrievedPublicKey = await indexedDbClient.getPublicKey();
+        if (retrievedPublicKey) {
+          setComponentReady(true);
         } else {
-          await indexedDbClient.resetKeyPair();
-          const publicKey = await indexedDbClient.getPublicKey();
-          setPublicKey(publicKey);
+          onError("Failed to retrieve public key.");
         }
-      };
-      manageClient();
-    }
-  }, [indexedDbClient]);
+      }
+    };
+    manageClient();
+  }, [indexedDbClient, turnkey$1]);
   if (!componentReady) {
     return jsxRuntime.jsx("div", {
       className: Auth_module.default.defaultLoader,
@@ -176,6 +171,7 @@ const Auth = ({
           constants.authErrors.passkey.createFailed;
         }
       }
+      await indexedDbClient.resetKeyPair();
       const pubKey = await indexedDbClient.getPublicKey();
       await passkeyClient?.loginWithPasskey({
         sessionType: exports.SessionType.READ_WRITE,
@@ -191,6 +187,7 @@ const Auth = ({
   const handleLoginWithPasskey = async () => {
     try {
       setLoading("passkey");
+      await indexedDbClient?.resetKeyPair();
       const pubKey = await indexedDbClient.getPublicKey();
       await passkeyClient?.loginWithPasskey({
         sessionType: exports.SessionType.READ_WRITE,
@@ -234,6 +231,10 @@ const Auth = ({
     setLoading(undefined);
   };
   const handleOAuthLogin = async (credential, providerName) => {
+    const pubKey = await indexedDbClient?.getPublicKey();
+    if (!pubKey) {
+      return;
+    }
     setOauthLoading(providerName);
     const createSuborgData = {
       oauthProviders: [{
@@ -258,7 +259,7 @@ const Auth = ({
     const sessionResponse = await sdkServer.server.oauthLogin({
       suborgID: suborgId,
       oidcToken: credential,
-      publicKey: publicKey,
+      publicKey: pubKey,
       sessionLengthSeconds: authConfig.sessionLengthSeconds
     });
     if (sessionResponse && sessionResponse.session) {
@@ -296,6 +297,7 @@ const Auth = ({
         onError(constants.authErrors.wallet.loginFailed);
         return;
       }
+      await indexedDbClient.resetKeyPair();
       const pubKey = await indexedDbClient.getPublicKey();
       await walletClient.loginWithWallet({
         sessionType: exports.SessionType.READ_WRITE,
@@ -343,18 +345,15 @@ const Auth = ({
         layout: layout,
         clientId: authConfig.googleClientId ?? process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID,
         openInPage: authConfig.openOAuthInPage,
-        publicKey: publicKey,
         onSuccess: response => handleOAuthLogin(response.idToken, "Google")
       }), appleEnabled && jsxRuntime.jsx(Apple.default, {
         layout: layout,
         clientId: authConfig.appleClientId ?? process.env.NEXT_PUBLIC_APPLE_CLIENT_ID,
-        publicKey: publicKey,
         openInPage: authConfig.openOAuthInPage,
         onSuccess: response => handleOAuthLogin(response.idToken, "Apple")
       }), facebookEnabled && jsxRuntime.jsx(Facebook.default, {
         layout: layout,
         clientId: authConfig.facebookClientId ?? process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID,
-        publicKey: publicKey,
         openInPage: authConfig.openOAuthInPage,
         onSuccess: response => handleOAuthLogin(response.id_token, "Facebook")
       })]