fix auth circular deps

web/app/api/auth/[...nextauth]/route.ts

@@ -1 +1 @@
-export { GET, POST } from '@/auth';
+export { GET, POST } from '@/app/lib/auth/next'

web/app/lib/actions/auth.ts

@@ -1,6 +1,6 @@
 'use server'
 
-import { signIn, signOut } from '@/auth'
+import { signIn, signOut } from '@/app/lib/auth/next'
 import { AuthError } from 'next-auth'
 
 export async function authenticate(redirectTo?: string) {

web/auth.config.ts → web/app/lib/auth/auth.config.ts

@@ -1,6 +1,6 @@
 import type { NextAuthConfig, Session } from 'next-auth'
 import CognitoProvider from 'next-auth/providers/cognito'
-import { COGNITO_CLIENT_ID, COGNITO_USER_POOL_ID, REGION } from './config'
+import { COGNITO_CLIENT_ID, COGNITO_USER_POOL_ID, REGION } from '@/config'
 import { refreshTokensIfNeeded } from './auth'
 
 if (process.env.NEXTAUTH_URL && process.env.NEXTAUTH_URL.includes('set-me-in-.env')) {

web/auth.ts → web/app/lib/auth/auth.ts

@@ -1,7 +1,6 @@
-import NextAuth, { Session } from 'next-auth'
-import { authConfig } from './auth.config'
+import { COGNITO_CLIENT_ID, COGNITO_DOMAIN_NAME } from '@/config'
+import { Session } from 'next-auth'
 import type { JWT } from 'next-auth/jwt'
-import { COGNITO_CLIENT_ID, COGNITO_DOMAIN_NAME } from './config'
 
 interface CognitoRefreshTokenResult {
   access_token: string
@@ -51,10 +50,3 @@ export const refreshTokensIfNeeded = async (session: Session): Promise<Session>
     refreshToken: refreshedTokens?.refresh_token ?? session.refreshToken, // Fall back to old refresh token
   }
 }
-
-export const {
-  auth,
-  signIn,
-  signOut,
-  handlers: { GET, POST },
-} = NextAuth({ ...authConfig })

web/app/lib/auth/next.ts

@@ -0,0 +1,9 @@
+import NextAuth from 'next-auth'
+import { authConfig } from './auth.config'
+
+export const {
+  auth,
+  signIn,
+  signOut,
+  handlers: { GET, POST },
+} = NextAuth({ ...authConfig })

web/app/lib/ui/Authentication/Authentication.tsx

@@ -1,4 +1,4 @@
-import { auth } from '@/auth'
+import { auth } from '@/app/lib/auth/next'
 import { LoginButton } from './LoginButton'
 import { LogoutButton } from './LogoutButton'
 

web/app/lib/ui/WebHeader/WebHeader.tsx

@@ -1,4 +1,4 @@
-import { auth } from '@/auth'
+import { auth } from '@/app/lib/auth/next'
 import { Authentication } from '../Authentication/Authentication'
 import { WebNavigation } from './WebNavigation'
 

web/middleware.ts

@@ -1,5 +1,5 @@
 import NextAuth from 'next-auth'
-import { authConfig } from './auth.config'
+import { authConfig } from './app/lib/auth/auth.config'
 
 export default NextAuth(authConfig).auth