commit 51920adae8fe9e78aa88b896207d61f1cc48401b · knotbin.com/airport

+30 -11

islands/MigrationProgress.tsx

···

       247
        
                 return;

     

       248
        
               }

     

       249
        
       

     

       250
       -
               // If verification succeeds, continue to data migration

     

       251
       -
               await startDataMigration();

     

       252
        
             } catch (error) {

     

       253
        
               updateStepStatus(

     

       254
        
                 0,

     
···

       298
        
               throw new Error("Invalid response from server");

     

       299
        
             }

     

       300
        
       

     

       0
        
       
     

       301
        
             updateStepStatus(2, "verifying");

     

       302
       -
             const verified = await verifyStep(2);

     

       303
        
             if (!verified) {

     

       304
        
               console.log(

     

       305
       -
                 "Identity migration: Verification failed, waiting for user action",

     

       306
        
               );

     

       307
        
               return;

     

       308
        
             }

     

       309
       -
       

     

       310
       -
             // If verification succeeds, continue to finalization

     

       0
        
       
     

       311
        
             await startFinalization();

     

       312
        
           } catch (error) {

     

       313
        
             console.error("Identity migration error:", error);

     
···

       396
        
         };

     

       397
        
       

     

       398
        
         // Helper to verify a step after completion

     

       399
       -
         const verifyStep = async (stepNum: number) => {

     

       400
        
           console.log(`Verification: Starting step ${stepNum + 1}`);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       401
        
           updateStepStatus(stepNum, "verifying");

     

       402
        
           try {

     

       403
        
             console.log(`Verification: Fetching status for step ${stepNum + 1}`);

     
···

       481
        
       

     

       482
        
         const retryVerification = async (stepNum: number) => {

     

       483
        
           console.log(`Retrying verification for step ${stepNum + 1}`);

     

       484
       -
           await verifyStep(stepNum);

     

       0
        
       
     

       0
        
       
     

       485
        
         };

     

       486
        
       

     

       487
        
         const continueAnyway = (stepNum: number) => {

     
···

       601
        
               return;

     

       602
        
             }

     

       603
        
       

     

       604
       -
             // If verification succeeds, continue to next step

     

       605
       -
             await startIdentityMigration();

     

       606
        
           } catch (error) {

     

       607
        
             console.error("Data migration: Error caught:", error);

     

       608
        
             updateStepStatus(

     
···

       616
        
       

     

       617
        
         const startIdentityMigration = async () => {

     

       618
        
           // Step 3: Request Identity Migration

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       619
        
           updateStepStatus(2, "in-progress");

     

       620
        
           console.log("Requesting identity migration...");

     

       621
        
       

     
···

       663
        
                     : step

     

       664
        
                 )

     

       665
        
               );

     

       666
       -
               // Don't continue with migration - wait for token input

     

       0
        
       
     

       0
        
       
     

       667
        
               return;

     

       668
        
             } catch (e) {

     

       669
        
               console.error("Failed to parse identity request response:", e);

···

       247
        
                 return;

     

       248
        
               }

     

       249
        
       

     

       250
       +
               // verifyStep will handle continuing to the next step via continueToNextStep

     

       251
       +
               // No need to call startDataMigration here

     

       252
        
             } catch (error) {

     

       253
        
               updateStepStatus(

     

       254
        
                 0,

     
···

       298
        
               throw new Error("Invalid response from server");

     

       299
        
             }

     

       300
        
       

     

       301
       +
             // Verify the identity migration succeeded

     

       302
        
             updateStepStatus(2, "verifying");

     

       303
       +
             const verified = await verifyStep(2, true); // Pass true to allow verification for manual submission

     

       304
        
             if (!verified) {

     

       305
        
               console.log(

     

       306
       +
                 "Identity migration: Verification failed after token submission",

     

       307
        
               );

     

       308
        
               return;

     

       309
        
             }

     

       310
       +
             

     

       311
       +
             // If verification succeeds, mark as completed and continue

     

       312
       +
             updateStepStatus(2, "completed");

     

       313
        
             await startFinalization();

     

       314
        
           } catch (error) {

     

       315
        
             console.error("Identity migration error:", error);

     
···

       398
        
         };

     

       399
        
       

     

       400
        
         // Helper to verify a step after completion

     

       401
       +
         const verifyStep = async (stepNum: number, isManualSubmission: boolean = false) => {

     

       402
        
           console.log(`Verification: Starting step ${stepNum + 1}`);

     

       403
       +
           

     

       404
       +
           // Skip automatic verification for step 2 (identity migration) unless it's after manual token submission

     

       405
       +
           if (stepNum === 2 && !isManualSubmission) {

     

       406
       +
             console.log(`Verification: Skipping automatic verification for identity migration step`);

     

       407
       +
             return false;

     

       408
       +
           }

     

       409
       +
           

     

       410
        
           updateStepStatus(stepNum, "verifying");

     

       411
        
           try {

     

       412
        
             console.log(`Verification: Fetching status for step ${stepNum + 1}`);

     
···

       490
        
       

     

       491
        
         const retryVerification = async (stepNum: number) => {

     

       492
        
           console.log(`Retrying verification for step ${stepNum + 1}`);

     

       493
       +
           // For identity migration step, pass true if it's after manual submission

     

       494
       +
           const isManualSubmission = stepNum === 2 && steps[2].name === "Enter the token sent to your email to complete identity migration";

     

       495
       +
           await verifyStep(stepNum, isManualSubmission);

     

       496
        
         };

     

       497
        
       

     

       498
        
         const continueAnyway = (stepNum: number) => {

     
···

       612
        
               return;

     

       613
        
             }

     

       614
        
       

     

       615
       +
             // verifyStep will handle continuing to the next step via continueToNextStep

     

       616
       +
             // No need to call startIdentityMigration here

     

       617
        
           } catch (error) {

     

       618
        
             console.error("Data migration: Error caught:", error);

     

       619
        
             updateStepStatus(

     
···

       627
        
       

     

       628
        
         const startIdentityMigration = async () => {

     

       629
        
           // Step 3: Request Identity Migration

     

       630
       +
           // Check if already in progress to prevent duplicate calls

     

       631
       +
           if (steps[2].status === "in-progress" || steps[2].status === "completed") {

     

       632
       +
             console.log("Identity migration already in progress or completed, skipping duplicate call");

     

       633
       +
             return;

     

       634
       +
           }

     

       635
       +
           

     

       636
        
           updateStepStatus(2, "in-progress");

     

       637
        
           console.log("Requesting identity migration...");

     

       638
        
       

     
···

       680
        
                     : step

     

       681
        
                 )

     

       682
        
               );

     

       683
       +
               // Don't verify or continue - wait for token input

     

       684
       +
               // Skip automatic verification for identity migration step

     

       685
       +
               console.log("Identity migration: Waiting for user token input, skipping auto-verification");

     

       686
        
               return;

     

       687
        
             } catch (e) {

     

       688
        
               console.error("Failed to parse identity request response:", e);

+9 -6

routes/api/cred/login.ts

···

       25
        
                 {

     

       26
        
                   status: 400,

     

       27
        
                   headers: { "Content-Type": "application/json" },

     

       28
       -
                 },

     

       29
        
               );

     

       30
        
             }

     

       31
        
       

     

       32
        
             console.log("Resolving handle:", handle);

     

       33
       -
             const did = await resolver.resolveHandleToDid(handle);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
             const service = await resolver.resolveDidToPdsUrl(did);

     

       35
        
             console.log("Resolved service:", service);

     

       36
        
       

     
···

       42
        
                 }),

     

       43
        
                 {

     

       44
        
                   status: 400,

     

       45
       -
                 },

     

       46
        
               );

     

       47
        
             }

     

       48
        
       

     
···

       70
        
                 {

     

       71
        
                   status: 200,

     

       72
        
                   headers: { "Content-Type": "application/json" },

     

       73
       -
                 },

     

       74
        
               );

     

       75
        
       

     

       76
        
               // Create and save our client session with tokens

     
···

       100
        
                 {

     

       101
        
                   status: 401,

     

       102
        
                   headers: { "Content-Type": "application/json" },

     

       103
       -
                 },

     

       104
        
               );

     

       105
        
             }

     

       106
        
           } catch (error) {

     
···

       114
        
               {

     

       115
        
                 status: 500,

     

       116
        
                 headers: { "Content-Type": "application/json" },

     

       117
       -
               },

     

       118
        
             );

     

       119
        
           }

     

       120
        
         },

···

       25
        
                 {

     

       26
        
                   status: 400,

     

       27
        
                   headers: { "Content-Type": "application/json" },

     

       28
       +
                 }

     

       29
        
               );

     

       30
        
             }

     

       31
        
       

     

       32
        
             console.log("Resolving handle:", handle);

     

       33
       +
             const did =

     

       34
       +
               typeof handle == "string" && handle.startsWith("did:")

     

       35
       +
                 ? handle

     

       36
       +
                 : await resolver.resolveHandleToDid(handle);

     

       37
        
             const service = await resolver.resolveDidToPdsUrl(did);

     

       38
        
             console.log("Resolved service:", service);

     

       39
        
       

     
···

       45
        
                 }),

     

       46
        
                 {

     

       47
        
                   status: 400,

     

       48
       +
                 }

     

       49
        
               );

     

       50
        
             }

     

       51
        
       

     
···

       73
        
                 {

     

       74
        
                   status: 200,

     

       75
        
                   headers: { "Content-Type": "application/json" },

     

       76
       +
                 }

     

       77
        
               );

     

       78
        
       

     

       79
        
               // Create and save our client session with tokens

     
···

       103
        
                 {

     

       104
        
                   status: 401,

     

       105
        
                   headers: { "Content-Type": "application/json" },

     

       106
       +
                 }

     

       107
        
               );

     

       108
        
             }

     

       109
        
           } catch (error) {

     
···

       117
        
               {

     

       118
        
                 status: 500,

     

       119
        
                 headers: { "Content-Type": "application/json" },

     

       120
       +
               }

     

       121
        
             );

     

       122
        
           }

     

       123
        
         },