[DPCP-62] Alpha: Consolidate in www. (#28)

* ar(fix) [DPCP-XX]: Consolidate Domain

* ar(fix) [DPCP-XX]: Consolidate Domain

* ar(fix) [DPCP-XX]: update packages

* ar(fix) [DPCP-XX]: update packages

* ar(fix) [DPCP-XX]: update packages

.env.public

@@ -8,8 +8,6 @@
 # @@@ WARNING: DON'T ADD NEXT_PUBLIC_* VARIABLES IF THEY'RE PRIVATE @@@
 
 # env specific
-NEXTAUTH_SECRET=random-string
-NEXTAUTH_URL=http://localhost:3000
 API_HOST_DEV=
 API_HOST=http://localhost:3001
 

lib/auth/constants.ts

@@ -11,7 +11,7 @@ const methods = {
   signIn: () => {},
   signOut: async () => {
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/signout`, {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/v1/auth/signout`, {
         method: 'POST',
         headers: {
           Accept: 'application/json',
@@ -25,21 +25,27 @@ const methods = {
     }
   },
   getCsrf: async () => {
+    console.log('GETTING CSTF');
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/csrf`, { credentials: 'include' });
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/v1/auth/csrf`, {
+        method: 'GET',
+        headers: {
+          Accept: 'application/json',
+        },
+      });
       const csrf = await response.json();
+      console.log({ response, csrf });
       return csrf.csrfToken;
     } catch (e) {
       console.error(e);
     }
   },
   getSession: async (params = { cookies: '' }) => {
     try {
-      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/auth/session`, {
+      const response = await fetch(`${process.env.NEXT_PUBLIC_NEXUS_HOST}/api/v1/auth/session`, {
         method: 'GET',
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json',
           Cookie: params?.cookies,
         },
         credentials: 'include',

next.config.js

@@ -1,7 +1,7 @@
 /** @type {import('next').NextConfig} */
 const { withSentryConfig } = require('@sentry/nextjs');
 const nextConfig = {
-  basePath: process.env.NEXUS_BASE_PATH,
+  assetPrefix: process.env.NEXT_PUBLIC_NEXUS_HOST || 'https://nyx.dreampip.com',
   transpilePackages: ['next-auth'],
   images: {
     remotePatterns: [
@@ -23,6 +23,11 @@ const nextConfig = {
         destination: '/services/rickmorty/list',
         permanent: false,
       },
+      // {
+      //   source: '/signin',
+      //   destination: '/dash/signin',
+      //   permanent: false,
+      // },
     ];
   },
 };

src/app/components/client/elements/signin-view.tsx

@@ -45,5 +45,5 @@ export const VSignIn = ({ user }: VSignInProps) => {
       </div>
     );
 
-  return <DPButton onClick={() => navigate('/api/auth/signin')}>Sign in</DPButton>;
+  return <DPButton onClick={() => navigate('/api/v1/auth/signin')}>Sign in</DPButton>;
 };

src/app/components/client/elements/signup-view.tsx

@@ -45,7 +45,7 @@ export const VSignUp = ({ providers, user }: VSignUpProps) => {
   const oauth = _providers.slice(1, providers.length)
   const defaultP = _providers[0]
 
-  const signInUrl = '/api/auth/signin'
+  const signInUrl = '/api/v1/auth/signin'
 
   const callbackUrl = process.env.NEXT_PUBLIC_NEXUS_BASE_PATH || "/"
 
@@ -54,7 +54,7 @@ export const VSignUp = ({ providers, user }: VSignUpProps) => {
   const coercedName = name || user?.name || user?.email || "Young Padawan";
 
   useEffect(() => {
-      getCsrf().then((_csrf) => setCsrf(_csrf));
+    if(!csrf) getCsrf().then((_csrf) => setCsrf(_csrf));
   }, [csrf]);
 
   useEffect(() => {

src/middleware.ts

@@ -6,10 +6,24 @@ export const config = {
   matcher: ['/api/:path*'],
 };
 
+const headers: Record<string, any> = {
+  // 'Access-Control-Allow-Origin': process.env.MAIN_URL || 'https://alpha.dreampip.com',
+  'Cache-Control': 'maxage=0, s-maxage=300, stale-while-revalidate=300',
+  // DEV-DEBUG:
+  // 'content-type': 'application/json',
+  'Access-Control-Allow-Origin': 'https://beta.dreampip.com',
+  'Access-Control-Allow-Credentials': 'true',
+  'Access-Control-Allow-Headers': '*',
+};
+
 export function middleware(request: NextRequest) {
   const response = NextResponse.next();
   const pkce = request.cookies.get('next-auth.pkce.code_verifier');
 
+  Object.keys(headers).forEach((key: string) => {
+    response.headers.set(key, headers[key]);
+  });
+
   if (pkce?.value) {
     response.cookies.set('next-auth.pkce.code_verifier', pkce.value, {
       httpOnly: true,