commit 2f5c846ac8b5de442ecde3be643d3789162ac30a · knotbin.com/airport

+33 -7

main.ts

···

       10
       10
        
       // this can also be defined via a file. feel free to delete this!

     

       11
       11
        
       const authMiddleware = define.middleware(async (ctx) => {

     

       12
       12
        
         const url = new URL(ctx.req.url);

     

       13
       13
       -
         if (url.pathname.startsWith("/migrate")) {

     

       14
       14
       -
           ctx.state.auth = true

     

       13
       13
       +
         const needsAuth = url.pathname.startsWith("/migrate");

     

       14
       14
       +
         

     

       15
       15
       +
         // Skip auth check for login page and API endpoints

     

       16
       16
       +
         if (url.pathname === "/login" || url.pathname.startsWith("/api/")) {

     

       17
       17
       +
           return ctx.next();

     

       15
       18
        
         }

     

       16
       16
       -
         if (ctx.state.auth) {

     

       19
       19
       +
       

     

       20
       20
       +
         try {

     

       17
       21
        
           const me = await fetch(`${url.origin}/api/me`, {

     

       18
       22
        
             credentials: "include",

     

       23
       23
       +
             headers: {

     

       24
       24
       +
               "Cookie": ctx.req.headers.get("cookie") || ""

     

       25
       25
       +
             }

     

       19
       26
        
           });

     

       27
       27
       +
           

     

       28
       28
       +
           console.log("[auth] /api/me response:", {

     

       29
       29
       +
             status: me.status,

     

       30
       30
       +
             statusText: me.statusText,

     

       31
       31
       +
             headers: Object.fromEntries(me.headers.entries())

     

       32
       32
       +
           });

     

       33
       33
       +
       

     

       20
       34
        
           const json = await me.json();

     

       21
       21
       -
           if (json && typeof json === 'object' && json.did) {

     

       22
       22
       -
             return ctx.next();

     

       23
       23
       -
           } else {

     

       35
       35
       +
           console.log("[auth] /api/me response data:", json);

     

       36
       36
       +
       

     

       37
       37
       +
           const isAuthenticated = json && typeof json === 'object' && json.did;

     

       38
       38
       +
           ctx.state.auth = isAuthenticated;

     

       39
       39
       +
           

     

       40
       40
       +
           if (needsAuth && !isAuthenticated) {

     

       41
       41
       +
             console.log("[auth] Authentication required but not authenticated");

     

       24
       42
        
             return ctx.redirect("/login");

     

       25
       43
        
           }

     

       44
       44
       +
       

     

       45
       45
       +
           return ctx.next();

     

       46
       46
       +
         } catch (err) {

     

       47
       47
       +
           console.error("[auth] Middleware error:", err);

     

       48
       48
       +
           ctx.state.auth = false;

     

       49
       49
       +
           if (needsAuth) {

     

       50
       50
       +
             return ctx.redirect("/login");

     

       51
       51
       +
           }

     

       52
       52
       +
           return ctx.next();

     

       26
       53
        
         }

     

       27
       27
       -
         return ctx.next();

     

       28
       54
        
       });

     

       29
       55
        
       app.use(authMiddleware);

     

       30
       56

+41 -13

routes/api/me.ts

···

       7
       7
        
           const req = ctx.req;

     

       8
       8
        
           const res = new Response();

     

       9
       9
        
       

     

       10
       10
       -
           console.log("Cookies:", req.headers.get("cookie"));

     

       10
       10
       +
           try {

     

       11
       11
       +
             console.log("[/api/me] Request headers:", Object.fromEntries(req.headers.entries()));

     

       11
       12
        
       

     

       12
       12
       -
           const agent = await getSessionAgent(req, res);

     

       13
       13
       -
           if (!agent) {

     

       14
       14
       -
             console.log("No agent found");

     

       15
       15
       -
             return Response.json(null);

     

       16
       16
       -
           }

     

       13
       13
       +
             const agent = await getSessionAgent(req, res);

     

       14
       14
       +
             if (!agent) {

     

       15
       15
       +
               console.log("[/api/me] No agent found");

     

       16
       16
       +
               return new Response(JSON.stringify(null), {

     

       17
       17
       +
                 status: 200,

     

       18
       18
       +
                 headers: {

     

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

     

       20
       20
       +
                   "X-Response-Type": "null"

     

       21
       21
       +
                 }

     

       22
       22
       +
               });

     

       23
       23
       +
             }

     

       17
       24
        
       

     

       18
       18
       -
           try {

     

       19
       19
       -
             console.log("Got agent, checking authentication");

     

       25
       25
       +
             console.log("[/api/me] Got agent, checking authentication");

     

       20
       26
        
             const session = await agent.com.atproto.server.getSession();

     

       21
       21
       -
             console.log("Session info:", {

     

       27
       27
       +
             console.log("[/api/me] Session info:", {

     

       22
       28
        
               did: session.data.did,

     

       23
       29
        
               handle: session.data.handle

     

       24
       30
        
             });

     

       25
       31
        
       

     

       26
       32
        
             const handle = await resolver.resolveDidToHandle(session.data.did);

     

       27
       27
       -
             console.log("Resolved handle:", handle);

     

       33
       33
       +
             console.log("[/api/me] Resolved handle:", handle);

     

       28
       34
        
       

     

       29
       29
       -
             return Response.json({

     

       35
       35
       +
             const responseData = {

     

       30
       36
        
               did: session.data.did,

     

       31
       37
        
               handle

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             return new Response(JSON.stringify(responseData), {

     

       41
       41
       +
               status: 200,

     

       42
       42
       +
               headers: {

     

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

     

       44
       44
       +
                 "X-Response-Type": "user"

     

       45
       45
       +
               }

     

       32
       46
        
             });

     

       33
       47
        
           } catch (err) {

     

       34
       48
        
             const message = err instanceof Error ? err.message : String(err);

     

       35
       35
       -
             console.error({ err: message }, "Failed to fetch profile");

     

       36
       36
       -
             return Response.json(null);

     

       49
       49
       +
             console.error("[/api/me] Error:", { 

     

       50
       50
       +
               error: message,

     

       51
       51
       +
               stack: err instanceof Error ? err.stack : undefined,

     

       52
       52
       +
               url: req.url,

     

       53
       53
       +
               method: req.method,

     

       54
       54
       +
               headers: Object.fromEntries(req.headers.entries())

     

       55
       55
       +
             });

     

       56
       56
       +
       

     

       57
       57
       +
             return new Response(JSON.stringify(null), {

     

       58
       58
       +
               status: 200,

     

       59
       59
       +
               headers: {

     

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

     

       61
       61
       +
                 "X-Response-Type": "error",

     

       62
       62
       +
                 "X-Error-Message": encodeURIComponent(message)

     

       63
       63
       +
               }

     

       64
       64
       +
             });

     

       37
       65
        
           }

     

       38
       66
        
         },

     

       39
       67
        
       });