Merge pull request #516 from idaholab/fix/reduce-logs

Fix/reduce logs

Author: browjm4

server/NodeLibraries/deeplynx/package.json

@@ -1,6 +1,6 @@
 {
     "name": "deeplynx",
-    "version": "1.7.4",
+    "version": "1.7.4.1",
     "main": "index.js",
     "types": "index.d.ts",
     "napi": {

server/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "deep-lynx",
-    "version": "1.7.4",
+    "version": "1.7.4.1",
     "description": "DeepLynx allows for an integrated platform during design and operations of mega projects.",
     "main": "./dist/main.js",
     "author": "John Darrington and Christopher Ritter",
@@ -132,7 +132,7 @@
         "csv-stringify": "^6.5.1",
         "csvtojson": "^2.0.10",
         "date-fns": "^2.30.0",
-        "deeplynx": "^1.7.4",
+        "deeplynx": "^1.7.4.1",
         "dev-null": "^0.1.1",
         "digest-stream": "^2.0.0",
         "dot-prop": "^5.3.0",

server/package.json

@@ -31,10 +31,8 @@ export function SetSamlAdfs(app: express.Application) {
 
     passport.deserializeUser((user: string, done: any) => {
         void UserMapper.Instance.Retrieve(user).then((result) => {
-            Logger.info(`Deserializing User. Is error: ${result.isError}`);
             if (result.isError) done('unable to retrieve user', null);
 
-            Logger.info(`Returned user: ${result.value})}`)
             done(null, result.value);
         });
     });
@@ -57,7 +55,6 @@ export function SetSamlAdfs(app: express.Application) {
             },
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             (profile: any, done: any) => {
-                Logger.info(`In passport.use. ${Config}`);
                 Logger.info(`Saml email key: ${Config.saml_claims_email}`);
                 Logger.info(`Saml email value: ${profile[Config.saml_claims_email]}`);
                 const storage = UserMapper.Instance;
@@ -77,7 +74,6 @@ export function SetSamlAdfs(app: express.Application) {
                                     // if there are no other users of this DeepLynx instance
                                     // we go ahead and assign admin status to this newly created
                                     // user
-                                    Logger.info(`User not found. Creating new user. Users found: ${users.value.length}`);
                                     void storage
                                         .Create(
                                             'saml-adfs login',
@@ -93,23 +89,17 @@ export function SetSamlAdfs(app: express.Application) {
                                         )
                                         .then((user: Result<User>) => {
                                             if (user.isError) {
-                                                Logger.error(`Error creating user ${user.error}`)
                                                 resolve(done(user.error, false));
                                             }
 
-                                            Logger.info(`User created. ${user.value}`)
                                             resolve(done(null, serialize(user.value)));
                                         });
                                 });
                             } else {
-                                Logger.info('Resolving with user')
                                 resolve(done(null, serialize(result.value)));
                             }
                         })
-                        .catch((error) => {
-                            Logger.error(`Caught error retrieving user by email. ${error}`)
-                            resolve(done(error, false))
-                });
+                        .catch((error) => resolve(done(error, false)));
                 });
             },
         ),

server/src/http_server/authentication/saml/saml-adfs.ts

@@ -363,13 +363,11 @@ export default class OAuthRoutes {
     }
 
     private static loginSaml(req: Request, res: Response) {
-        Logger.info('start loginSaml');
         const oauthRequest = oauthRepo.authorizationFromRequest(req);
 
         // if this login is part of an OAuth request flow, we must save it in cache
         // so that we can restore it as part of the redirect
         if (oauthRequest) {
-            Logger.info(`In oauthRequest: ${oauthRequest}`);
             const token = Buffer.from(uuidv4()).toString('base64');
             Cache.set(token, serialize(oauthRequest), 60 * 10).then((set) => {
                 if (!set) {
@@ -380,15 +378,13 @@ export default class OAuthRoutes {
 
                 req.query.RelayState = token;
 
-                Logger.info('Saml authenticate attempt');
                 passport.authenticate('saml', {
                     failureRedirect: '/unauthorized',
                     failureFlash: true,
                     keepSessionInfo: true,
                 })(req, res);
             });
         } else {
-            Logger.info('No oauthRequest. Saml authenticate attempt');
             passport.authenticate('saml', {
                 failureRedirect: '/unauthorized',
                 failureFlash: true,
@@ -398,11 +394,9 @@ export default class OAuthRoutes {
     }
 
     private static saml(req: Request, res: Response, next: NextFunction) {
-        Logger.info('start saml');
         passport.authenticate('saml', { keepSessionInfo: true }, (err: any, user: any, info: any) => {
             if (err) {
                 Logger.error(`saml authenticate err: ${err}`);
-                Logger.info(`Redirecting to: ${buildUrl('/oauth', {queryParams: {error: `${err}`}})}`);
                 res.redirect(buildUrl('/oauth', { queryParams: { error: `${err}` } }));
                 return;
             }
@@ -416,8 +410,6 @@ export default class OAuthRoutes {
                 if (req.body.RelayState) {
                     Cache.get<object>(req.body.RelayState as string).then((oauthRequest) => {
                         if (oauthRequest) {
-                            // eslint-disable-next-line @typescript-eslint/no-base-to-string
-                            Logger.info(`Redirecting to /oauth/authorize with query param: ${oauthRequest}`);
                             res.redirect(
                                 buildUrl('/oauth/authorize', {
                                     queryParams: oauthRequest,
@@ -427,7 +419,6 @@ export default class OAuthRoutes {
                         }
                     });
                 } else {
-                    Logger.info('Redirecting to /oauth/profile');
                     res.redirect('/oauth/profile');
                     return;
                 }

server/src/http_server/routes/access_management/oauth_routes.ts

@@ -4378,7 +4378,7 @@ __metadata:
     csv-stringify: "npm:^6.5.1"
     csvtojson: "npm:^2.0.10"
     date-fns: "npm:^2.30.0"
-    deeplynx: "npm:^1.7.4"
+    deeplynx: "npm:^1.7.4.1"
     dev-null: "npm:^0.1.1"
     digest-stream: "npm:^2.0.0"
     dot-prop: "npm:^5.3.0"

server/yarn.lock

@@ -1,6 +1,6 @@
 {
   "name": "deep-lynx-admin-gui",
-  "version": "1.7.4",
+  "version": "1.7.4.1",
   "private": true,
   "scripts": {
     "serve": "cross-env NODE_ENV=development vue-cli-service serve",

ui/AdminWebApp/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "webgl-viewer",
   "private": true,
-  "version": "1.7.4",
+  "version": "1.7.4.1",
   "type": "module",
   "proxy": "http://0.0.0.0:8091",
   "scripts": {