feat(api): Refactor next auth configuration for logging.

lowdefy · Jun 14, 2023 · 5d04948 · 5d04948
1 parent e3fea46
commit 5d04948
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 61 deletions.
diff --git a/packages/api/src/routes/auth/callbacks/addUserFieldsToSession.js b/packages/api/src/routes/auth/callbacks/addUserFieldsToSession.js
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-function addUserFieldsToSession(context, { session, token, authConfig, user }) {
+function addUserFieldsToSession({ session, token, authConfig, user }) {
   if (token) {
     Object.keys(authConfig.userFields).forEach((fieldName) => {
       session.user[fieldName] = token[fieldName];

diff --git a/packages/api/src/routes/auth/callbacks/addUserFieldsToToken.js b/packages/api/src/routes/auth/callbacks/addUserFieldsToToken.js
@@ -15,15 +15,14 @@
 */
 import { get } from '@lowdefy/helpers';
 
-function addUserFieldsToToken(context, { account, authConfig, profile, token, user }) {
-  // const { debug } = context.logger;
+function addUserFieldsToToken({ account, authConfig, logger, profile, token, user }) {
   const objects = { account, profile, user };
   // TODO: Add when debug is fixed.
-  // debug('Adding userFields to user. Available provider data is:');
-  // debug(objects);
+  // logger.debug('Adding userFields to user. Available provider data is:');
+  // logger.debug(objects);
   Object.entries(authConfig.userFields).forEach(([lowdefyFieldName, providerFieldName]) => {
     const value = get(objects, providerFieldName);
-    // debug(
+    // logger.debug(
     //   `Adding provider field "${providerFieldName}" with value ${JSON.stringify(
     //     value
     //   )} as "${lowdefyFieldName}"`

diff --git a/packages/api/src/routes/auth/callbacks/createCallbacks.js b/packages/api/src/routes/auth/callbacks/createCallbacks.js
@@ -19,17 +19,17 @@ import createRedirectCallback from './createRedirectCallback.js';
 import createSessionCallback from './createSessionCallback.js';
 import createSignInCallback from './createSignInCallback.js';
 
-function createCallbacks(context, { authConfig, plugins }) {
+function createCallbacks({ authConfig, logger, plugins }) {
   const callbacks = {
-    session: createSessionCallback(context, { authConfig, plugins }),
+    session: createSessionCallback({ authConfig, plugins }),
   };
-  const jwt = createJWTCallback(context, { authConfig, plugins });
+  const jwt = createJWTCallback({ authConfig, logger, plugins });
   if (jwt) callbacks.jwt = jwt;
 
-  const redirect = createRedirectCallback(context, { authConfig, plugins });
+  const redirect = createRedirectCallback({ authConfig, plugins });
   if (redirect) callbacks.redirect = redirect;
 
-  const signIn = createSignInCallback(context, { authConfig, plugins });
+  const signIn = createSignInCallback({ authConfig, plugins });
   if (signIn) callbacks.signIn = signIn;
 
   return callbacks;

diff --git a/packages/api/src/routes/auth/callbacks/createJWTCallback.js b/packages/api/src/routes/auth/callbacks/createJWTCallback.js
@@ -17,7 +17,7 @@
 import addUserFieldsToToken from './addUserFieldsToToken.js';
 import createCallbackPlugins from './createCallbackPlugins.js';
 
-function createJWTCallback(context, { authConfig, plugins }) {
+function createJWTCallback({ authConfig, logger, plugins }) {
   const jwtCallbackPlugins = createCallbackPlugins({
     authConfig,
     plugins,
@@ -75,7 +75,7 @@ function createJWTCallback(context, { authConfig, plugins }) {
 
     if (profile || user) {
       if (authConfig.userFields) {
-        addUserFieldsToToken(context, { authConfig, account, profile, token, user });
+        addUserFieldsToToken({ authConfig, account, logger, profile, token, user });
       }
     }
 

diff --git a/packages/api/src/routes/auth/callbacks/createRedirectCallback.js b/packages/api/src/routes/auth/callbacks/createRedirectCallback.js
@@ -16,7 +16,7 @@
 
 import createCallbackPlugins from './createCallbackPlugins.js';
 
-function createRedirectCallback(context, { authConfig, plugins }) {
+function createRedirectCallback({ authConfig, plugins }) {
   const redirectCallbackPlugins = createCallbackPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/callbacks/createSessionCallback.js b/packages/api/src/routes/auth/callbacks/createSessionCallback.js
@@ -17,7 +17,7 @@
 import addUserFieldsToSession from './addUserFieldsToSession.js';
 import createCallbackPlugins from './createCallbackPlugins.js';
 
-function createSessionCallback(context, { authConfig, plugins }) {
+function createSessionCallback({ authConfig, plugins }) {
   const sessionCallbackPlugins = createCallbackPlugins({
     authConfig,
     plugins,
@@ -74,7 +74,7 @@ function createSessionCallback(context, { authConfig, plugins }) {
     }
 
     if (authConfig.userFields) {
-      addUserFieldsToSession(context, { authConfig, session, token, user });
+      addUserFieldsToSession({ authConfig, session, token, user });
     }
 
     for (const plugin of sessionCallbackPlugins) {

diff --git a/packages/api/src/routes/auth/callbacks/createSignInCallback.js b/packages/api/src/routes/auth/callbacks/createSignInCallback.js
@@ -16,7 +16,7 @@
 
 import createCallbackPlugins from './createCallbackPlugins.js';
 
-function createSignInCallback(context, { authConfig, plugins }) {
+function createSignInCallback({ authConfig, plugins }) {
   const signInCallbackPlugins = createCallbackPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/createAdapter.js b/packages/api/src/routes/auth/createAdapter.js
@@ -14,7 +14,7 @@
   limitations under the License.
 */
 
-function createAdapter(context, { authConfig, plugins }) {
+function createAdapter({ authConfig, plugins }) {
   const adapterConfig = authConfig.adapter;
 
   if (!adapterConfig) {

diff --git a/packages/api/src/routes/auth/createProviders.js b/packages/api/src/routes/auth/createProviders.js
@@ -19,7 +19,7 @@
 // This depends on providerId, which might cause some issues if users copy an example and change the id.
 // We need to allow users to configure ids, since they might have more than one of the same type.
 
-function createProviders(context, { authConfig, plugins }) {
+function createProviders({ authConfig, plugins }) {
   return authConfig.providers.map((providerConfig) =>
     plugins.providers[providerConfig.type]({
       ...providerConfig.properties,

diff --git a/packages/api/src/routes/auth/events/createCreateUserEvent.js b/packages/api/src/routes/auth/events/createCreateUserEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createCreateUserEvent(context, { authConfig, plugins }) {
+function createCreateUserEvent({ authConfig, plugins }) {
   const createUserPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/events/createEvents.js b/packages/api/src/routes/auth/events/createEvents.js
@@ -21,25 +21,25 @@ import createSignInEvent from './createSignInEvent.js';
 import createSignOutEvent from './createSignOutEvent.js';
 import createUpdateUserEvent from './createUpdateUserEvent.js';
 
-function createEvents(context, { authConfig, plugins }) {
+function createEvents({ authConfig, logger, plugins }) {
   const events = {};
 
-  const createUser = createCreateUserEvent(context, { authConfig, plugins });
+  const createUser = createCreateUserEvent({ authConfig, plugins });
   if (createUser) events.createUser = createUser;
 
-  const linkAccount = createLinkAccountEvent(context, { authConfig, plugins });
+  const linkAccount = createLinkAccountEvent({ authConfig, plugins });
   if (linkAccount) events.linkAccount = linkAccount;
 
-  const session = createSessionEvent(context, { authConfig, plugins });
+  const session = createSessionEvent({ authConfig, plugins });
   if (session) events.session = session;
 
-  const signIn = createSignInEvent(context, { authConfig, plugins });
+  const signIn = createSignInEvent({ authConfig, plugins });
   if (signIn) events.signIn = signIn;
 
-  const signOut = createSignOutEvent(context, { authConfig, plugins });
+  const signOut = createSignOutEvent({ authConfig, plugins });
   if (signOut) events.signOut = signOut;
 
-  const updateUser = createUpdateUserEvent(context, { authConfig, plugins });
+  const updateUser = createUpdateUserEvent({ authConfig, plugins });
   if (updateUser) events.updateUser = updateUser;
 
   return events;

diff --git a/packages/api/src/routes/auth/events/createLinkAccountEvent.js b/packages/api/src/routes/auth/events/createLinkAccountEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createLinkAccountEvent(context, { authConfig, plugins }) {
+function createLinkAccountEvent({ authConfig, plugins }) {
   const linkAccountPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/events/createSessionEvent.js b/packages/api/src/routes/auth/events/createSessionEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createSessionEvent(context, { authConfig, plugins }) {
+function createSessionEvent({ authConfig, plugins }) {
   const sessionPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/events/createSignInEvent.js b/packages/api/src/routes/auth/events/createSignInEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createSignInEvent(context, { authConfig, plugins }) {
+function createSignInEvent({ authConfig, plugins }) {
   const signInPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/events/createSignOutEvent.js b/packages/api/src/routes/auth/events/createSignOutEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createSignOutEvent(context, { authConfig, plugins }) {
+function createSignOutEvent({ authConfig, plugins }) {
   const signInPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/events/createUpdateUserEvent.js b/packages/api/src/routes/auth/events/createUpdateUserEvent.js
@@ -16,7 +16,7 @@
 
 import createEventPlugins from './createEventPlugins.js';
 
-function createUpdateUserEvent(context, { authConfig, plugins }) {
+function createUpdateUserEvent({ authConfig, plugins }) {
   const updateUserPlugins = createEventPlugins({
     authConfig,
     plugins,

diff --git a/packages/api/src/routes/auth/getNextAuthConfig.js b/packages/api/src/routes/auth/getNextAuthConfig.js
@@ -15,7 +15,6 @@
 */
 
 import { ServerParser } from '@lowdefy/operators';
-import { getSecretsFromEnv } from '@lowdefy/node-utils';
 import { _secret } from '@lowdefy/operators-js/operators/server';
 
 import createAdapter from './createAdapter.js';
@@ -26,11 +25,10 @@ import createProviders from './createProviders.js';
 const nextAuthConfig = {};
 let initialized = false;
 
-function getNextAuthConfig(context, { authJson, plugins }) {
+function getNextAuthConfig({ authJson, logger, plugins, secrets }) {
+  // TODO: What about different loggers;
   if (initialized) return nextAuthConfig;
-  const secrets = getSecretsFromEnv();
 
-  // TODO: Add logger
   const operatorsParser = new ServerParser({
     operators: { _secret },
     payload: {},
@@ -47,10 +45,10 @@ function getNextAuthConfig(context, { authJson, plugins }) {
     throw new Error(operatorErrors[0]);
   }
 
-  nextAuthConfig.adapter = createAdapter(context, { authConfig, plugins });
-  nextAuthConfig.callbacks = createCallbacks(context, { authConfig, plugins });
-  nextAuthConfig.events = createEvents(context, { authConfig, plugins });
-  nextAuthConfig.providers = createProviders(context, { authConfig, plugins });
+  nextAuthConfig.adapter = createAdapter({ authConfig, plugins });
+  nextAuthConfig.callbacks = createCallbacks({ authConfig, logger, plugins });
+  nextAuthConfig.events = createEvents({ authConfig, logger, plugins });
+  nextAuthConfig.providers = createProviders({ authConfig, plugins });
 
   nextAuthConfig.session = authConfig.session;
   nextAuthConfig.theme = authConfig.theme;

diff --git a/packages/server/lib/auth/getAuthOptions.js b/packages/server/lib/auth/getAuthOptions.js
@@ -0,0 +1,35 @@
+/*
+  Copyright 2020-2023 Lowdefy, Inc
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+import { getNextAuthConfig } from '@lowdefy/api';
+import { getSecretsFromEnv } from '@lowdefy/node-utils';
+
+import adapters from '../../build/plugins/auth/adapters.js';
+import authJson from '../../build/auth.json';
+import callbacks from '../../build/plugins/auth/callbacks.js';
+import events from '../../build/plugins/auth/events.js';
+import providers from '../../build/plugins/auth/providers.js';
+
+function getAuthOptions({ logger }) {
+  return getNextAuthConfig({
+    authJson,
+    logger,
+    plugins: { adapters, callbacks, events, providers },
+    secrets: getSecretsFromEnv(),
+  });
+}
+
+export default getAuthOptions;
diff --git a/packages/server/lib/auth/getServerSession.js b/packages/server/lib/auth/getServerSession.js
@@ -15,12 +15,13 @@
 */
 
 import { getServerSession as getNextAuthServerSession } from 'next-auth/next';
-import { authOptions } from '../../pages/api/auth/[...nextauth].js';
+
 import authJson from '../../build/auth.json';
+import getAuthOptions from './getAuthOptions.js';
 
-function getServerSession({ req, res }) {
+function getServerSession({ req, res, logger }) {
   if (authJson.configured === true) {
-    return getNextAuthServerSession(req, res, authOptions);
+    return getNextAuthServerSession(req, res, getAuthOptions({ logger }));
   }
   return undefined;
 }

diff --git a/packages/server/pages/api/auth/[...nextauth].js b/packages/server/pages/api/auth/[...nextauth].js
@@ -14,36 +14,22 @@
   limitations under the License.
 */
 
+import crypto from 'crypto';
 import NextAuth from 'next-auth';
-import { createApiContext, getNextAuthConfig } from '@lowdefy/api';
 
-import adapters from '../../../build/plugins/auth/adapters.js';
+import getAuthOptions from './../../../lib/auth/getAuthOptions.js';
 import authJson from '../../../build/auth.json';
-import callbacks from '../../../build/plugins/auth/callbacks.js';
-import config from '../../../build/config.json';
-import events from '../../../build/plugins/auth/events.js';
-import fileCache from '../../../lib/fileCache.js';
-import providers from '../../../build/plugins/auth/providers.js';
-
 import createLogger from '../../../lib/log/createLogger.js';
 
-export const authOptions = getNextAuthConfig(
-  createApiContext({
-    config,
-    fileCache,
-    logger: createLogger(),
-  }),
-  { authJson, plugins: { adapters, callbacks, events, providers } }
-);
-
 export default async function auth(req, res) {
+  const logger = createLogger({ traceId: crypto.randomUUID() });
   if (authJson.configured === true) {
     // Required for emails in corporate networks, see:
     // https://next-auth.js.org/tutorials/avoid-corporate-link-checking-email-provider
     if (req.method === 'HEAD') {
       return res.status(200).end();
     }
-    return await NextAuth(req, res, authOptions);
+    return await NextAuth(req, res, getAuthOptions({ logger }));
   }
 
   return res.status(404).json({