login errors -- nextauth is unable to find secret for some reason??

Smithsonian · Sep 3, 2024 · cab2160 · cab2160
1 parent c2ea0cf
commit cab2160
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/frontend/app/api/auth/[[...nextauth]]/route.ts b/frontend/app/api/auth/[[...nextauth]]/route.ts
@@ -8,9 +8,9 @@ const handler = NextAuth({
   secret: process.env.NEXTAUTH_SECRET as string,
   providers: [
     AzureADProvider({
-      clientId: process.env.AZURE_AD_CLIENT_ID!,
-      clientSecret: process.env.AZURE_AD_CLIENT_SECRET!,
-      tenantId: process.env.AZURE_AD_TENANT_ID!,
+      clientId: process.env.AZURE_AD_DEVELOPMENT_CLIENT_ID!,
+      clientSecret: process.env.AZURE_AD_DEVELOPMENT_CLIENT_SECRET!,
+      tenantId: process.env.AZURE_AD_DEVELOPMENT_TENANT_ID!,
       authorization: { params: { scope: 'openid profile email user.Read' } }
     })
   ],

diff --git a/frontend/app/api/fetchall/[[...slugs]]/route.ts b/frontend/app/api/fetchall/[[...slugs]]/route.ts
@@ -14,6 +14,9 @@ const buildQuery = (schema: string, fetchType: string, plotID?: string, plotCens
              ${schema}.quadrats q ON p.PlotID = q.PlotID
         GROUP BY p.PlotID
             ${plotID && plotID !== 'undefined' && !isNaN(parseInt(plotID)) ? `HAVING p.PlotID = ${plotID}` : ''}`;
+  } else if (fetchType === 'roles') {
+    return `SELECT *
+                 FROM ${schema}.${fetchType}`;
   } else {
     let query = `SELECT *
                  FROM ${schema}.${fetchType}`;

diff --git a/frontend/components/processors/processpersonnel.tsx b/frontend/components/processors/processpersonnel.tsx
@@ -25,7 +25,7 @@ export async function processPersonnel(props: Readonly<SpecialProcessingProps>)
       'roles',
       {
         RoleName: normalizedRole,
-        RoleDescription: rowData.roledescription
+        RoleDescription: rowData.roledescription ?? null
       },
       'RoleID'
     );

diff --git a/frontend/components/validationcard.tsx b/frontend/components/validationcard.tsx
@@ -44,7 +44,8 @@ const ValidationCard: React.FC<ValidationCardProps> = ({ validation, onSaveChang
           transform: isFlipped ? 'rotateY(180deg)' : 'rotateY(0)',
           transition: 'transform 0.6s',
           perspective: 1000,
-          minHeight: 'inherit'
+          minHeight: 'inherit',
+          overflow: 'auto'
         }}
       >
         <Stack direction="row" justifyContent="space-between" alignItems="flex-start">

diff --git a/frontend/next.config.js b/frontend/next.config.js
@@ -22,6 +22,8 @@ const nextConfig = withBundleAnalyzer({
     unoptimized: true // since images are served from public directory
   },
   env: {
+    NEXTAUTH_URL: process.env.NEXTAUTH_URL,
+    NEXTAUTH_SECRET: process.env.NEXTAUTH_SECRET,
     AZURE_SQL_USER: process.env.AZURE_SQL_USER,
     AZURE_SQL_PASSWORD: process.env.AZURE_SQL_PASSWORD,
     AZURE_SQL_SERVER: process.env.AZURE_SQL_SERVER,
@@ -30,7 +32,10 @@ const nextConfig = withBundleAnalyzer({
     AZURE_SQL_CATALOG_SCHEMA: process.env.AZURE_SQL_CATALOG_SCHEMA,
     FG_PAT: process.env.FG_PAT,
     OWNER: process.env.OWNER,
-    REPO: process.env.REPO
+    REPO: process.env.REPO,
+    AZURE_AD_CLIENT_SECRET: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_CLIENT_SECRET : process.env.AZURE_AD_DEVELOPMENT_CLIENT_SECRET,
+    AZURE_AD_CLIENT_ID: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_CLIENT_ID : process.env.AZURE_AD_DEVELOPMENT_CLIENT_ID,
+    AZURE_AD_TENANT_ID: process.env.NODE_ENV === 'production' ? process.env.AZURE_AD_TENANT_ID : process.env.AZURE_AD_DEVELOPMENT_TENANT_ID,
   }
 });