commit 9bda00df9daa891e9a0096145ac68589c5ea1834 · knotbin.com/airport

+28 -6

islands/DidPlcProgress.tsx

···

       206
       206
        
             return;

     

       207
       207
        
           }

     

       208
       208
        
       

     

       209
       209
       -
           updateStepStatus(1, "in-progress");

     

       209
       209
       +
           updateStepStatus(1, "completed");

     

       210
       210
        
           try {

     

       211
       211
       +
             updateStepStatus(2, "in-progress");

     

       211
       212
        
             console.log("Submitting update request with token...");

     

       212
       213
        
             // Send the update request with both key and token

     

       213
       214
        
             const res = await fetch("/api/plc/update", {

     
···

       240
       241
        
             setUpdateResult("PLC update completed successfully!");

     

       241
       242
        
       

     

       242
       243
        
             // Add a delay before marking steps as completed for better UX

     

       243
       243
       -
             updateStepStatus(1, "verifying");

     

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

     

       244
       244
       +
             updateStepStatus(2, "verifying");

     

       245
       245
       +
       

     

       246
       246
       +
             const verifyRes = await fetch("/api/plc/verify", {

     

       247
       247
       +
               method: "POST",

     

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

     

       249
       249
       +
               body: JSON.stringify({

     

       250
       250
       +
                 key: keyJson.publicKeyDid,

     

       251
       251
       +
               }),

     

       252
       252
       +
             });

     

       253
       253
       +
       

     

       254
       254
       +
             const verifyText = await verifyRes.text();

     

       255
       255
       +
             console.log("Verification response:", verifyText);

     

       256
       256
       +
       

     

       257
       257
       +
             let verifyData;

     

       258
       258
       +
             try {

     

       259
       259
       +
               verifyData = JSON.parse(verifyText);

     

       260
       260
       +
             } catch {

     

       261
       261
       +
               throw new Error("Invalid verification response from server");

     

       262
       262
       +
             }

     

       245
       263
        
       

     

       246
       246
       -
             await new Promise((resolve) => setTimeout(resolve, 1500));

     

       247
       247
       -
             updateStepStatus(1, "completed");

     

       264
       264
       +
             if (!verifyRes.ok || !verifyData.success) {

     

       265
       265
       +
               const errorMessage =

     

       266
       266
       +
                 verifyData.message || "Failed to verify PLC update";

     

       267
       267
       +
               console.error("Verification failed:", errorMessage);

     

       268
       268
       +
               throw new Error(errorMessage);

     

       269
       269
       +
             }

     

       248
       270
        
       

     

       249
       249
       -
             await new Promise((resolve) => setTimeout(resolve, 1000));

     

       271
       271
       +
             console.log("Verification successful, marking steps as completed");

     

       250
       272
        
             updateStepStatus(2, "completed");

     

       251
       273
        
           } catch (error) {

     

       252
       274
        
             console.error("Update failed:", error);

+36 -10

routes/api/plc/update.ts

···

       1
       1
        
       import { getSessionAgent } from "../../../lib/sessions.ts";

     

       2
       2
       -
       import { setCredentialSession } from "../../../lib/cred/sessions.ts";

     

       3
       3
       -
       import { Agent } from "@atproto/api";

     

       4
       2
        
       import { define } from "../../../utils.ts";

     

       3
       3
       +
       import * as plc from "@did-plc/lib";

     

       5
       4
        
       

     

       6
       5
        
       /**

     

       7
       6
        
        * Handle PLC update operation

     
···

       40
       39
        
               return new Response("Unauthorized", { status: 401 });

     

       41
       40
        
             }

     

       42
       41
        
       

     

       42
       42
       +
             const session = await agent.com.atproto.server.getSession();

     

       43
       43
       +
             const did = session.data.did;

     

       44
       44
       +
             if (!did) {

     

       45
       45
       +
               console.log("No DID found in session");

     

       46
       46
       +
               return new Response(

     

       47
       47
       +
                 JSON.stringify({

     

       48
       48
       +
                   success: false,

     

       49
       49
       +
                   message: "No DID found in your session",

     

       50
       50
       +
                 }),

     

       51
       51
       +
                 {

     

       52
       52
       +
                   status: 400,

     

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

     

       54
       54
       +
                 }

     

       55
       55
       +
               );

     

       56
       56
       +
             }

     

       57
       57
       +
             console.log("Using agent DID:", did);

     

       58
       58
       +
       

     

       43
       59
        
             // Get recommended credentials first

     

       44
       44
       -
             console.log("Getting recommended credentials...");

     

       45
       45
       -
             const getDidCredentials =

     

       46
       46
       -
               await agent.com.atproto.identity.getRecommendedDidCredentials();

     

       47
       47
       -
             console.log("Got recommended credentials:", {

     

       48
       48
       -
               rotationKeys: getDidCredentials.data.rotationKeys,

     

       49
       49
       -
               hasRotationKeys: !!getDidCredentials.data.rotationKeys?.length,

     

       50
       50
       -
             });

     

       60
       60
       +
             console.log("Getting did:plc document...");

     

       61
       61
       +
             const plcClient = new plc.Client("https://plc.directory");

     

       62
       62
       +
             const didDoc = await plcClient.getDocumentData(did);

     

       63
       63
       +
             if (!didDoc) {

     

       64
       64
       +
               console.log("No DID document found for agent DID");

     

       65
       65
       +
               return new Response(

     

       66
       66
       +
                 JSON.stringify({

     

       67
       67
       +
                   success: false,

     

       68
       68
       +
                   message: "No DID document found for your account",

     

       69
       69
       +
                 }),

     

       70
       70
       +
                 {

     

       71
       71
       +
                   status: 400,

     

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

     

       73
       73
       +
                 }

     

       74
       74
       +
               );

     

       75
       75
       +
             }

     

       76
       76
       +
             console.log("Got DID document:", didDoc);

     

       51
       77
        
       

     

       52
       52
       -
             const rotationKeys = getDidCredentials.data.rotationKeys ?? [];

     

       78
       78
       +
             const rotationKeys = didDoc.rotationKeys ?? [];

     

       53
       79
        
             if (!rotationKeys.length) {

     

       54
       80
        
               console.log("No existing rotation keys found");

     

       55
       81
        
               throw new Error("No rotation keys provided in recommended credentials");

+131

routes/api/plc/verify.ts

···

       1
       1
       +
       import { getSessionAgent } from "../../../lib/sessions.ts";

     

       2
       2
       +
       import { define } from "../../../utils.ts";

     

       3
       3
       +
       import * as plc from "@did-plc/lib";

     

       4
       4
       +
       

     

       5
       5
       +
       /**

     

       6
       6
       +
        * Verify if a rotation key exists in the PLC document

     

       7
       7
       +
        * Body must contain:

     

       8
       8
       +
        * - key: The rotation key to verify

     

       9
       9
       +
        * @param ctx - The context object containing the request and response

     

       10
       10
       +
        * @returns A response object with the verification result

     

       11
       11
       +
        */

     

       12
       12
       +
       export const handler = define.handlers({

     

       13
       13
       +
         async POST(ctx) {

     

       14
       14
       +
           const res = new Response();

     

       15
       15
       +
           try {

     

       16
       16
       +
             const body = await ctx.req.json();

     

       17
       17
       +
             const { key: newKey } = body;

     

       18
       18
       +
             console.log("Request body:", { newKey });

     

       19
       19
       +
       

     

       20
       20
       +
             if (!newKey) {

     

       21
       21
       +
               console.log("Missing key in request");

     

       22
       22
       +
               return new Response("Missing param key in request body", {

     

       23
       23
       +
                 status: 400,

     

       24
       24
       +
               });

     

       25
       25
       +
             }

     

       26
       26
       +
       

     

       27
       27
       +
             const agent = await getSessionAgent(ctx.req, res);

     

       28
       28
       +
             if (!agent) {

     

       29
       29
       +
               console.log("No agent found");

     

       30
       30
       +
               return new Response("Unauthorized", { status: 401 });

     

       31
       31
       +
             }

     

       32
       32
       +
       

     

       33
       33
       +
             const session = await agent.com.atproto.server.getSession();

     

       34
       34
       +
             const did = session.data.did;

     

       35
       35
       +
             if (!did) {

     

       36
       36
       +
               console.log("No DID found in session");

     

       37
       37
       +
               return new Response(

     

       38
       38
       +
                 JSON.stringify({

     

       39
       39
       +
                   success: false,

     

       40
       40
       +
                   message: "No DID found in your session",

     

       41
       41
       +
                 }),

     

       42
       42
       +
                 {

     

       43
       43
       +
                   status: 400,

     

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

     

       45
       45
       +
                 }

     

       46
       46
       +
               );

     

       47
       47
       +
             }

     

       48
       48
       +
             console.log("Using agent DID:", did);

     

       49
       49
       +
       

     

       50
       50
       +
             // Fetch the PLC document to check rotation keys

     

       51
       51
       +
             console.log("Getting did:plc document...");

     

       52
       52
       +
             const plcClient = new plc.Client("https://plc.directory");

     

       53
       53
       +
             const didDoc = await plcClient.getDocumentData(did);

     

       54
       54
       +
             if (!didDoc) {

     

       55
       55
       +
               console.log("No DID document found for agent DID");

     

       56
       56
       +
               return new Response(

     

       57
       57
       +
                 JSON.stringify({

     

       58
       58
       +
                   success: false,

     

       59
       59
       +
                   message: "No DID document found for your account",

     

       60
       60
       +
                 }),

     

       61
       61
       +
                 {

     

       62
       62
       +
                   status: 400,

     

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

     

       64
       64
       +
                 }

     

       65
       65
       +
               );

     

       66
       66
       +
             }

     

       67
       67
       +
             console.log("Got DID document:", didDoc);

     

       68
       68
       +
       

     

       69
       69
       +
             const rotationKeys = didDoc.rotationKeys ?? [];

     

       70
       70
       +
             if (!rotationKeys.length) {

     

       71
       71
       +
               console.log("No existing rotation keys found");

     

       72
       72
       +
               throw new Error("No rotation keys found in did:plc document");

     

       73
       73
       +
             }

     

       74
       74
       +
       

     

       75
       75
       +
             // Check if the key exists in rotation keys

     

       76
       76
       +
             if (rotationKeys.includes(newKey)) {

     

       77
       77
       +
               return new Response(

     

       78
       78
       +
                 JSON.stringify({

     

       79
       79
       +
                   success: true,

     

       80
       80
       +
                   message: "Rotation key exists in PLC document",

     

       81
       81
       +
                 }),

     

       82
       82
       +
                 {

     

       83
       83
       +
                   status: 200,

     

       84
       84
       +
                   headers: {

     

       85
       85
       +
                     "Content-Type": "application/json",

     

       86
       86
       +
                     ...Object.fromEntries(res.headers), // Include session cookie headers

     

       87
       87
       +
                   },

     

       88
       88
       +
                 }

     

       89
       89
       +
               );

     

       90
       90
       +
             }

     

       91
       91
       +
       

     

       92
       92
       +
             // If we get here, the key was not found

     

       93
       93
       +
             return new Response(

     

       94
       94
       +
               JSON.stringify({

     

       95
       95
       +
                 success: false,

     

       96
       96
       +
                 message: "Rotation key not found in PLC document",

     

       97
       97
       +
               }),

     

       98
       98
       +
               {

     

       99
       99
       +
                 status: 404,

     

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

     

       101
       101
       +
               }

     

       102
       102
       +
             );

     

       103
       103
       +
           } catch (error) {

     

       104
       104
       +
             console.error("PLC verification error:", error);

     

       105
       105
       +
             const errorMessage =

     

       106
       106
       +
               error instanceof Error

     

       107
       107
       +
                 ? error.message

     

       108
       108
       +
                 : "Failed to verify rotation key";

     

       109
       109
       +
             console.log("Sending error response:", errorMessage);

     

       110
       110
       +
       

     

       111
       111
       +
             return new Response(

     

       112
       112
       +
               JSON.stringify({

     

       113
       113
       +
                 success: false,

     

       114
       114
       +
                 message: errorMessage,

     

       115
       115
       +
                 error:

     

       116
       116
       +
                   error instanceof Error

     

       117
       117
       +
                     ? {

     

       118
       118
       +
                         name: error.name,

     

       119
       119
       +
                         message: error.message,

     

       120
       120
       +
                         stack: error.stack,

     

       121
       121
       +
                       }

     

       122
       122
       +
                     : String(error),

     

       123
       123
       +
               }),

     

       124
       124
       +
               {

     

       125
       125
       +
                 status: 400,

     

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

     

       127
       127
       +
               }

     

       128
       128
       +
             );

     

       129
       129
       +
           }

     

       130
       130
       +
         },

     

       131
       131
       +
       });