@sassoftware/viya-serverjs 0.3.0 → 0.4.0

package/src/plugins/setupUserRoutes.js

@@ -1,48 +1,48 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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.
- * ---------------------------------------------------------------------------------------
- *
- */
-import setContext from './setContext';
-
-function setupUserRoutes (u, options) {
-    if (u == null) {
-        return [];
-    }
-    
-    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;
-}
+/*
+ * ------------------------------------------------------------------------------------
+ *   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.
+ * ---------------------------------------------------------------------------------------
+ *
+ */
+import setContext from './setContext';
+
+function setupUserRoutes (u, options) {
+    if (u == null) {
+        return [];
+    }
+    
+    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;
+}
 export default setupUserRoutes;

package/src/plugins/token.js

@@ -1,10 +1,10 @@
-exports.plugin = {
-    name    : 'token',
-    version : '1.0.0',
-    register: itoken
-};
-
-async function itoken (server){
-    await server.auth.scheme('SAStoken',require('../schemes/SASTokenScheme'));
-    server.auth.strategy('token', 'SAStoken');
-}
+exports.plugin = {
+    name    : 'token',
+    version : '1.0.0',
+    register: itoken
+};
+
+async function itoken (server){
+    await server.auth.scheme('SAStoken',require('../schemes/SASTokenScheme'));
+    server.auth.strategy('token', 'SAStoken');
+}

package/src/schemes/SASTokenScheme.js

@@ -1,43 +1,43 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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.
- * ---------------------------------------------------------------------------------------
- *
- */
-// lean code to handle of incoming tokens if present
-// designed to used with appCookie and SASauth
-
-const Boom = require('@hapi/boom');
-
-module.exports = function SASTokenScheme (server, options) {
- 
-    const scheme = {
-        authenticate: async function (request, h) {
-            const authorization = request.headers.authorization;
-            server.log('SASToken', authorization);
-        
-            if (!authorization) {
-               throw Boom.unauthorized(null, 'session');
-            }
-            const [tokenType, token] = authorization.split(' ');
-            let credentials = {
-                token    : token,
-                tokenType: tokenType
-            };
-            return h.authenticated({credentials: credentials});
-        }
-    };
-
-    return scheme;
-};
+/*
+ * ------------------------------------------------------------------------------------
+ *   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.
+ * ---------------------------------------------------------------------------------------
+ *
+ */
+// lean code to handle of incoming tokens if present
+// designed to used with appCookie and SASauth
+
+const Boom = require('@hapi/boom');
+
+module.exports = function SASTokenScheme (server, options) {
+ 
+    const scheme = {
+        authenticate: async function (request, h) {
+            const authorization = request.headers.authorization;
+            server.log('SASToken', authorization);
+        
+            if (!authorization) {
+               throw Boom.unauthorized(null, 'session');
+            }
+            const [tokenType, token] = authorization.split(' ');
+            let credentials = {
+                token    : token,
+                tokenType: tokenType
+            };
+            return h.authenticated({credentials: credentials});
+        }
+    };
+
+    return scheme;
+};

package/src/visionIndex.html

@@ -1,24 +1,24 @@
-<html>
-    <body>
-        <div>
-            <h1 style="background-color:blue;">{{title}}</h1>
-            <div style="border-style:solid; border-width: 2px;"><pre>{{message}}<pre></pre></div>
-        </div>
-    
-         <h2>Hints for Logon Error - Contact your administrator</h2>
-      
-            <ul> 
-                <li>SAMESITE setting is not correct for your environment (contact your administrator)</li>
-                <li>Presence of self-signed certificates - might have to set NODE_TLS_REJECT_UNAUTHORIZED=0 in the env file</li>
-                <li>You might have to clear the cookies for your Viya Server</li>
-                <li>You might have to clear the cookies set by this app server</li>
-            </ul>
-        
-            <h2>404</h2>
-            <ul>
-                <li> Make sure the proper appname is used in script tags for /appenv and /user</li>
-                <li> Make sure you are starting the application at the proper url</li>
-            </ul>
-        
-    </body>
+<html>
+    <body>
+        <div>
+            <h1 style="background-color:blue;">{{title}}</h1>
+            <div style="border-style:solid; border-width: 2px;"><pre>{{message}}<pre></pre></div>
+        </div>
+    
+         <h2>Hints for Logon Error - Contact your administrator</h2>
+      
+            <ul> 
+                <li>SAMESITE setting is not correct for your environment (contact your administrator)</li>
+                <li>Presence of self-signed certificates - might have to set NODE_TLS_REJECT_UNAUTHORIZED=0 in the env file</li>
+                <li>You might have to clear the cookies for your Viya Server</li>
+                <li>You might have to clear the cookies set by this app server</li>
+            </ul>
+        
+            <h2>404</h2>
+            <ul>
+                <li> Make sure the proper appname is used in script tags for /appenv and /user</li>
+                <li> Make sure you are starting the application at the proper url</li>
+            </ul>
+        
+    </body>
 </html>

package/start.sh

@@ -1,15 +1,15 @@
-#
-# Azure wants to prefix the app env 
-# Use this to set the env that this server expects
-
-# https://docs.microsoft.com/en-us/azure/app-service/reference-app-settings?tabs=kudu%2Cdotnet
-env | grep APPSETTING_
-
-if [[ ! -z "$APPSETTING_VIYA_SERVER" ]];
-then 
-    export VIYA_SERVER=$APPSETTING_VIYA_SERVER
-    echo VIYA SERVER= $VIYA_SERVER
-else 
-    echo "No custom application overrides"
-fi
+#
+# Azure wants to prefix the app env 
+# Use this to set the env that this server expects
+
+# https://docs.microsoft.com/en-us/azure/app-service/reference-app-settings?tabs=kudu%2Cdotnet
+env | grep APPSETTING_
+
+if [[ ! -z "$APPSETTING_VIYA_SERVER" ]];
+then 
+    export VIYA_SERVER=$APPSETTING_VIYA_SERVER
+    echo VIYA SERVER= $VIYA_SERVER
+else 
+    echo "No custom application overrides"
+fi
 node server.js

package/tls/viyatls.sh

@@ -1,3 +1,3 @@
-kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/ca.crt ./ca.crt
-kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.crt ./tls.crt
+kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/ca.crt ./ca.crt
+kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.crt ./tls.crt
 kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.key ./tls.key