Merge pull request #543 from dappforce/deploy/basepath

Fix nextauth url paths to include /api/auth
dappforce · Feb 15, 2024 · ff58879 · ff58879
2 parents d7de6c4 + f0fb2e8
commit ff58879
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -173,7 +173,7 @@ jobs:
           file: docker/mainnet-Dockerfile
           push: true
           build-args: |
-            GH_NEXTAUTH_URL=https://grill.so/c
+            GH_NEXTAUTH_URL=https://grill.so/c/api/auth
             GH_NEXT_PUBLIC_BASE_PATH=/c
             GH_NEXT_PUBLIC_SUBSTRATE_URL=https://para.subsocial.network
             GH_NEXT_PUBLIC_SUBSTRATE_WSS=wss://para.subsocial.network

diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -25,6 +25,7 @@ import { GoogleAnalytics } from 'nextjs-google-analytics'
 import NextNProgress from 'nextjs-progressbar'
 import { useEffect, useRef } from 'react'
 import { Toaster } from 'react-hot-toast'
+import urlJoin from 'url-join'
 
 const PWAInstall = dynamic(() => import('@/components/PWAInstall'), {
   ssr: false,
@@ -55,7 +56,11 @@ export default function App(props: AppProps<AppCommonProps>) {
 
   return (
     <SessionProvider
-      basePath={env.NEXT_PUBLIC_BASE_PATH || undefined}
+      basePath={
+        env.NEXT_PUBLIC_BASE_PATH
+          ? urlJoin(env.NEXT_PUBLIC_BASE_PATH, '/api/auth')
+          : undefined
+      }
       session={props.pageProps.session}
     >
       <ConfigProvider>