diff --git a/infra/dns.ts b/infra/dns.ts index ba29485..7a6c32c 100644 --- a/infra/dns.ts +++ b/infra/dns.ts @@ -1,5 +1,5 @@ export const domain = { - production: 'sivir.tech', - dev: 'dev.sivir.tech', - }[$app.stage] || `${$app.stage}.sivir.tech` + production: 'merlijn.site', + dev: 'dev.merlijn.site', + }[$app.stage] || `${$app.stage}.merlijn.site` diff --git a/infra/secret.ts b/infra/secret.ts index 0da8124..635d28b 100644 --- a/infra/secret.ts +++ b/infra/secret.ts @@ -4,7 +4,7 @@ export const secret = { DATABASE_URL: new sst.Secret('DATABASE_URL'), STRIPE_PUBLIC_KEY: new sst.Secret('STRIPE_PUBLIC_KEY'), STRIPE_SECRET_KEY: new sst.Secret('STRIPE_SECRET_KEY'), - // GITHUB_CLIENT_ID: new sst.Secret('GITHUB_CLIENT_ID'), - // GITHUB_CLIENT_SECRET: new sst.Secret('GITGUB_CLIENT_SECRET'), + GITHUB_CLIENT_ID: new sst.Secret('GITHUB_CLIENT_ID'), + GITHUB_CLIENT_SECRET: new sst.Secret('GITHUB_CLIENT_SECRET'), HONEYPOT_ENCRYPTION_SEED: new sst.Secret('HONEYPOT_ENCRYPTION_SEED'), } diff --git a/infra/www.ts b/infra/www.ts index 513c6e9..b99d574 100644 --- a/infra/www.ts +++ b/infra/www.ts @@ -25,6 +25,8 @@ export const www = new sst.aws.Remix('Remix', { secret.DATABASE_URL, secret.STRIPE_PUBLIC_KEY, secret.STRIPE_SECRET_KEY, + secret.GITHUB_CLIENT_ID, + secret.GITHUB_CLIENT_SECRET, secret.HONEYPOT_ENCRYPTION_SEED, ], }) diff --git a/packages/core/sst-env.d.ts b/packages/core/sst-env.d.ts index 73e680e..75c13d3 100644 --- a/packages/core/sst-env.d.ts +++ b/packages/core/sst-env.d.ts @@ -28,6 +28,14 @@ declare module "sst" { "sender": string "type": "sst.aws.Email" } + "GITHUB_CLIENT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_SECRET": { + "type": "sst.sst.Secret" + "value": string + } "HONEYPOT_ENCRYPTION_SEED": { "type": "sst.sst.Secret" "value": string diff --git a/packages/functions/sst-env.d.ts b/packages/functions/sst-env.d.ts index 73e680e..75c13d3 100644 --- a/packages/functions/sst-env.d.ts +++ b/packages/functions/sst-env.d.ts @@ -28,6 +28,14 @@ declare module "sst" { "sender": string "type": "sst.aws.Email" } + "GITHUB_CLIENT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_SECRET": { + "type": "sst.sst.Secret" + "value": string + } "HONEYPOT_ENCRYPTION_SEED": { "type": "sst.sst.Secret" "value": string diff --git a/packages/www/app/modules/auth/auth.server.ts b/packages/www/app/modules/auth/auth.server.ts index ddddb7f..f7c826e 100644 --- a/packages/www/app/modules/auth/auth.server.ts +++ b/packages/www/app/modules/auth/auth.server.ts @@ -92,8 +92,8 @@ authenticator.use( authenticator.use( new GitHubStrategy( { - clientId: process.env.GITHUB_CLIENT_ID || '', - clientSecret: process.env.GITHUB_CLIENT_SECRET || '', + clientId: Resource.GITHUB_CLIENT_ID.value, + clientSecret: Resource.GITHUB_CLIENT_SECRET.value, redirectURI: `${process.env.HOST_URL}/auth/github/callback`, }, async ({ profile }) => { diff --git a/packages/www/sst-env.d.ts b/packages/www/sst-env.d.ts index 73e680e..75c13d3 100644 --- a/packages/www/sst-env.d.ts +++ b/packages/www/sst-env.d.ts @@ -28,6 +28,14 @@ declare module "sst" { "sender": string "type": "sst.aws.Email" } + "GITHUB_CLIENT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_SECRET": { + "type": "sst.sst.Secret" + "value": string + } "HONEYPOT_ENCRYPTION_SEED": { "type": "sst.sst.Secret" "value": string diff --git a/sst-env.d.ts b/sst-env.d.ts index 73e680e..75c13d3 100644 --- a/sst-env.d.ts +++ b/sst-env.d.ts @@ -28,6 +28,14 @@ declare module "sst" { "sender": string "type": "sst.aws.Email" } + "GITHUB_CLIENT_ID": { + "type": "sst.sst.Secret" + "value": string + } + "GITHUB_CLIENT_SECRET": { + "type": "sst.sst.Secret" + "value": string + } "HONEYPOT_ENCRYPTION_SEED": { "type": "sst.sst.Secret" "value": string