Merge pull request #518 from idaholab/fix/node-saml

version bump + package fixes

Author: LaddieZeigler

server/NodeLibraries/deeplynx/package.json

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

server/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "deep-lynx",
-    "version": "1.7.6",
+    "version": "1.7.7",
     "description": "DeepLynx allows for an integrated platform during design and operations of mega projects.",
     "main": "./dist/main.js",
     "author": "John Darrington and Christopher Ritter",
@@ -99,7 +99,8 @@
     "dependencies": {
         "@azure/service-bus": "^7.9.5",
         "@ladjs/graceful": "^1.1.5",
-        "@node-saml/passport-saml": "^4.0.4",
+        "@node-saml/node-saml": "^5.1.0",
+        "@node-saml/passport-saml": "^5.1.0",
         "@types/amqplib": "^0.8.2",
         "@types/busboy": "^1.5.4",
         "@types/dompurify": "^2.4.0",
@@ -132,7 +133,7 @@
         "csv-stringify": "^6.5.1",
         "csvtojson": "^2.0.10",
         "date-fns": "^2.30.0",
-        "deeplynx": "^1.7.6",
+        "deeplynx": "^1.7.7",
         "dev-null": "^0.1.1",
         "digest-stream": "^2.0.0",
         "dot-prop": "^5.3.0",
@@ -209,6 +210,7 @@
         "cookie": "^0.7.0",
         "serialize-javascript": "^6.0.2",
         "on-headers": "^1.1.0",
-        "nanoid": "^3.3.8"
+        "nanoid": "^3.3.8",
+        "@node-saml/node-saml": "^5.1.0"
     }
 }

server/package.json

@@ -5,10 +5,10 @@ import Config from '../../../services/config';
 import UserMapper from '../../../data_access_layer/mappers/access_management/user_mapper';
 import Result from '../../../common_classes/result';
 import Logger from '../../../services/logger';
-import {User} from '../../../domain_objects/access_management/user';
-import {serialize} from 'class-transformer';
+import { User } from '../../../domain_objects/access_management/user';
+import { serialize } from 'class-transformer';
 
-const SamlStrategy = require('@node-saml/passport-saml').Strategy;
+const { Strategy: SamlStrategy } = require('@node-saml/passport-saml');
 
 export function SetSamlAdfs(app: express.Application) {
     // do not set the auth strategy if we don't have a public/private key pair.
@@ -44,7 +44,7 @@ export function SetSamlAdfs(app: express.Application) {
                 issuer: Config.saml_adfs_issuer,
                 callbackUrl: Config.saml_adfs_callback,
                 privateCert: fs.readFileSync(Config.saml_adfs_private_cert_path, 'utf-8'),
-                cert: fs.readFileSync(Config.saml_adfs_public_cert_path, 'utf-8'),
+                idpCert: fs.readFileSync(Config.saml_adfs_public_cert_path, 'utf-8'),
                 signatureAlgorithm: Config.saml_adfs_signature_algorithm,
                 racComparison: 'exact',
                 disableRequestedAuthnContext: Config.saml_adfs_disable_requested_authn_context,

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

@@ -4459,7 +4459,7 @@ __metadata:
     csv-stringify: "npm:^6.5.1"
     csvtojson: "npm:^2.0.10"
     date-fns: "npm:^2.30.0"
-    deeplynx: "npm:^1.7.6"
+    deeplynx: "npm:^1.7.7"
     dev-null: "npm:^0.1.1"
     digest-stream: "npm:^2.0.0"
     dot-prop: "npm:^5.3.0"
@@ -4551,7 +4551,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"deeplynx@npm:^1.7.6, deeplynx@workspace:NodeLibraries/deeplynx":
+"deeplynx@npm:^1.7.7, deeplynx@workspace:NodeLibraries/deeplynx":
   version: 0.0.0-use.local
   resolution: "deeplynx@workspace:NodeLibraries/deeplynx"
   dependencies:

server/yarn.lock

@@ -1,6 +1,6 @@
 {
   "name": "deep-lynx-admin-gui",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "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.6",
+  "version": "1.7.7",
   "type": "module",
   "proxy": "http://0.0.0.0:8091",
   "scripts": {