Merge pull request #957 from tkhq/ethan/sessionless-stamping-v2

fixed export and handleAddOauth for sessionless stamping

Author: ethankonk

examples/with-sdk-js/src/app/page.tsx

@@ -1904,23 +1904,13 @@ export default function AuthPage() {
           <button
             onClick={async () => {
               try {
-                console.log(
-                  "Fetching wallets for organizationId and userId",
-                  organizationId,
-                  userId,
-                );
-                await turnkey.refreshWallets({
-                  organizationId: organizationId,
-                  userId: userId,
-                  stampWith: StamperType.Passkey,
-                });
-                await turnkey.refreshUser({
-                  organizationId: organizationId,
-                  userId: userId,
-                  stampWith: StamperType.Passkey,
-                });
+                await turnkey.loginWithPasskey();
+                await turnkey.refreshWallets();
+                await turnkey.refreshUser();
               } catch (e) {
                 console.error(e);
+              } finally {
+                await turnkey.clearSession();
               }
             }}
             style={{

packages/react-wallet-kit/src/components/export/Export.tsx

@@ -33,6 +33,8 @@ export function ExportComponent(params: {
   keyFormat?: KeyFormat | undefined;
   stampWith?: StamperType | undefined;
   organizationId?: string;
+  onSuccess: () => void;
+  onError: (error: any) => void;
 }) {
   const {
     exportType,
@@ -41,6 +43,8 @@ export function ExportComponent(params: {
     stampWith,
     target,
     organizationId,
+    onSuccess,
+    onError,
   } = params;
   const { config } = useTurnkey();
 
@@ -92,10 +96,12 @@ export function ExportComponent(params: {
         });
         setExportIframeClient(newExportIframeClient);
       } catch (error) {
-        throw new TurnkeyError(
-          `Error initializing IframeStamper`,
-          TurnkeyErrorCodes.INITIALIZE_IFRAME_ERROR,
-          error,
+        onError(
+          new TurnkeyError(
+            `Error initializing IframeStamper`,
+            TurnkeyErrorCodes.INITIALIZE_IFRAME_ERROR,
+            error,
+          ),
         );
       }
     };
@@ -159,6 +165,7 @@ export function ExportComponent(params: {
           stampWith={stampWith}
           setExportIframeVisible={setExportIframeVisible}
           organizationId={organizationId}
+          onError={onError}
         />
       )}
       <div
@@ -209,7 +216,10 @@ export function ExportComponent(params: {
         <div className="mt-4">
           <ActionButton
             name="export-done"
-            onClick={closeModal}
+            onClick={() => {
+              closeModal();
+              onSuccess();
+            }}
             spinnerClassName="text-primary-text-light dark:text-primary-text-dark"
             className="text-primary-text-light dark:text-primary-text-dark bg-primary-light dark:bg-primary-dark"
           >

packages/react-wallet-kit/src/components/export/ExportWarning.tsx

@@ -28,6 +28,7 @@ export function ExportWarning(props: {
   setExportIframeVisible?: (visible: boolean) => void;
   stampWith?: StamperType | undefined;
   organizationId?: string | undefined;
+  onError: (error: any) => void;
 }) {
   const {
     target,
@@ -36,6 +37,7 @@ export function ExportWarning(props: {
     exportType,
     keyFormat,
     stampWith,
+    onError,
   } = props;
 
   const [isLoading, setIsLoading] = useState(false);
@@ -99,9 +101,11 @@ export function ExportWarning(props: {
                   organizationId,
                 });
                 if (!exportBundle) {
-                  throw new TurnkeyError(
-                    "Failed to retrieve export bundle",
-                    TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                  onError(
+                    new TurnkeyError(
+                      "Failed to retrieve export bundle",
+                      TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                    ),
                   );
                 }
                 await exportIframeClient?.injectWalletExportBundle(
@@ -118,9 +122,11 @@ export function ExportWarning(props: {
                   organizationId,
                 });
                 if (!exportBundle) {
-                  throw new TurnkeyError(
-                    "Failed to retrieve export bundle",
-                    TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                  onError(
+                    new TurnkeyError(
+                      "Failed to retrieve export bundle",
+                      TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                    ),
                   );
                 }
                 await exportIframeClient?.injectKeyExportBundle(
@@ -138,9 +144,11 @@ export function ExportWarning(props: {
                   organizationId,
                 });
                 if (!exportBundle) {
-                  throw new TurnkeyError(
-                    "Failed to retrieve export bundle",
-                    TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                  onError(
+                    new TurnkeyError(
+                      "Failed to retrieve export bundle",
+                      TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                    ),
                   );
                 }
                 await exportIframeClient?.injectKeyExportBundle(
@@ -159,10 +167,12 @@ export function ExportWarning(props: {
               props.setExportIframeVisible(true);
             }
           } catch (error) {
-            throw new TurnkeyError(
-              `Error exporting wallet`,
-              TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
-              error,
+            onError(
+              new TurnkeyError(
+                `Error exporting wallet`,
+                TurnkeyErrorCodes.EXPORT_WALLET_ERROR,
+                error,
+              ),
             );
           } finally {
             setIsLoading(false);