feat: update env vars

Signed-off-by: Roy Scheeren <[email protected]>
StakeNow · Jul 29, 2024 · b90cef9 · b90cef9
1 parent 2feef12
commit b90cef9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 77 deletions.
diff --git a/packages/oidc-bridge/src/main.ts b/packages/oidc-bridge/src/main.ts
@@ -96,7 +96,7 @@ app.post('/signin', async (req, res) => {
   } catch (e) {
     console.log(e)
     return res.redirect(
-      `${process.env.CLIENT_URL}/signin?error=${encodeURIComponent('An error occurred while trying to sign you in')}`,
+      `${process.env.OIDC_PROVIDER_CLIENT_URL}/signin?error=${encodeURIComponent('An error occurred while trying to sign you in')}`,
     )
   }
 })
@@ -129,7 +129,7 @@ app.get('/consent', async (req, res) => {
   } catch (e) {
     console.log(e)
     return res.redirect(
-      `${process.env.CLIENT_URL}/signin?error=${encodeURIComponent('An error occurred while trying to sign you in')}`,
+      `${process.env.OIDC_PROVIDER_CLIENT_URL}/signin?error=${encodeURIComponent('An error occurred while trying to sign you in')}`,
     )
   }
 })

diff --git a/packages/oidc-client/src/sst-env.d.ts b/packages/oidc-client/src/sst-env.d.ts
@@ -1,5 +1,7 @@
 /// <reference types="vite/client" />
-interface ImportMetaEnv {}
+interface ImportMetaEnv {
+  readonly VITE_API_URL: string
+}
 interface ImportMeta {
   readonly env: ImportMetaEnv
-}
+}
diff --git a/packages/oidc-client/stacks/OIDCClient.ts b/packages/oidc-client/stacks/OIDCClient.ts
@@ -14,7 +14,9 @@ export function OIDCClient({ stack }: StackContext) {
     path: './',
     buildOutput: '../../dist/packages/oidc-client',
     buildCommand: 'cd ../../ && npx nx build oidc-client --prod',
-    environment: {},
+    environment: {
+      VITE_API_URL: process.env.VITE_API_URL || 'https://api.signin.siwt.xyz',
+    },
     customDomain: {
       domainName: 'signin.siwt.xyz',
       cdk: {

diff --git a/packages/siwt.xyz/middleware.bak.ts b/packages/siwt.xyz/middleware.bak.ts
diff --git a/packages/siwt.xyz/pages/api/auth/[...nextauth].ts b/packages/siwt.xyz/pages/api/auth/[...nextauth].ts
@@ -30,6 +30,10 @@ export const authOptions: NextAuthOptions = {
   ],
   callbacks: {
     async session({ session, token }) {
+      if (!(session?.user)) {
+        return session
+      }
+
       session.user = {
         ...session.user,
         name: token.sub,

diff --git a/packages/siwt.xyz/stacks/siwt.xyz.ts b/packages/siwt.xyz/stacks/siwt.xyz.ts
@@ -19,6 +19,10 @@ export default function siwtxyz({ stack }: StackContext) {
       ENV: process.env.ENV!,
       NEXTAUTH_URL: process.env.NEXTAUTH_URL!,
       NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET!,
+      NEXT_AUTH_OIDC_ADMIN_URL: process.env.NEXT_AUTH_OIDC_ADMIN_URL!,
+      NEXT_PUBLIC_NEXT_AUTH_CLIENT_ID: process.env.NEXT_PUBLIC_NEXT_AUTH_CLIENT_ID!,
+      NEXT_AUTH_CLIENT_SECRET: process.env.NEXT_AUTH_CLIENT_SECRET!,
+      NEXT_PUBLIC_DAPP_URL: process.env.NEXT_PUBLIC_DAPP_URL!,
     },
   })
 

diff --git a/packages/siwt.xyz/webpack.server.config.js b/packages/siwt.xyz/webpack.server.config.js