@sassoftware/viya-serverjs 0.3.0 → 0.4.0

package/src/plugins/SASauth.js

@@ -1,79 +1,79 @@
-/*
- *  ------------------------------------------------------------------------------------
- *  * Copyright (c) SAS Institute Inc.
- *  *  Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  * http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  *  Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  limitations under the License.
- * ----------------------------------------------------------------------------------------
- *
- */
-
-
-let bell = require('@hapi/bell');
-let uuid = require('uuid');  
-let debug = require('debug')('sasauth');
-
-exports.plugin = {
-    name    : 'SASauth',
-    version : '1.0.0',
-    register: iSASauth
-};
-
-async function iSASauth (server, options) {
-    debug('in iSASauth');
-    debug('options', options);
-    let bellAuthOptions;
-    let provider;
-    // test for k8s deployment
-    let host = options.host + '/SASLogon';
-    
-
-    if (options.ns != null) {
-        host = `https://sas-logon-app.${options.ns}.svc.cluster.local`;
-    } else if (options.nsHost != null) {
-        host = options.nsHost;
-    }
-    // ...
-    debug(host);
-    provider = {
-        name         : 'sas',
-        protocol     : 'oauth2',
-        useParamsAuth: false,
-        auth         : host + '/oauth/authorize',
-        token        : host + '/oauth/token',
-
-        profileMethod: 'get',
-        
-        profile: async function (credentials, params, get) {  
-                     
-            server.log('SASAuth profile', credentials);
-            debug('credentials', credentials);
-        }
-       
-        
-    };
-    
-    bellAuthOptions = {
-        provider    : provider,
-        password    : uuid.v4(),
-        clientId    : options.clientId,
-        clientSecret: options.clientSecret,
-        //   isSameSite  : options.isSameSite,
-        isSecure    : options.isSecure
-    };
-    // console.log('SASAuth options', bellAuthOptions);
-    debug('belloptions', bellAuthOptions);
-    server.log('SASAuth',bellAuthOptions);
-    await server.register(bell);
-    server.auth.strategy('sas', 'bell', bellAuthOptions);
-    
-    }
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * Copyright (c) SAS Institute Inc.
+ *  *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *  Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * ----------------------------------------------------------------------------------------
+ *
+ */
+
+
+let bell = require('@hapi/bell');
+let uuid = require('uuid');  
+let debug = require('debug')('sasauth');
+
+exports.plugin = {
+    name    : 'SASauth',
+    version : '1.0.0',
+    register: iSASauth
+};
+
+async function iSASauth (server, options) {
+    debug('in iSASauth');
+    debug('options', options);
+    let bellAuthOptions;
+    let provider;
+    // test for k8s deployment
+    let host = options.host + '/SASLogon';
+    
+
+    if (options.ns != null) {
+        host = `https://sas-logon-app.${options.ns}.svc.cluster.local`;
+    } else if (options.nsHost != null) {
+        host = options.nsHost;
+    }
+    // ...
+    debug(host);
+    provider = {
+        name         : 'sas',
+        protocol     : 'oauth2',
+        useParamsAuth: false,
+        auth         : host + '/oauth/authorize',
+        token        : host + '/oauth/token',
+
+        profileMethod: 'get',
+        
+        profile: async function (credentials, params, get) {  
+                     
+            server.log('SASAuth profile', credentials);
+            debug('credentials', credentials);
+        }
+       
+        
+    };
+    
+    bellAuthOptions = {
+        provider    : provider,
+        password    : uuid.v4(),
+        clientId    : options.clientId,
+        clientSecret: options.clientSecret,
+        //   isSameSite  : options.isSameSite,
+        isSecure    : options.isSecure
+    };
+    // console.log('SASAuth options', bellAuthOptions);
+    debug('belloptions', bellAuthOptions);
+    server.log('SASAuth',bellAuthOptions);
+    await server.register(bell);
+    server.auth.strategy('sas', 'bell', bellAuthOptions);
+    
+    }
     

package/src/plugins/appCookie.js

@@ -1,49 +1,51 @@
-
-let uuid = require('uuid');
-let debug = require('debug')('cookie');
-
-module.exports = async function appCookie (server, options){
-
-    await server.register(require('@hapi/cookie'));
-    
-    debug('in appCookie');
-    debug(options.redirectTo);
-    let cookieOptions = {
-        cookie: {
-            name      : 'cookie',
-            password  : uuid.v4(),
-            isSecure  : options.isSecure,
-            isSameSite: options.isSameSite
-        },
-        redirectTo  : options.redirectTo,
-        appendNext  : {name: 'next'},
-        validateFunc: async (req, session) => {
-            debug('Cookie validateFunc', `path - ${req.path}`);
-            
-            if (session == null) {
-                console.log('session is null');
-                return {valid: false};
-            }
-            let credentials = null;
-            let sid;
-            if (Array.isArray(session) === true && session.length > 0) {
-                sid = session[0].sid;
-            } else {
-                sid = session.sid;
-            }
-            if (sid != null) {
-                credentials = await req.server.app.cache.get(sid);
-             }
-             
-            if (credentials == null) {
-                return {valid: false};
-            }
-            debug('Cookie validateFunc', sid);
-            return {valid: true, credentials: credentials};
-        }
-    };
-    // console.log('cookie options', cookieOptions);
-    debug('Cookie Options',cookieOptions);
-    server.auth.strategy('session', 'cookie', cookieOptions);
-
-};
+
+let uuid = require('uuid');
+let debug = require('debug')('cookie');
+
+module.exports = async function appCookie (server, options){
+
+    await server.register(require('@hapi/cookie'));
+    
+    debug('in appCookie');
+    debug('redirecTo', options.redirectTo);
+    let cookieOptions = {
+        cookie: {
+            name      : 'cookie',
+            password  : uuid.v4(),
+            isSecure  : options.isSecure,
+            isSameSite: options.isSameSite
+        },
+        redirectTo  : options.redirectTo,
+        appendNext  : {name: 'next'},
+        validate: async (req, session) => {
+            debugger;
+            debug('Cookie validate', `path - ${req.path}`);
+            
+            if (session == null) {
+                console.log('session is null');
+                return {isValid: false};
+            }
+            let credentials = null;
+            let sid;
+            if (Array.isArray(session) === true && session.length > 0) {
+                sid = session[0].sid;
+            } else {
+                sid = session.sid;
+            }
+            console.log('appcookie sid', sid);
+            if (sid != null) {
+                credentials = await req.server.app.cache.get(sid);
+             }
+             
+            if (credentials == null) {
+                return {isValid: false};
+            }
+            debug('Cookie validate', sid);
+            return {isValid: true, credentials: credentials};
+        }
+    };
+    // console.log('cookie options', cookieOptions);
+    debug('Cookie Options',cookieOptions);
+    server.auth.strategy('session', 'cookie', cookieOptions);
+
+};

package/src/plugins/setContext.js

@@ -1,34 +1,34 @@
-/*
- * ------------------------------------------------------------------------------------
- *   Copyright (c) SAS Institute Inc.
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ---------------------------------------------------------------------------------------
- *
- */
-
-
-async function setContext (req,h){
-   let credentials = req.auth.credentials;
-   
-   let context = {
-        path   : req.path,
-        params : req.params,
-        query  : req.query,
-        payload: req.payload,
-        queryOrig: (credentials != null) ? credentials.query : {},
-        token  : (credentials != null) ? `bearer ${credentials.token}` : null,
-        host   : process.env.VIYA_SERVER
-        };
-    return context;
-}
+/*
+ * ------------------------------------------------------------------------------------
+ *   Copyright (c) SAS Institute Inc.
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ---------------------------------------------------------------------------------------
+ *
+ */
+
+
+async function setContext (req,h){
+   let credentials = req.auth.credentials;
+   
+   let context = {
+        path   : req.path,
+        params : req.params,
+        query  : req.query,
+        payload: req.payload,
+        queryOrig: (credentials != null) ? credentials.query : {},
+        token  : (credentials != null) ? `bearer ${credentials.token}` : null,
+        host   : process.env.VIYA_SERVER
+        };
+    return context;
+}
 export default setContext;