From c098d002c80cc6d152e2a7efc5b2ca0b0265981f Mon Sep 17 00:00:00 2001 From: "C. Fuhrman" Date: Tue, 4 Mar 2025 14:24:36 -0500 Subject: [PATCH] userModel traces --- server/app.js | 3 +-- server/auth/auth-manager.js | 4 +++- server/auth/modules/passport-providers/oidc.js | 14 +++++++++----- server/auth/modules/passportjs.js | 3 ++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/server/app.js b/server/app.js index d2634c7..19ba3f9 100644 --- a/server/app.js +++ b/server/app.js @@ -103,8 +103,7 @@ app.use(session({ cookie: { secure: process.env.NODE_ENV === 'production' } })); -let authManager = new AuthManager(app,null,userModel); -authManager.getUserModel(); +let _authManager = new AuthManager(app,null,userModel); app.use(errorHandler); // Start server diff --git a/server/auth/auth-manager.js b/server/auth/auth-manager.js index 170d35a..96e75cf 100644 --- a/server/auth/auth-manager.js +++ b/server/auth/auth-manager.js @@ -7,6 +7,8 @@ const AppError = require('../middleware/AppError.js'); class AuthManager{ constructor(expressapp,configs=null,userModel){ + console.log(`AuthManager: constructor: configs: ${JSON.stringify(configs)}`); + console.log(`AuthManager: constructor: userModel: ${JSON.stringify(userModel)}`); this.modules = [] this.app = expressapp @@ -75,4 +77,4 @@ class AuthManager{ } } -module.exports = AuthManager; \ No newline at end of file +module.exports = AuthManager; diff --git a/server/auth/modules/passport-providers/oidc.js b/server/auth/modules/passport-providers/oidc.js index 551123f..f9cfd88 100644 --- a/server/auth/modules/passport-providers/oidc.js +++ b/server/auth/modules/passport-providers/oidc.js @@ -23,16 +23,20 @@ class PassportOpenIDConnect { async register(app, passport, endpoint, name, provider, userModel) { + console.log(`oidc.js: register: endpoint: ${endpoint}`); + console.log(`oidc.js: register: name: ${name}`); + console.log(`oidc.js: register: provider: ${JSON.stringify(provider)}`); + console.log(`oidc.js: register: userModel: ${JSON.stringify(userModel)}`); + const config = await this.getConfigFromConfigURL(name, provider); const cb_url = `${process.env['OIDC_URL']}${endpoint}/${name}/callback`; const self = this; const scope = 'openid profile email ' + `${provider.OIDC_ADD_SCOPE}`; - console.log(config); - console.log(''); - console.log(cb_url); - console.log(''); - console.log(scope); + console.log(`oidc.js: register: config: ${JSON.stringify(config)}`); + console.log(`oidc.js: register: cb_url: ${cb_url}`); + console.log(`oidc.js: register: scope: ${scope}`); + passport.use(name, new OpenIDConnectStrategy({ issuer: config.issuer, authorizationURL: config.authorization_endpoint, diff --git a/server/auth/modules/passportjs.js b/server/auth/modules/passportjs.js index c651eff..7eda887 100644 --- a/server/auth/modules/passportjs.js +++ b/server/auth/modules/passportjs.js @@ -10,6 +10,7 @@ class PassportJs{ } async registerAuth(expressapp, userModel){ + console.log(`PassportJs: registerAuth: userModel: ${JSON.stringify(userModel)}`); expressapp.use(passport.initialize()); expressapp.use(passport.session()); @@ -62,4 +63,4 @@ class PassportJs{ } -module.exports = PassportJs; \ No newline at end of file +module.exports = PassportJs;