···

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

     

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

     

       
14
       
 
       
  

     

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

     

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

     

       
17
       
 
       
    return ctx.next();

     

       
18
       
 
       
  }

     

       
19
       
 
       


     
···

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

     

       
38
       
 
       
    ctx.state.auth = isAuthenticated;

     

       
39
       
 
       
    

     

       
40
       
-
       
    if (needsAuth && !isAuthenticated) {

     

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

     

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

     

       
43
       
 
       
    }

     
···

       
46
       
 
       
  } catch (err) {

     

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

     

       
48
       
 
       
    ctx.state.auth = false;

     

       
49
       
-
       
    if (needsAuth) {

     

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

     

       
51
       
-
       
    }

     

       
52
       
-
       
    return ctx.next();

     

       
53
       
 
       
  }

     

       
54
       
 
       
});

     

       
55
       
 
       
app.use(authMiddleware);

     

···

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

     

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

     

       
14
       
 
       
  

     

       
15
       
+
       
  // Skip auth check if not a protected route

     

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

     

       
17
       
 
       
    return ctx.next();

     

       
18
       
 
       
  }

     

       
19
       
 
       


     
···

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

     

       
38
       
 
       
    ctx.state.auth = isAuthenticated;

     

       
39
       
 
       
    

     

       
40
       
+
       
    if (!isAuthenticated) {

     

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

     

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

     

       
43
       
 
       
    }

     
···

       
46
       
 
       
  } catch (err) {

     

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

     

       
48
       
 
       
    ctx.state.auth = false;

     

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

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
50
       
 
       
  }

     

       
51
       
 
       
});

     

       
52
       
 
       
app.use(authMiddleware);

     

···

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

     

       
0
       
 
       

     

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

     

       
3
       
 
       


     

       
4
       
 
       
export const handler = define.handlers({

     

       
5
       
 
       
  async POST(ctx) {

     

       
6
       
-
       
    await destroyAllSessions(ctx.req)

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
7
       
 
       


     

       
8
       
-
       
    return new Response("All Sessions Destroyed")

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
9
       
 
       
  },

     

       
10
       
 
       
});

     

···

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

     

       
2
       
+
       
import { oauthClient } from "../../lib/oauth/client.ts";

     

       
3
       
 
       
import { define } from "../../utils.ts";

     

       
4
       
 
       


     

       
5
       
 
       
export const handler = define.handlers({

     

       
6
       
 
       
  async POST(ctx) {

     

       
7
       
+
       
    const req = ctx.req;

     

       
8
       
+
       


     

       
9
       
+
       
    try {

     

       
10
       
+
       
      const response = new Response(null, { status: 200 });

     

       
11
       
+
       
      const session = await getSession(req, response);

     

       
12
       
+
       


     

       
13
       
+
       
      if (session.did) {

     

       
14
       
+
       
        // Try to revoke both types of sessions - the one that doesn't exist will just no-op

     

       
15
       
+
       
        await Promise.all([

     

       
16
       
+
       
          oauthClient.revoke(session.did).catch(console.error)

     

       
17
       
+
       
        ]);

     

       
18
       
+
       
        // Then destroy the iron session

     

       
19
       
+
       
        session.destroy();

     

       
20
       
+
       
      }

     

       
21
       
 
       


     

       
22
       
+
       
      return response;

     

       
23
       
+
       
    } catch (error: unknown) {

     

       
24
       
+
       
      const err = error instanceof Error ? error : new Error(String(error));

     

       
25
       
+
       
      console.error("Logout failed:", err.message);

     

       
26
       
+
       
      return new Response("Logout failed", { status: 500 });

     

       
27
       
+
       
    }

     

       
28
       
 
       
  },

     

       
29
       
 
       
});

     

···

       
22
       
 
       
        });

     

       
23
       
 
       
      }

     

       
24
       
 
       


     

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

     

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

     

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

     

       
28
       
-
       
        did: session.data.did,

     

       
29
       
-
       
        handle: session.data.handle

     

       
30
       
-
       
      });

     

       
31
       
 
       


     

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

     

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

     

       
34
       
 
       


     

       
35
       
 
       
      const responseData = {

     

       
36
       
 
       
        did: session.data.did,

     
···

       
46
       
 
       
      });

     

       
47
       
 
       
    } catch (err) {

     

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

     

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

     

       
50
       
 
       
        error: message,

     

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

     

       
52
       
 
       
        url: req.url,

     

···

       
22
       
 
       
        });

     

       
23
       
 
       
      }

     

       
24
       
 
       


     

       
0
       
 
       

     

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

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
26
       
 
       


     

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

     

       
0
       
 
       

     

       
28
       
 
       


     

       
29
       
 
       
      const responseData = {

     

       
30
       
 
       
        did: session.data.did,

     
···

       
40
       
 
       
      });

     

       
41
       
 
       
    } catch (err) {

     

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

     

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

     

       
44
       
 
       
        error: message,

     

       
45
       
 
       
        stack: err instanceof Error ? err.stack : undefined,

     

       
46
       
 
       
        url: req.url,