@sassoftware/viya-serverjs 0.6.1-2 → 0.6.1-5

package/src/plugins/setupAuth.js

@@ -16,11 +16,10 @@
  *
  */
 
-let SASauth          = require('./SASauth');
-let appCookie        = require('./appCookie');
-let token            = require('./token');
+import SASAuth from './SASauth.js';
+import appCookie from './appCookie.js';
 let setDefaultRoutes = require('./setDefaultRoutes');
-let log		 = require('debug')('auth');
+let debug	 = require('debug')('auth');
 
 
 /** Notes:
@@ -29,21 +28,14 @@ let log		 = require('debug')('auth');
  */
 async function setupAuth (server, options){
 	
-	if (options.authFlow === 'server') {
-		await server.register({plugin: SASauth,   options: options});
-		// await server.register({plugin: appCookie, options: options});
-		await appCookie(server,options);
-		/*
-		let def = 'session';
-		if (options.serverMode === 'api') {
-			await server.register({ plugin: token });
-			def = 'token';
-		}
-		log('***********************Default auth', def);
-		server.auth.default(def);
-		*/
-		// console.log(server.registerations);
-	}
+	// register cookie and bell
+	await server.register(require('@hapi/cookie'));
+	await server.register(require('@hapi/bell'));
+
+	await appCookie(server, options);
+	await SASAuth(server, options);
+
+	// setup default routes now that we have auth strategies
 	setDefaultRoutes(server, options);
 	return true;
 };

package/src/plugins/setupUserRoutes.js

@@ -17,32 +17,24 @@
  */
 import setContext from './setContext';
 
-function setupUserRoutes (u, options) {
-    if (u == null) {
-        return [];
+function setupUserRoutes(ux, options) {
+  let routes = ux.map(rx => {
+    if (rx.options.pre == null) {
+      rx.options.pre = [{ method: setContext, assign: 'context' }];
+    } else {
+      rx.options.pre.push({ method: setContext, assign: 'context' });
     }
-    
-    let ux = (typeof u === 'function') ? u() : u;
-    let routes = ux.map(rx => {
-        //let rx = {...r};
-        /* change it to options */
-        if (rx.config != null) {
-            rx.options = {...rx.config};
-            delete rx.config;
-        }
-        if (rx.options.pre == null) {
-          rx.options.pre = [{method: setContext, assign: 'context'}];
-        } else{
-          rx.options.pre.push([{method: setContext, assign: 'context'}]);
-        }
-        if (rx.options.auth === true) {
-            rx.options.auth = options.authDefault;   
-        } else if (rx.options.auth === 'logon') {
-            rx.options.auth = options.authLogon;
-        } 
-       
-        return rx;
-    });
-    return routes;
+      
+    if (rx.options.auth === true) {
+      rx.options.auth = options.authDefault;
+    } else if (rx.options.auth === 'logon') {
+      rx.options.auth = options.authLogon;
+    } else if (rx.options.auth == null) {
+      rx.options.auth = false;
+    }
+    console.log('route', rx.method, rx.path, rx.options.auth, rx.options.pre);
+  return rx;
+});
+return routes;
 }
 export default setupUserRoutes;

package/src/readCerts.js

@@ -1,33 +1,33 @@
-/**
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import fs from 'fs';
-function getCerts(tlsdir) {
-
-    if (tlsdir == null || tlsdir === 'NONE') {
-        return null;
-    }
-
-    console.log(`[Note] Reading certs from directory: ` + tlsdir);
-    if (fs.existsSync(tlsdir) === false) {
-        console.error("[Warning] Specified cert dir does not exist: " + tlsdir);
-        return null;
-    }
-
-    let listOfFiles = fs.readdirSync(tlsdir);
-    console.log("[Note] TLS/SSL files found: " + listOfFiles);
-    let options = {};
-    for(let i=0; i < listOfFiles.length; i++) {
-        let fname = listOfFiles[i];
-        let name = tlsdir + '/' + listOfFiles[i];
-        let key = fname.split('.')[0];
-        console.log('Reading TLS file: ' + name + ' as key: ' + key);
-        options[key] = fs.readFileSync(name, { encoding: 'utf8' });
-    }
-    console.log('cert files', Object.keys(options));
-    
-    return options;
-   
-}
+/**
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import fs from 'fs';
+function getCerts(tlsdir) {
+
+    if (tlsdir == null || tlsdir === 'NONE') {
+        return null;
+    }
+
+    console.log(`[Note] Reading certs from directory: ` + tlsdir);
+    if (fs.existsSync(tlsdir) === false) {
+        console.error("[Warning] Specified cert dir does not exist: " + tlsdir);
+        return null;
+    }
+
+    let listOfFiles = fs.readdirSync(tlsdir);
+    console.log("[Note] TLS/SSL files found: " + listOfFiles);
+    let options = {};
+    for(let i=0; i < listOfFiles.length; i++) {
+        let fname = listOfFiles[i];
+        let name = tlsdir + '/' + listOfFiles[i];
+        let key = fname.split('.')[0];
+        console.log('Reading TLS file: ' + name + ' as key: ' + key);
+        options[key] = fs.readFileSync(name, { encoding: 'utf8' });
+    }
+    console.log('cert files', Object.keys(options));
+    
+    return options;
+   
+}
 export default getCerts;