finish up oAuth cleanup

.circleci/config.yml

@@ -25,15 +25,15 @@ jobs:
             npm run fixture
           environment:
             NODE_ENV: testing
-            YAR: thelongestyarstringofalltimeever
+            SESSION_KEY: thelongestyarstringofalltimeever
             JWT: reveemitllafognirtsraytsegnoleht
       - run:
           name: test
           command: |
             npm test
           environment:
             NODE_ENV: testing
-            YAR: thelongestyarstringofalltimeever
+            SESSION_KEY: thelongestyarstringofalltimeever
             JWT: reveemitllafognirtsraytsegnoleht
             OSM_SITE: http://fake.osm.org
             CONSUMER_KEY: keythatconsumes

adapters/iDPresets/helpers.js

@@ -61,15 +61,15 @@ exports.getiDDefaults = () => JSON.parse(JSON.stringify(ID_DEFAULTS));
  * @return {string} make icon type....
  */
 exports.getIcon = (primaryTags) => {
-    const tagsString = primaryTags.sort((a, b) => {
-        if (a.key < b.key) return -1;
-        if (a.key > b.key) return 1;
-        return 0;
-    }).map(tag => {
-        return (tag.val && tag.val !== '*')
-            ? `${tag.key}=${tag.val}`
-            : tag.key;
-    }).join(':');
-
+    const tagsString = primaryTags
+        .reduce(function(uniqueStrings, tag) {
+            var tagString = (tag.val && tag.val !== '*') ? `${tag.key}=${tag.val}` : tag.key;
+            if (uniqueStrings.indexOf(tagString) === -1) {
+                uniqueStrings.push(tagString);
+            }
+            return uniqueStrings;
+        }, [])
+        .sort()
+        .join(':');
     return ID_ICONS[tagsString] || 'maki-natural';
 };

config.js

@@ -1,33 +1,39 @@
 const host = process.env.HOST || 'http://localhost';
 const port = process.env.PORT || '3001';
+const maprules = `${host}:${port}`;
+
 module.exports = {
     'development': {
-        injectDefaults: { simulate: { error: false }},
+        maprules: maprules,
+        injectDefaults: { simulate: { error: false } },
         consumerKey: process.env.CONSUMER_KEY || '',
         consumerSecret: process.env.CONSUMER_SECRET || '',
-        callbackUrl: `${host}:${port}/auth/callback`,
+        callbackUrl: `${maprules}/auth/callback`,
         osmSite: process.env.OSM_SITE || '',
-        yar: {
-            cookieOptions: {
-                password: process.env.YAR, // password must be greater than 32 characters
-                isSecure: false // make true when requests are made of HTTPS
-            }
+        session: {
+            isSecure: false, // make true when requests are made of HTTPS
+            clearInvalid: true,
+            strictHeader: false
         },
-        jwt: process.env.JWT || ''
+        jwt: process.env.JWT || '',
+        sessionKey: process.env.SESSION_KEY || '',
+        cors: false
     },
     'testing': {
+        maprules: maprules,
         injectDefaults: { simulate: { error: false }},
         consumerKey: process.env.CONSUMER_KEY || '',
         consumerSecret: process.env.CONSUMER_SECRET || '',
-        callbackUrl: `${host}:${port}/auth/callback`,
+        callbackUrl: `${maprules}/auth/callback`,
         osmSite: process.env.OSM_SITE || '',
-        yar: {
-            cookieOptions: {
-                password: process.env.YAR,
-                isSecure: false
-            }
+        session: {
+            isSecure: false, // make true when requests are made of HTTPS
+            clearInvalid: true,
+            strictHeader: true
         },
-        jwt: process.env.JWT || ''
+        jwt: process.env.JWT || '',
+        sessionKey: process.env.SESSION_KEY || '',
+        cors: true
     }
 };
 

index.js

@@ -4,22 +4,21 @@ const Hapi = require('@hapi/hapi');
 const routes = require('./routes');
 const config = require('./config')[process.env.NODE_ENV || 'development'];
 const inert = require('@hapi/inert');
-const yar = { plugin: require('@hapi/yar'), options: config.yar };
 const jwtScheme = require('./jwtScheme').scheme;
 
 const server = Hapi.server({
     port: process.env.PORT || 3000,
     host: process.env.HOST || 'localhost',
-    routes: { cors: true }
+    routes: { cors: { origin: ['*'], credentials: true } }
 });
 
 server.auth.scheme('jwt', jwtScheme);
 server.auth.strategy('default', 'jwt');
 
 // initialize server
 const initServer = async() => {
+    server.state('maprules_session', config.session);
     await server.register(inert);
-    await server.register(yar);
 
     // add endpoints
     server.route(routes);

jwtScheme.js

@@ -70,23 +70,15 @@ function isAuthorized(token, userAgent) {
 }
 
 function jwtAuthentication(request, h) {
-    return Promise.resolve(request.headers.authorization)
-        .then(function(authHeader) {
-            if (!authHeader || !authHeader.length) {
-                throw new Error('no token provided');
-            }
-
-            if (!authHeader.startsWith('Bearer ')) {
-                throw new Error('authentication strategy is invalid');
-            }
-
-            if (!authHeader.replace('Bearer ', '').length) {
+    return Promise.resolve(request.state.maprules_session)
+        .then(function(cookie) {
+            if (!cookie || !cookie.length) {
                 throw new Error('no token provided');
             }
 
             let token;
             try {
-                token = jwt.verify(authHeader.replace('Bearer ', ''), config.jwt);
+                token = jwt.verify(cookie, config.jwt);
             } catch (error) {
                 throw new Error('invalid token provided');
             }
@@ -122,5 +114,6 @@ function authenticate(route) {
 
 module.exports = {
     scheme: scheme,
-    authenticate: authenticate
+    authenticate: authenticate,
+    isAuthorized: isAuthorized
 };

requestPromise.js

@@ -8,10 +8,11 @@ const request = require('request');
 let requestPromise = function(options) {
     return new Promise (function(resolve, reject) {
         request(options, function(err, rs, body) {
-            if (err) {
-                reject(err);
+            if (err || rs.statusCode !== 200) {
+                reject(err || { statusCode: rs.statusCode });
+            } else {
+                resolve(body);
             }
-            resolve(body);
         });
     });
 };