Skip to content

Commit ceacfa7

Browse files
export client metadata domain from config to ensure consistency
1 parent 6e3acf0 commit ceacfa7

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

astro-authproto/src/config-module.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ declare module "fujocoded:authproto/config" {
2525
export const driverName: string;
2626
export const redirectAfterLogin: string;
2727
export const redirectAfterLogout: string;
28+
export const clientMetadataDomain: string;
2829
}
2930

3031
declare module "fujocoded:authproto/stores" {

astro-authproto/src/lib/auth.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { DidResolver } from "@atproto/identity";
88
import {
99
scopes,
1010
applicationName,
11-
externalDomain,
11+
clientMetadataDomain,
1212
} from "fujocoded:authproto/config";
1313

1414
// We import the stores from the virtual module "fujocoded:authproto/stores"
@@ -77,9 +77,7 @@ const createClient = async (domain: string) => {
7777
});
7878
};
7979

80-
const DOMAIN =
81-
process.env.AUTHPROTO_EXTERNAL_DOMAIN ?? externalDomain ?? "http://127.0.0.1:4321/";
82-
export const oauthClient = await createClient(DOMAIN);
80+
export const oauthClient = await createClient(clientMetadataDomain);
8381

8482
const IDENTITY_RESOLVER = new DidResolver({});
8583
export const didToHandle = async (did: string) => {

astro-authproto/src/lib/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,6 @@ export const getConfig = ({ options, isDev }: { options: ConfigOptions, isDev: b
128128
options.redirects?.afterLogout ?? "/"
129129
)};
130130
export const externalDomain = ${JSON.stringify(externalDomain)};
131+
export const clientMetadataDomain = process.env.AUTHPROTO_EXTERNAL_DOMAIN ?? ${JSON.stringify(externalDomain)} ?? "${options.applicationDomain}";
131132
`;
132133
};

astro-authproto/src/routes/oauth-client-metadata.json.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { APIRoute } from "astro";
2-
import { applicationDomain } from "fujocoded:authproto/config";
2+
import { clientMetadataDomain } from "fujocoded:authproto/config";
33
import { createClientMetadata } from "../lib/auth.js";
44

55
export const GET: APIRoute = async ({}) => {
66
return new Response(
7-
JSON.stringify(createClientMetadata(applicationDomain)),
7+
JSON.stringify(createClientMetadata(clientMetadataDomain)),
88
{
99
status: 200,
1010
headers: {

0 commit comments

Comments
 (0)