Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /usr/src/app
 
 # Install app dependencies
 COPY package*.json ./
-#COPY .npmrc ./
+COPY .npmrc ./
 COPY yarn.lock ./
 RUN yarn install --frozen-lockfile
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "ba-website",
-    "version": "1.0.21",
+    "version": "1.0.16",
     "description": "The Bridgeman Accessible main website",
     "main": "server.js",
     "scripts": {
@@ -10,8 +10,7 @@
     },
     "dependencies": {
         "@BridgemanAccessible/ba-auth": "^1.0.0",
-        "@BridgemanAccessible/ba-logging": "^1.0.0",
+        "@BridgemanAccessible/ba-web-framework": "^1.0.0",
-        "@BridgemanAccessible/ba-web-framework": "^1.0.11",
         "@BridgemanAccessible/listmonk-node-client": "^1.0.0",
         "ejs": "^3.1.6",
         "express": "^4.17.1",

src/server.ts

@@ -10,7 +10,7 @@ const domain = process.env.DOMAIN || 'localhost';
  * 
  * @param app The Express app that gets created/started.
  */
-function onStart(app: App) {
+function onStart(app: Application) {
     // Currently within the Server class implementation,
     // which is then implemented by the accounts dashboard, 
     // only the RFC8414 path/callback is setup by default 
@@ -18,7 +18,7 @@ function onStart(app: App) {
     // this should be easy enough to change but don't want to fiddle with it right now
     //const oidcLink = PointerServer.createOIDCLink('account.bridgemanaccessible.ca');
     const rfc8414Link = PointerServer.createRFC8414Link('account.bridgemanaccessible.ca');
-    PointerServer.setup(app.getExpressApp(), { links: [/*oidcLink, */rfc8414Link] });
+    PointerServer.setup(app, { links: [/*oidcLink, */rfc8414Link] });
 }
 
 async function main() {

yarn.lock

@@ -22,16 +22,16 @@
 
 "@BridgemanAccessible/ba-logging@^1.0.0":
   version "1.0.0"
-  resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-logging/-/ba-logging-1.0.0.tgz#367c4aa6fbc5278073f9750f76406e2a25aba9df"
+  resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-logging/-/ba-logging-1.0.0.tgz#354bbf9c4e9e8c6e72b9e3e4b353519aac54f6a2"
-  integrity sha512-PuryL6BIrZgny8iKDPrZSoOwrGvr2kDVpKjNzJk6Z1o16vbxNRguU0hHCPCYVhpxdgFORJfH6GJlgY4kkk8Qlg==
+  integrity sha512-LOkh1PL7U31NVtZrWOLRbPvmBchE/Mp1CzTWwFDRch9lTAITYvfrPLhWcBLDm98sE64fBluMqeok8ZEfqPoq2Q==
   dependencies:
     axios "^1.8.4"
     express "^4.21.2"
 
-"@BridgemanAccessible/ba-web-framework@^1.0.11":
+"@BridgemanAccessible/ba-web-framework@^1.0.0":
-  version "1.0.11"
+  version "1.0.0"
-  resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-web-framework/-/ba-web-framework-1.0.11.tgz#64c0fe4a02444385f766d4a04ac855804a1a951c"
+  resolved "https://npm.pkg.bridgemanaccessible.ca/@BridgemanAccessible/ba-web-framework/-/ba-web-framework-1.0.0.tgz#f9a1825fabb3aaf76d1064f27c412018b9da738a"
-  integrity sha512-GsMOiQfSk3sH9ORUxcgsRcsY2GMdoCGH3CXFwl3p8zZXSR0Dw+wQYc5Ibdz+mVwsukaVEpJG4nm+754Fpb6hHQ==
+  integrity sha512-zugaSwYJwvDSSIBtGlqrHVs3LG3l48i8mgNLmnMfG8xDbem9UKgYmUwr/d2+jr92Zg0AMr8jA4dftiLVol5cnw==
   dependencies:
     "@BridgemanAccessible/ba-auth" "^1.0.0"
     express "^4.19.2"
@@ -46,10 +46,10 @@
   dependencies:
     axios "^1.7.7"
 
-"@asamuzakjp/css-color@^3.2.0":
+"@asamuzakjp/css-color@^3.1.2":
-  version "3.2.0"
+  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.2.0.tgz#cc42f5b85c593f79f1fa4f25d2b9b321e61d1794"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-3.1.3.tgz#e408e8756a0dc561ccf20f52931034ea509ee760"
-  integrity sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==
+  integrity sha512-u25AyjuNrRFGb1O7KmWEu0ExN6iJMlUmDSlOPW/11JF8khOrIGG6oCoYpC+4mZlthNVhFUahk68lNrNI91f6Yg==
   dependencies:
     "@csstools/css-calc" "^2.1.3"
     "@csstools/css-color-parser" "^3.0.9"
@@ -230,28 +230,28 @@
   resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8"
   integrity sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==
 
-"@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
+"@csstools/css-calc@^2.1.3":
-  version "2.1.4"
+  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.3.tgz#6f68affcb569a86b91965e8622d644be35a08423"
-  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
+  integrity sha512-XBG3talrhid44BY1x3MHzUx/aTG8+x/Zi57M4aTKK9RFB4aLlF3TTSzfzn8nWVHWL3FgAXAxmupmDd6VWww+pw==
 
 "@csstools/css-color-parser@^3.0.9":
-  version "3.0.10"
+  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz#79fc68864dd43c3b6782d2b3828bc0fa9d085c10"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.9.tgz#8d81b77d6f211495b5100ec4cad4c8828de49f6b"
-  integrity sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==
+  integrity sha512-wILs5Zk7BU86UArYBJTPy/FMPPKVKHMj1ycCEyf3VUptol0JNRLFU/BZsJ4aiIHJEbSLiizzRrw8Pc1uAEDrXw==
   dependencies:
     "@csstools/color-helpers" "^5.0.2"
-    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-calc" "^2.1.3"
 
 "@csstools/css-parser-algorithms@^3.0.4":
-  version "3.0.5"
+  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
 
 "@csstools/css-tokenizer@^3.0.3":
-  version "3.0.4"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
+  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
 
 "@gulpjs/messages@^1.1.0":
   version "1.1.0"
@@ -1357,11 +1357,11 @@ create-require@^1.1.0:
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cssstyle@^4.0.1:
-  version "4.4.0"
+  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.4.0.tgz#a185e81564a6047693586d904d278cbe8565ba07"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.3.1.tgz#68a3c9f5a70aa97d5a6ebecc9805e511fc022eb8"
-  integrity sha512-W0Y2HOXlPkb2yaKrCVRjinYKciu/qSLEmK0K9mcfDei3zwlnHFEHAs/Du3cIRwPqY+J4JsiBzUjoHyc8RsJ03A==
+  integrity sha512-ZgW+Jgdd7i52AaLYCriF8Mxqft0gD/R9i9wi6RWBhs1pqdPEzPjym7rvRKi397WmQFf3SlyUsszhw+VVCbx79Q==
   dependencies:
-    "@asamuzakjp/css-color" "^3.2.0"
+    "@asamuzakjp/css-color" "^3.1.2"
     rrweb-cssom "^0.8.0"
 
 dashdash@^1.12.0:
@@ -1572,10 +1572,10 @@ enhanced-resolve@^5.17.1:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-entities@^6.0.0:
+entities@^4.5.0:
-  version "6.0.1"
+  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-6.0.1.tgz#c28c34a43379ca7f61d074130b2f5f7020a30694"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 errno@^0.1.3:
   version "0.1.8"
@@ -3009,11 +3009,11 @@ parse-passwd@^1.0.0:
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 parse5@^7.1.2:
-  version "7.3.0"
+  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.3.0.tgz#d7e224fa72399c7a175099f45fc2ad024b05ec05"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.2.1.tgz#8928f55915e6125f430cc44309765bf17556a33a"
-  integrity sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==
+  integrity sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==
   dependencies:
-    entities "^6.0.0"
+    entities "^4.5.0"
 
 parseurl@~1.3.3:
   version "1.3.3"
@@ -4221,9 +4221,9 @@ wrappy@1:
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@^8.18.0:
-  version "8.18.2"
+  version "8.18.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.2.tgz#42738b2be57ced85f46154320aabb51ab003705a"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
-  integrity sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==
+  integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==
 
 xml-name-validator@^5.0.0:
   version "5.0.0"