commit 5b4accbc94fbc8bc288d83d3da04f07550283223 · knotbin.com/airport

auth/client.ts oauth/client.ts

+1

auth/session.ts oauth/session.ts

···

       28
       28
        
       }

     

       29
       29
        
       

     

       30
       30
        
       const cookieSecret = Deno.env.get("COOKIE_SECRET");

     

       31
       31
       +
       console.log("COOKIE_SECRET", cookieSecret);

     

       31
       32
        
       

     

       32
       33
        
       const sessionOptions: SessionOptions = {

     

       33
       34
        
         cookieName: "sid",

auth/storage.ts oauth/storage.ts

+1 -1

deno.json

···

       1
       1
        
       {

     

       2
       2
        
         "tasks": {

     

       3
       3
        
           "check": "deno fmt --check . && deno lint . && deno check **/*.ts && deno check **/*.tsx",

     

       4
       4
       -
           "dev": "deno run -A --watch=static/,routes/ dev.ts",

     

       4
       4
       +
           "dev": "deno run -A --env --watch=static/,routes/ dev.ts",

     

       5
       5
        
           "build": "deno run -A dev.ts build",

     

       6
       6
        
           "start": "deno run -A main.ts",

     

       7
       7
        
           "update": "deno run -A -r jsr:@fresh/update ."

plugins/id-resolver.ts tools/id-resolver.ts

+2 -2

routes/api/me.ts

···

       1
       1
       -
       import { getSessionAgent } from "../../auth/session.ts";

     

       1
       1
       +
       import { getSessionAgent } from "../../oauth/session.ts";

     

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

     

       3
       3
       -
       import { resolver } from "../../plugins/id-resolver.ts";

     

       3
       3
       +
       import { resolver } from "../../tools/id-resolver.ts";

     

       4
       4
        
       

     

       5
       5
        
       export const handler = define.handlers({

     

       6
       6
        
         async GET(ctx) {

+7 -6

routes/api/oauth/callback.ts

···

       1
       1
       -
       import { oauthClient } from "../../../auth/client.ts";

     

       2
       2
       -
       import { getSession } from "../../../auth/session.ts";

     

       3
       3
       -
       import { Handlers } from "fresh/compat";

     

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

     

       2
       2
       +
       import { getSession } from "../../../oauth/session.ts";

     

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

     

       4
       4
        
       

     

       5
       5
       -
       export const handler: Handlers = {

     

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

     

       6
       6
        
         async GET(ctx) {

     

       7
       7
        
           const req = ctx.req;

     

       8
       8
        
           const url = new URL(req.url);

     

       9
       9
        
           const params = url.searchParams;

     

       10
       10
       +
           const baseUrl = `${url.protocol}//${url.host}`;

     

       10
       11
        
       

     

       11
       12
        
           // Log incoming parameters for debugging

     

       12
       13
        
           console.log("OAuth callback received params:", {

     
···

       59
       60
        
               params: Object.fromEntries(params.entries()),

     

       60
       61
        
             }, "OAuth callback failed");

     

       61
       62
        
       

     

       62
       62
       -
             return Response.redirect("/login/callback?error=auth");

     

       63
       63
       +
             return Response.redirect(`${baseUrl}/login/callback?error=auth`);

     

       63
       64
        
           }

     

       64
       65
        
         },

     

       65
       65
       -
       };

     

       66
       66
       +
       });

+1 -1

routes/api/oauth/initiate.ts

···

       1
       1
        
       import { isValidHandle } from 'npm:@atproto/syntax'

     

       2
       2
       -
       import { oauthClient } from "../../../auth/client.ts";

     

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

     

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

     

       4
       4
        
       

     

       5
       5
        
       function isValidUrl(url: string): boolean {

+2 -2

routes/api/oauth/logout.ts

···

       1
       1
       -
       import { getSession } from "../../../auth/session.ts";

     

       2
       2
       -
       import { oauthClient } from "../../../auth/client.ts";

     

       1
       1
       +
       import { getSession } from "../../../oauth/session.ts";

     

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

     

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

     

       4
       4
        
       

     

       5
       5
        
       export const handler = define.handlers({

+1 -1

routes/api/server/describe.ts

···

       1
       1
        
       

     

       2
       2
        
       import { Agent } from "@atproto/api";

     

       3
       3
       -
       import { getSessionAgent } from "../../../auth/session.ts";

     

       3
       3
       +
       import { getSessionAgent } from "../../../oauth/session.ts";

     

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

     

       5
       5
        
       /**

     

       6
       6
        
        * Describe the server configuration and capabilities

+1 -1

routes/api/server/migrate/create.ts

···

       1
       1
        
       import {

     

       2
       2
        
         getSessionAgent,

     

       3
       3
        
         setMigrationSession,

     

       4
       4
       -
       } from "../../../../auth/session.ts";

     

       4
       4
       +
       } from "../../../../oauth/session.ts";

     

       5
       5
        
       import { Agent } from "@atproto/api";

     

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

     

       7
       7

+1 -1

routes/api/server/migrate/data.ts

···

       2
       2
        
       import {

     

       3
       3
        
         getMigrationSessionAgent,

     

       4
       4
        
         getSessionAgent,

     

       5
       5
       -
       } from "../../../../auth/session.ts";

     

       5
       5
       +
       } from "../../../../oauth/session.ts";

     

       6
       6
        
       

     

       7
       7
        
       export const handler = define.handlers({

     

       8
       8
        
         async POST(ctx) {

+1 -1

routes/api/server/migrate/finalize.ts

···

       1
       1
        
       import {

     

       2
       2
        
         getMigrationSessionAgent,

     

       3
       3
        
         getSessionAgent,

     

       4
       4
       -
       } from "../../../../auth/session.ts";

     

       4
       4
       +
       } from "../../../../oauth/session.ts";

     

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

     

       6
       6
        
       

     

       7
       7
        
       export const handler = define.handlers({

+1 -1

routes/api/server/migrate/identity/request.ts

···

       2
       2
        
         getMigrationSession,

     

       3
       3
        
         getMigrationSessionAgent,

     

       4
       4
        
         getSessionAgent,

     

       5
       5
       -
       } from "../../../../../auth/session.ts";

     

       5
       5
       +
       } from "../../../../../oauth/session.ts";

     

       6
       6
        
       import { Secp256k1Keypair } from "npm:@atproto/crypto";

     

       7
       7
        
       import * as ui8 from "npm:uint8arrays";

     

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

+1 -1

routes/api/server/migrate/identity/sign.ts

···

       2
       2
        
         getMigrationSession,

     

       3
       3
        
         getMigrationSessionAgent,

     

       4
       4
        
         getSessionAgent,

     

       5
       5
       -
       } from "../../../../../auth/session.ts";

     

       5
       5
       +
       } from "../../../../../oauth/session.ts";

     

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

     

       7
       7
        
       

     

       8
       8
        
       export const handler = define.handlers({