backend/.env.sample

@@ -5,11 +5,12 @@
 # API host:port
 API_HOST=localhost
 API_PORT=3001
+APP_SECRET=somesecret
+APP_SESSION_SALT=a;sldkja;ldksfja;sldkj
 
 USE_LOCAL_DB=true
 DB_TYPE=mysql
 
-
 # Extra pepper for auth encryption
 PEPPER=kosho
 APP_SECRET=mysecret
@@ -24,7 +25,6 @@ DB_NAME=test
 DB_USER=root
 DB_ROOT_PASSWORD=root
 
-
 # Config for remote planet scale production dB
 PSCALE_DB_HOST=planet-scale-db
 PSCALE_DB_PORT=3306
@@ -34,5 +34,11 @@ PSCALE_DB_BRANCH=main
 PSCALE_DB_USER=myuserpleasechange
 PSCALE_DB_PASSWORD=pscale_pw_abc123efg456hij789
 
-# Brevo Transactional Email API key
+# Brevo Transactional Email API key and other related params
 BREVO_KEY=brevo_api_key
+# Change this to production server
+# BREVO_LINK=localhost:1234
+BREVO_LINK=link_back_to_siimee
+# Change this if multiple templates made via Brevo
+# BREVO_TEMPLATE_ID=1
+BREVO_TEMPLATE_ID=id_of_brevo_template

backend/README.md

@@ -7,9 +7,10 @@ An API for the siimee application
 You will need...
 
 ### Node.js 14+
-* OSX: `brew install node` using [Homebrew](http://brew.sh/)
-* Linux: `apt install nodejs` ([see Ubuntu/Debian specific instructions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)) or `pacman -S nodejs` (Arch Linux)
-* Windows: [Install](https://nodejs.org/en/download/)
+
+-   OSX: `brew install node` using [Homebrew](http://brew.sh/)
+-   Linux: `apt install nodejs` ([see Ubuntu/Debian specific instructions](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions)) or `pacman -S nodejs` (Arch Linux)
+-   Windows: [Install](https://nodejs.org/en/download/)
 
 ## :package: Installation
 
@@ -19,20 +20,43 @@ You will need...
 4. A test database container is provided and can be started with `docker-compose up -d`
 5. Populate some basic tables for your database using `npm run generate && npm run reseed`
 
+## :package: Installing Brevo
+
+This note is added in case Brevo fails to install correctly, as it requires some extra configuration:
+
+1. Should brevo fail to work upon spinning up, ensure that brevo is installed:
+
+```
+npm install @getbrevo/brevo --save
+```
+
+2. Then run 'npm install' again.
+3. Link the brevo package globally by running 'npm link'.
+4. You'll also need to link it directly within the backend directory (here):
+
+```
+npm link .
+```
+
+Transactional emails using the Brevo api should now be working.
+
 ## :package: Migrations
 
 We use Knex.js,which comes with a couple nice database migration and seeding tools.
 Migrating tracks changes in schema. Migration steps are contained in the `./db/migrations` folder. Seeding adds dummy data once our database tables have been created and schemas are set. Starting seed steps are contained in `./db/seeds` and use the `mock.js` file as the main dummy data source.
 
 ### Migrating
-* Run `npm run migrate` to run all migrations and establish the base schema
-* Run `npm run unmigrate` to roll back one migration
+
+-   Run `npm run migrate` to run all migrations and establish the base schema
+-   Run `npm run unmigrate` to roll back one migration
 
 ### Seeding
-* Run `npm run generate` to generate dummy data
-* Run `npm run seed` to seed the database with generated dummy data
+
+-   Run `npm run generate` to generate dummy data
+-   Run `npm run seed` to seed the database with generated dummy data
 
 ### Restarting
+
 Since we can't unseed the database, it's best to destroy the `dev` database and rebuild it.
 
 1. Stop the database by navigating to the project root directory `cd ../` and running `docker-compose down`
@@ -52,13 +76,22 @@ TBD
 ## :pill: Tests & Code Quality
 
 Tests are run with AVA with code coverage reporting via nyc. Look at the example test for ideas, as well as the [ava documentation](https://github.com/avajs/ava/blob/main/docs/01-writing-tests.md)
-* Run tests with coverage report with `npm test`
+
+-   Run tests with coverage report with `npm test`
 
 ## :heart: Built With
 
-* [Hapi](https://hapy.dev/) - Happy APIs
-* [Objection](https://vincit.github.io/objection.js/) - Light ORM
-* [Knex.js](https://knexjs.org/) - Query builder
-* [Schiwfty](https://hapipal.com/docs/schwifty) - Model layer
-* [Ava](https://github.com/avajs/ava) - Easy testing
-* [Nyc](https://github.com/istanbuljs/nyc) - Test coverage with Istanbul's CLI
+-   [Hapi](https://hapy.dev/) - Happy APIs
+-   [Objection](https://vincit.github.io/objection.js/) - Light ORM
+-   [Knex.js](https://knexjs.org/) - Query builder
+-   [Schiwfty](https://hapipal.com/docs/schwifty) - Model layer
+-   [Ava](https://github.com/avajs/ava) - Easy testing
+-   [Nyc](https://github.com/istanbuljs/nyc) - Test coverage with Istanbul's CLI
+
+## TRUNCATE TABLES IN PRODUCTION
+
+users, responses, profiles, authentication
+TRUNCATE TABLE users;
+TRUNCATE TABLE responses;
+TRUNCATE TABLE profiles;
+TRUNCATE TABLE authentication;

backend/db/data-generator/mock.js

@@ -425,12 +425,24 @@ module.exports = {
             tag_id: 7,
             is_deleted: false,
         },
+        // NOTE: profile_id 147 is chosen based off of GENERATED data,
+        // after running 'npm run generate', replace 147 in mock to next profile_id to be genearted
+        // i.e. last profile_id number + 1
+        // TODO: remove from mock data once bare bones matching logic can show poorly matched matches...
+        {
+            tag_association_id: 50,
+            profile_id: 139,
+            grouping_id: 2,
+            tag_id: 7,
+            is_deleted: false,
+        },
     ],
     response_keys: [
         {
             response_key_id: 1,
             response_key_category: 'visionary_vs_implementer',
-            response_key_prompt: 'Do you prefer to work with those who are driven by their Visionary insights, or those who are driven more by their Implementation?',
+            response_key_prompt:
+                'Do you prefer to work with those who are driven by their Visionary insights, or those who are driven more by their Implementation?',
             response_key_description: 'first round draft scoring question',
             aspect: 'visionary_vs_implementer',
             category: 'aspect',
@@ -440,7 +452,8 @@ module.exports = {
         {
             response_key_id: 2,
             response_key_category: 'creative_vs_methodical',
-            response_key_prompt: 'Have you found more success working with employees that are more Creative or those that are more Methodical?',
+            response_key_prompt:
+                'Have you found more success working with employees that are more Creative or those that are more Methodical?',
             response_key_description: 'first round draft scoring question',
             aspect: 'creative_vs_methodical',
             category: 'aspect',
@@ -450,7 +463,8 @@ module.exports = {
         {
             response_key_id: 3,
             response_key_category: 'dynamic_vs_ordered',
-            response_key_prompt: 'Which do you find to be the ideal working environment, one that is more Collaborative or one that is more Independent?',
+            response_key_prompt:
+                'Which do you find to be the ideal working environment, one that is more Collaborative or one that is more Independent?',
             response_key_description: 'first round draft scoring question',
             aspect: 'dynamic_vs_ordered',
             category: 'aspect',
@@ -460,7 +474,8 @@ module.exports = {
         {
             response_key_id: 4,
             response_key_category: 'precise_vs_resourceful',
-            response_key_prompt: 'Is the success of your team more likely if it includes individuals who are more Innovative, or those that are more Conventional when fulfilling their job duties?',
+            response_key_prompt:
+                'Is the success of your team more likely if it includes individuals who are more Innovative, or those that are more Conventional when fulfilling their job duties?',
             response_key_description: 'first round draft scoring question',
             aspect: 'precise_vs_resourceful',
             category: 'aspect',
@@ -470,7 +485,8 @@ module.exports = {
         {
             response_key_id: 5,
             response_key_category: 'big_Picture_vs_focused',
-            response_key_prompt: 'When fulfilling the role of the hiring leader, do you find yourself focusing more on the Big Picture or The Task At Hand?',
+            response_key_prompt:
+                'When fulfilling the role of the hiring leader, do you find yourself focusing more on the Big Picture or The Task At Hand?',
             response_key_description: 'first round draft scoring question',
             aspect: 'big_Picture_vs_focused',
             category: 'aspect',
@@ -480,7 +496,8 @@ module.exports = {
         {
             response_key_id: 6,
             response_key_category: 'guided_vs_self-managed',
-            response_key_prompt: 'Do you prefer to Guide your employees towards achieving the team goals, or do you prefer your employees to be Self-Managed?',
+            response_key_prompt:
+                'Do you prefer to Guide your employees towards achieving the team goals, or do you prefer your employees to be Self-Managed?',
             response_key_description: 'first round draft scoring question',
             aspect: 'guided_vs_self-managed',
             category: 'aspect',
@@ -490,7 +507,8 @@ module.exports = {
         {
             response_key_id: 7,
             response_key_category: 'profile',
-            response_key_prompt: 'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
+            response_key_prompt:
+                'First things first, could you provide us with your name? [break] I am called [break] when others address me.',
             response_key_description: 'required for profile creation',
             aspect: null,
             category: 'input',
@@ -500,122 +518,150 @@ module.exports = {
         {
             response_key_id: 8,
             response_key_category: 'profile',
-            response_key_prompt: 'In order for others to reach out to you on Siimee, we will need you to provide your email address.[break]When reaching out to me, [break] is my preferred email.',
+            response_key_prompt:
+                'In order for others to reach out to you on Siimee, we will need you to provide your email address.[break]When reaching out to me, [break] is my preferred email.',
             response_key_description: 'required for profile creation',
             aspect: null,
             category: 'input',
             placeholder: 'joe@mailme.com',
-            invalidInputPrompt: 'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
+            invalidInputPrompt:
+                'It looks like that email is not valid, try en email that is formatted like so: joe@joe.com',
         },
         {
             response_key_id: 9,
             response_key_category: 'profile',
-            response_key_prompt: 'So far so good! Next we will need you to establish a super secret password. Your password should be at least 14 characters long and have at least 2 special characters.[break]My [break] is a very secure passcode that only I will have access to!',
+            response_key_prompt:
+                'So far so good! Next we will need you to establish a super secret password. Your password should be at least 14 characters long and have at least 2 special characters.[break]My [break] is a very secure passcode that only I will have access to!',
             response_key_description: 'required for profile creation',
             aspect: null,
             category: 'input',
             placeholder: 'supersecr3tp@ssword',
-            invalidInputPrompt: 'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
+            invalidInputPrompt:
+                'That password does not fit our requirements, please follow the above instructions to generate a secure password.',
         },
         {
             response_key_id: 10,
             response_key_category: 'profile',
-            response_key_prompt: 'Looking good! Doing great. The next piece of info needed is your zip code. That way we can be sure to only show you other people in your area.[break]My zip code, [break] is the general area where I wish to see results in.',
+            response_key_prompt:
+                'Looking good! Doing great. The next piece of info needed is your zip code. That way we can be sure to only show you other people in your area.[break]My zip code, [break] is the general area where I wish to see results in.',
             response_key_description: 'required for distance calculations',
             aspect: null,
             category: 'input',
             placeholder: '90012',
-            invalidInputPrompt: 'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
+            invalidInputPrompt:
+                'Oops! That is not a recognized zipcode, please enter a 5 digit zipcode like: 97869',
         },
         {
             response_key_id: 11,
             response_key_category: 'profile',
-            response_key_prompt: 'What are you seeking? Are you looking to find a position to be employed in, or are you looking to employ a candidate?[break] I am a [break] seeking an employer/employee.',
+            response_key_prompt:
+                'What are you seeking? Are you looking to find a position to be employed in, or are you looking to employ a candidate?[break] I am a [break] seeking an employer/employee.',
             response_key_description: 'required for profile generation',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'In order to provide you with the best results, Siimee will need to know whether you are an employer looking to fill a position, or a candidate looking for an employment. Please take a look at our above options and choose one.',
+            invalidInputPrompt:
+                'In order to provide you with the best results, Siimee will need to know whether you are an employer looking to fill a position, or a candidate looking for an employment. Please take a look at our above options and choose one.',
         },
         {
             response_key_id: 12,
             response_key_category: 'profile',
-            response_key_prompt: 'Hey, you are almost done! Please provide an image of yourself so others can recognize you if you ever meet up IRL:',
+            response_key_prompt:
+                'Hey, you are almost done! Please provide an image of yourself so others can recognize you if you ever meet up IRL:',
             response_key_description: 'required for profile pictures',
             aspect: null,
             category: 'input',
             placeholder: null,
-            invalidInputPrompt: 'It appears you have yet to upload an image. Please provide Siimee with an image in case you want to show others what you look like.',
+            invalidInputPrompt:
+                'It appears you have yet to upload an image. Please provide Siimee with an image in case you want to show others what you look like.',
         },
         {
             response_key_id: 13,
             response_key_category: 'profile',
-            response_key_prompt: 'What language is your native language?[break] I consider [break] language as my native language.',
-            response_key_description: 'programming and spoken language preference',
+            response_key_prompt:
+                'What language is your native language?[break] I consider [break] language as my native language.',
+            response_key_description:
+                'programming and spoken language preference',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Ou peut-être parlez-vous français? Or would you prefer to see results in english?',
+            invalidInputPrompt:
+                'We try our best to provide results in the language of your choosing. ¿Prefieres ver resultados en español? Ou peut-être parlez-vous français? Or would you prefer to see results in english?',
         },
         {
             response_key_id: 14,
             response_key_category: 'profile',
-            response_key_prompt: 'What kind of duration would you prefer? Are you looking for part-time, full-time, other?[break] Currently, I am looking for a [break] job at this time.',
-            response_key_description: 'duration preference for hours able to dedicate to work',
+            response_key_prompt:
+                'What kind of duration would you prefer? Are you looking for part-time, full-time, other?[break] Currently, I am looking for a [break] job at this time.',
+            response_key_description:
+                'duration preference for hours able to dedicate to work',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'Looks like you have yet to  fill out what kind of work you are most interested in. As in, part-time, full-time. Take a look at our above options and choose whatever feels right for you right now. You can always edit them later!',
+            invalidInputPrompt:
+                'Looks like you have yet to  fill out what kind of work you are most interested in. As in, part-time, full-time. Take a look at our above options and choose whatever feels right for you right now. You can always edit them later!',
         },
         {
             response_key_id: 15,
             response_key_category: 'profile',
-            response_key_prompt: 'Would you prefer remote, hybrid, in-person work?[break] Personally I would prefer a [break] job right now. It is just what works best for me.',
-            response_key_description: 'location preference for where work happens',
+            response_key_prompt:
+                'Would you prefer remote, hybrid, in-person work?[break] Personally I would prefer a [break] job right now. It is just what works best for me.',
+            response_key_description:
+                'location preference for where work happens',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'Hold up! So sorry to put a pause here, but it looks like you have not chosen whether to work remotely or in person. No worries, if you are unsure, just choose the flexible option.',
+            invalidInputPrompt:
+                'Hold up! So sorry to put a pause here, but it looks like you have not chosen whether to work remotely or in person. No worries, if you are unsure, just choose the flexible option.',
         },
         {
             response_key_id: 16,
             response_key_category: 'profile',
-            response_key_prompt: 'Please provide us with a short blurb about yourself. What is your backstory?[break] My origin story starts like this:[break]',
+            response_key_prompt:
+                'Please provide us with a short blurb about yourself. What is your backstory?[break] My origin story starts like this:[break]',
             response_key_description: 'required for profile description',
             aspect: null,
             category: 'input',
             placeholder: 'my backstory starts long long ago...',
-            invalidInputPrompt: 'Whoa! Cool story. Unfortunately your backstory is either too long or too short. Please tell us a bit about yourself between 1 and 100 characters.',
+            invalidInputPrompt:
+                'Whoa! Cool story. Unfortunately your backstory is either too long or too short. Please tell us a bit about yourself between 1 and 100 characters.',
         },
         {
             response_key_id: 17,
             response_key_category: 'profile',
-            response_key_prompt: 'How soon do you need the position filled or you need to be employed? [break]I am currently [break] when it comes to employment opportunities right now.',
+            response_key_prompt:
+                'How soon do you need the position filled or you need to be employed? [break]I am currently [break] when it comes to employment opportunities right now.',
             response_key_description: 'urgency for when work is required',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'Looks like you left this field blank. Take a look at our provided options and tell us when you would like be employed.',
+            invalidInputPrompt:
+                'Looks like you left this field blank. Take a look at our provided options and tell us when you would like be employed.',
         },
         {
             response_key_id: 18,
             response_key_category: 'profile',
-            response_key_prompt: 'When others refer to you, what pronouns do you prefer they use?[break]I prefer to be called [break] when others refer to me.',
+            response_key_prompt:
+                'When others refer to you, what pronouns do you prefer they use?[break]I prefer to be called [break] when others refer to me.',
             response_key_description: 'required for profile pronouns',
             aspect: null,
             category: 'choice',
             placeholder: null,
-            invalidInputPrompt: 'Ensuring that others on our platform are aware of what your preferred pronouns are is important to us. Please choose from one of the above options.',
+            invalidInputPrompt:
+                'Ensuring that others on our platform are aware of what your preferred pronouns are is important to us. Please choose from one of the above options.',
         },
         {
             response_key_id: 19,
             response_key_category: 'profile',
-            response_key_prompt: 'What distance from your home are you looking to work in?[break] Preferably, I would like to work [break] from my place of residence.',
-            response_key_description: 'preference for commuting distance cutoff',
+            response_key_prompt:
+                'What distance from your home are you looking to work in?[break] Preferably, I would like to work [break] from my place of residence.',
+            response_key_description:
+                'preference for commuting distance cutoff',
             aspect: null,
             category: 'input',
             placeholder: '5 mi',
-            invalidInputPrompt: 'Whoa! You either left this field blank or tried to input an astronomically large distance you would like to see results from. Please input a distance you would like to see results in.',
+            invalidInputPrompt:
+                'Whoa! You either left this field blank or tried to input an astronomically large distance you would like to see results from. Please input a distance you would like to see results in.',
         },
     ],
     responses: [],
@@ -636,6 +682,14 @@ module.exports = {
             can_edit: false,
             is_active: true,
         },
+        {
+            membership_id: 4,
+            profile_id: 46,
+            grouping_id: 2,
+            membership_type: 'participant',
+            can_edit: false,
+            is_active: true,
+        },
     ],
     groupings: [
         {
@@ -643,6 +697,11 @@ module.exports = {
             grouping_name: '1663285820.067_41_46',
             grouping_type: 'match',
         },
+        {
+            grouping_id: 2,
+            grouping_name: '1663285820.067_147_46',
+            grouping_type: 'match',
+        },
     ],
     messages: [],
     match_queues: [

backend/db/seeds/04-responses.js

@@ -12,24 +12,24 @@ for (let name of fileNames) {
         responses = [...responses, ...data.responses]
     }
 }
-
 /**
  * Prevent seeding responses for
  * profile ids so we can test oboarding
  */
-responses = dataSort(responses, 'response_id').filter(
-    response => !ignore.includes(response.profile_id),
-)
+// responses = dataSort(responses, 'response_id').filter(
+// response => !ignore.includes(response.profile_id),
+// )
 
 exports.seed = async knex => {
     await knex('responses').del()
     let responsesToPush = []
-    let len = responses.length
+    const len = responses.length
     for (let i = 1; i <= len; i += 1) {
         responsesToPush.push(responses.shift())
-        if (i % batchSize === 0 || i > responses.length) {
-            // await knex('responses').insert(responsesToPush)
-            responsesToPush = []
-        }
+        // if (i % batchSize === 0 || i > responses.length) {
+        // await knex('responses').insert(responsesToPush)
+        // responsesToPush = []
+        // }
     }
+    await knex('responses').insert(responsesToPush)
 }

backend/lib/auth/strategies/jwt.js

@@ -36,32 +36,32 @@ module.exports = options => {
         },
         // TODO: Naming conventions need to be reversed again??
         validate: async (decoded, request, h) => {
-            const accessTokenFromHeaders = request.headers.authorization
-            const hashedAccessTokenFromHeaders = await hashToken(
-                accessTokenFromHeaders,
+            const sessionTokenFromHeaders = request.headers.authorization
+            const hashedSessionTokenFromHeaders = await hashToken(
+                sessionTokenFromHeaders,
             )
             const activeSession =
-                request.server.app.activeSessions[hashedAccessTokenFromHeaders]
+                request.server.app.activeSessions[hashedSessionTokenFromHeaders]
             if (!activeSession)
                 throw new Error(
-                    `No session found for ${hashedAccessTokenFromHeaders}`,
+                    `No session found for ${hashedSessionTokenFromHeaders}`,
                 )
 
-            const accessToken = activeSession.accessToken
             const sessionToken = activeSession.sessionToken
-            const validatedAccessToken = validateToken(accessToken)
+            const accessToken = activeSession.accessToken
             const validatedSessionToken = validateToken(sessionToken)
-            if (!validatedSessionToken.payload) {
-                console.log('sessionToken no longer valid, reissuing... ')
-                activeSession.sessionToken = createToken(
-                    { payload: validatedAccessToken.payload },
+            const validatedAccessToken = validateToken(accessToken)
+            if (!validatedAccessToken.payload) {
+                console.log('accessToken no longer valid, reissuing... ')
+                activeSession.accessToken = createToken(
+                    { payload: validatedSessionToken.payload },
                     // NOTE: Expiration of new sessionToken set for 200 seconds (testing)
                     100,
                 )
             }
             try {
                 const validatedJwt = JWT.verify(
-                    accessToken,
+                    sessionToken,
                     process.env.APP_SECRET,
                 )
                 return { isValid: true, credentials: validatedJwt.email }

backend/lib/plugins/user.js

@@ -7,15 +7,14 @@ const JwtStrategy = require('../auth/strategies/jwt')
 const UserModel = require('../models/user')
 const AuthModel = require('../models/authentication')
 
-const UserCurrentRoute = require('../routes/user/current')
 const UserProfileCreateRoute = require('../routes/user/create-profile')
-const UserProfilesListRoute = require('../routes/user/list-profiles')
 const UserLoginRoute = require('../routes/user/login')
 const UserSignupRoute = require('../routes/user/signup')
-const UserEmailRoute = require('../routes/user/email.js')
-const UserVerifyActiveRoute = require('../routes/user/verifyactivesession.js')
-const UserGetAccessRoute = require('../routes/user/getaccess.js')
-const UserValidateSessionRoute = require('../routes/user/validatesession.js')
+const UserEmailRoute = require('../routes/user/send-email.js')
+const UserVerifyActiveRoute = require('../routes/user/verify-session.js')
+const UserCreateTokenRoute = require('../routes/user/token.js')
+const UserValidateSessionRoute = require('../routes/user/validate-session.js')
+const UserRemoveSessionRoute = require('../routes/user/remove-session.js')
 const UserPassword = require('../routes/user/authentication')
 
 const UserService = require('../services/user')
@@ -48,15 +47,14 @@ module.exports = {
         server.registerService(DisplayService)
         server.registerService(HealthService)
 
-        await server.route(UserCurrentRoute)
         await server.route(UserLoginRoute)
         await server.route(UserSignupRoute)
         await server.route(UserProfileCreateRoute)
-        await server.route(UserProfilesListRoute)
         await server.route(UserEmailRoute)
         await server.route(UserVerifyActiveRoute)
-        await server.route(UserGetAccessRoute)
+        await server.route(UserCreateTokenRoute)
         await server.route(UserValidateSessionRoute)
+        await server.route(UserRemoveSessionRoute)
         await server.route(UserPassword)
     },
 }

backend/lib/routes/filter/get.js

@@ -1,5 +1,7 @@
 'use strict'
 
+// NOTE: Current Implementation does not require this route
+// (see Auth.vue in components/onboarding and queue route with filter.js)
 const Joi = require('joi')
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
@@ -10,27 +12,27 @@ const pluginConfig = {
     handlerType: 'filter',
     docs: {
         description: 'Filter match pool',
-        notes: 'Returns filtered subset of match pool'
-    }
+        notes: 'Returns filtered subset of match pool',
+    },
 }
 
 const validators = {
     query: Joi.object({
         match_pool: Joi.array().items(profileSchema.single),
         distance: Joi.string(),
-        presence: Joi.string()
-    })
+        presence: Joi.string(),
+    }),
 }
 
 const responseSchemas = {
     filteredMatchPool: filterSchema.matchPool, // array of profiles
-    error: errorSchema.single
+    error: errorSchema.single,
 }
 
 module.exports = {
     method: 'GET',
     path: '/',
-    options:{
+    options: {
         ...pluginConfig.docs,
         tags: ['api'],
         auth: false,
@@ -38,28 +40,35 @@ module.exports = {
         handler: async function (request, h) {
             const { filterService } = request.server.services()
             let matchPool = request.query.match_pool
-            matchPool = filterService.byDistance(matchPool, request.query.distance)
-            matchPool = filterService.byPresence(matchPool, request.query.presence)
-      
+            matchPool = filterService.byDistance(
+                matchPool,
+                request.query.distance,
+            )
+            matchPool = filterService.byPresence(
+                matchPool,
+                request.query.presence,
+            )
             try {
-                return h.response(({
-                    ok:true,
-                    handler: pluginConfig.handlerType,
-                    data: matchPool
-                })).code(200)
+                return h
+                    .response({
+                        ok: true,
+                        handler: pluginConfig.handlerType,
+                        data: matchPool,
+                    })
+                    .code(200)
             } catch (err) {
                 return h
                     .response({
                         ok: false,
                         handler: pluginConfig.handlerType,
-                        data: {error: `${err}`}
+                        data: { error: `${err}` },
                     })
                     .code(409)
             }
         },
         validate: {
             ...validators,
-            failAction: 'log'
+            failAction: 'log',
         },
 
         response: {
@@ -77,4 +86,4 @@ module.exports = {
             },
         },
     },
-}
+}

backend/lib/routes/profile/queue.js

@@ -4,7 +4,6 @@ const Joi = require('joi')
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
 const profileSchema = require('../../schemas/profiles')
-const params = require('../../schemas/params')
 
 const pluginConfig = {
     handlerType: 'profile',
@@ -22,7 +21,9 @@ const responseSchemas = {
 }
 
 const validators = {
-    params: params.profileId,
+    params: Joi.object({
+        profile_id: Joi.string(),
+    }),
     query: Joi.object({
         include_profile: Joi.bool(),
         limit: Joi.number(),

backend/lib/routes/profile/score.js

@@ -53,10 +53,14 @@ module.exports = {
             const distanceUnit = request.query.unit
                 ? request.query.unit
                 : 'mile'
-            const duration = request.query.duration
-            const presence = request.query.presence
+            const duration = request.query.duration.includes('-')
+                ? request.query.duration.split('-')[0]
+                : request.query.duration
+            const presence =
+                request.query.presence === 'in_person'
+                    ? 'onsite'
+                    : request.query.presence
             const certifications = request.query.certifications
-
             const scoredProfiles = await profileService.scoreProfilesFor(
                 profileId,
                 maxDistanceMiles,

backend/lib/routes/tag/get.js

@@ -2,7 +2,6 @@
 
 const apiSchema = require('../../schemas/api')
 const errorSchema = require('../../schemas/errors')
-const params = require('../../schemas/params')
 const Joi = require('joi')
 
 const pluginConfig = {
@@ -20,8 +19,8 @@ const responseSchemas = {
 
 const validators = {
     params: Joi.object({
-        profile_id: params.profileId,
-        grouping_id: params.groupingId,
+        profile_id: Joi.string(),
+        grouping_id: Joi.string(),
     }),
     query: Joi.object({ category: Joi.string() }),
 }

backend/lib/routes/user/authentication.js

@@ -16,7 +16,7 @@ const pluginConfig = {
 /** Validator functions by request method */
 const validators = {
     /** Validate the route params (/active/{thing}) */
-    params: params.userEmail
+    params: params.userEmail,
 }
 
 module.exports = {

backend/lib/routes/user/current.js

@@ -1,67 +0,0 @@
-'use strict'
-
-const Joi = require('joi')
-const params = require('../../schemas/params')
-
-const pluginConfig = {
-    handlerType: 'user',
-    docs: {
-        get: {
-            description: 'Get user',
-            notes: 'Returns a user item by the id passed in the path',
-        },
-    },
-}
-
-/** Validator functions by request method */
-const validators = {
-    get: {
-        params: params.userName,
-    },
-}
-
-module.exports = {
-    method: 'get',
-    path: '/{name}',
-    options: {
-        ...pluginConfig.docs.get,
-        tags: ['api'],
-        auth: 'default_jwt',
-        handler: async function (request, h) {
-            try {
-                const auth = {
-                    credentials: request.auth.credentials,
-                    token: request.auth.artifacts.token,
-                }
-
-                // /** Get the data for your endpoint */
-                // const { User } = request.models()
-                // const all = await User.query()
-
-                const { displayService } = request.services()
-                const user = displayService.user(auth.credentials, auth.token)
-
-                return {
-                    ok: true,
-                    handler: pluginConfig.handlerType,
-                    data: { name: request.params.name },
-                }
-            } catch (err) {
-                return {
-                    ok: false,
-                    handler: pluginConfig.handlerType,
-                    data: { error: err },
-                }
-            }
-        },
-        validate: validators.get,
-        response: {
-            schema: Joi.object({
-                ok: Joi.bool(),
-                handler: Joi.string(),
-                data: validators.get.params,
-            }).label('user_name_res'),
-            failAction: 'log',
-        },
-    },
-}

backend/lib/routes/user/list-profiles.js

@@ -1,88 +0,0 @@
-'use strict'
-
-const Joi = require('joi')
-const errorSchema = require('../../schemas/errors')
-const profileSchema = require('../../schemas/profiles')
-const params = require('../../schemas/params')
-
-const pluginConfig = {
-    handlerType: 'user',
-    docs: {
-        description: 'profiles',
-        notes: 'A list of profiles associated with this user',
-    },
-}
-
-const validators = {
-    /** Validate the header (cookie check) */
-    // headers: true,
-
-    /** Validate the route params (/active/{thing}) */
-    params: params.userId,
-
-    /** Validate the route query (/active/{thing}?limit=10&offset=10) */
-    // query: true,
-    /** Validate the incoming payload (POST method) */
-    // payload: true,
-}
-
-const responseSchemas = {
-    profilesList: profileSchema.list,
-    error: errorSchema.single,
-}
-
-module.exports = {
-    method: 'GET',
-    path: '/{user_id}/profiles',
-    options: {
-        ...pluginConfig.docs,
-        tags: ['api'],
-        auth: 'default_jwt',
-        cors: true,
-        handler: async function (request, h) {
-            const { userService, profileService } = request.server.services()
-            const userId = request.params.user_id
-            const user = await userService.findById(userId)
-            const type = user.is_poster == 1 ? 'poster' : 'seeker'
-            const profiles = await profileService.getCompleteProfilesFor(
-                userId,
-                type,
-            )
-            try {
-                return {
-                    ok: true,
-                    handler: pluginConfig.handlerType,
-                    data: profiles,
-                }
-            } catch (err) {
-                return {
-                    ok: false,
-                    handler: pluginConfig.handlerType,
-                    data: { error: `${err}` },
-                }
-            }
-        },
-
-        /** Validate based on validators object */
-        validate: {
-            ...validators,
-            failAction: 'log',
-        },
-
-        /** Validate the server response */
-        response: {
-            status: {
-                200: Joi.object({
-                    ok: Joi.bool(),
-                    handler: Joi.string(),
-                    data: responseSchemas.profilesList,
-                }).label('list_profiles_res'),
-                500: Joi.object({
-                    ok: Joi.bool(),
-                    handler: Joi.string(),
-                    data: responseSchemas.error,
-                }).label('error_single_res'),
-            },
-        },
-    },
-}

backend/lib/routes/user/login.js

@@ -19,7 +19,6 @@ const validators = {
             user_email: Joi.string(),
             password: Joi.string(),
         }),
-        
     },
     user: userSchema.single,
     error: errorSchema.single,
@@ -32,10 +31,10 @@ module.exports = {
         ...pluginConfig.docs,
         tags: ['api'],
         auth: false,
+        cors: true,
         handler: async function (request, h) {
             try {
-                const { userService } = request.services()
-
+                const { userService } = request.server.services()
                 const res = request.payload
 
                 // Callback to use as transaction
@@ -50,13 +49,21 @@ module.exports = {
                 }
 
                 // Bound context from your plugin server declaration
-                const user = await h.context.transaction(login)
-                const token = userService.createToken(user)
+                await h.context.transaction(login)
+
+                // Uses Same Logic Behind Initial Sign Up,
+                // passing expected credentials to be used for logging in
+                const { userCredentials, token } =
+                    await userService.makeUserCredentials(res.user_email)
 
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
-                    data: { user_email: user.user_email, jwtToken: token },
+                    data: {
+                        user_email: userCredentials.email,
+                        jwt: token,
+                        answered: userCredentials,
+                    },
                 }
             } catch (err) {
                 console.error(err)
@@ -75,7 +82,12 @@ module.exports = {
                     handler: Joi.string(),
                     data: Joi.object({
                         user_email: Joi.string(),
-                        jwtToken: Joi.string(),
+                        jwt: Joi.string(),
+                        answered: Joi.object({
+                            email: Joi.string(),
+                            name: Joi.string(),
+                            seeking: Joi.string(),
+                        }),
                     }),
                 }).label('login_res'),
                 409: Joi.object({

backend/lib/routes/user/remove-session.js

@@ -0,0 +1,59 @@
+'use strict'
+
+const { plugin } = require('@hapi/inert')
+const Joi = require('joi')
+
+const pluginConfig = {
+    handlerType: 'jwt',
+    docs: {
+        get: {
+            description: 'removes sessionToken from activeSessions upon logout',
+            notes: 'On logout, activeSessions no longer holds onto user credentials',
+        },
+    },
+}
+
+module.exports = {
+    method: 'POST',
+    path: '/remove-session',
+    options: {
+        ...pluginConfig.docs.get,
+        tags: ['api'],
+        auth: false,
+        cors: {
+            headers: ['Authorization', 'Content-Type'],
+            exposedHeaders: ['Authorization', 'Access-Control-Expose-Headers'],
+        },
+        handler: async function (request, h) {
+            const hashedSessionToken = request.payload
+            const { userService } = request.server.services()
+            try {
+                await userService.removeSession(hashedSessionToken)
+                return {
+                    ok: true,
+                    handler: pluginConfig.handlerType,
+                    data: {
+                        sessionTokenIsRemoved: true,
+                    },
+                }
+            } catch (err) {
+                return {
+                    ok: false,
+                    handler: pluginConfig.handlerType,
+                    data: { error: err.message },
+                }
+            }
+        },
+        validate: {
+            failAction: 'log',
+        },
+        response: {
+            schema: Joi.object({
+                ok: Joi.bool(),
+                handler: Joi.string(),
+                data: Joi.object(),
+            }).label('validate_session_res'),
+            failAction: 'log',
+        },
+    },
+}

backend/lib/routes/user/email.js → backend/lib/routes/user/send-email.js

@@ -12,9 +12,18 @@ const pluginConfig = {
     },
 }
 
+const validators = {
+    payload: Joi.object({
+        email: Joi.string(),
+        name: Joi.string(),
+        seeking: Joi.string(),
+        sessionToken: Joi.string(),
+    }),
+}
+
 module.exports = {
     method: 'POST',
-    path: '/sendemail/',
+    path: '/send-email/',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],
@@ -25,7 +34,7 @@ module.exports = {
             const userCredentials = request.payload
             try {
                 const emailSent = await userService.emailSent(userCredentials)
-                const hashedAccessToken = Object.keys(
+                const hashedSessionToken = Object.keys(
                     userService.activeSessions,
                 ).find(hashedToken => {
                     return (
@@ -35,15 +44,15 @@ module.exports = {
                 })
                 // Registers the activeSessions object for use by jwt auth strategy
                 request.server.app.activeSessions = userService.activeSessions
-                if (!hashedAccessToken.length) {
-                    throw Error('hashedAccessToken not Found!!')
+                if (!hashedSessionToken?.length) {
+                    throw Error('hashedSessionToken not Found!!')
                 }
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
                     data: {
                         emailSentSuccessfully: emailSent.wasSuccessfull,
-                        hashedAccessToken: hashedAccessToken,
+                        hashedSessionToken,
                     },
                 }
             } catch (err) {
@@ -58,6 +67,7 @@ module.exports = {
             }
         },
         validate: {
+            ...validators,
             failAction: 'log',
         },
         response: {

backend/lib/routes/user/getaccess.js → backend/lib/routes/user/token.js

@@ -6,15 +6,25 @@ const pluginConfig = {
     handlerType: 'authentication',
     docs: {
         get: {
-            description: 'gets session token for authentication',
-            notes: 'Gets session token for authentication',
+            description: 'creates session token for authentication',
+            notes: 'Creates session token for authentication',
         },
     },
 }
 
+const validators = {
+    payload: Joi.object({
+        payload: Joi.object({
+            email: Joi.string(),
+            name: Joi.string(),
+            seeking: Joi.string(),
+        }),
+    }),
+}
+
 module.exports = {
     method: 'POST',
-    path: '/getaccess',
+    path: '/token',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],
@@ -26,15 +36,15 @@ module.exports = {
         handler: async function (request, h) {
             const { userService } = request.server.services()
             const res = request.payload
-            // NOTE: Access Token set for 5 minutes expiration (default)
-            const accessToken = await userService.createToken(res, 600)
+            // NOTE: Session Token set for 5 minutes expiration (default)
+            const sessionToken = await userService.createToken(res, 600)
             try {
                 const response = h.response({
                     ok: true,
                     handler: pluginConfig.handlerType,
-                    data: accessToken,
+                    data: sessionToken,
                 })
-                response.header('Authorization', accessToken)
+                response.header('Authorization', sessionToken)
                 return response
             } catch (err) {
                 return {
@@ -47,6 +57,7 @@ module.exports = {
             }
         },
         validate: {
+            ...validators,
             failAction: 'log',
         },
         response: {

backend/lib/routes/user/validatesession.js → backend/lib/routes/user/validate-session.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const { plugin } = require('@hapi/inert')
 const Joi = require('joi')
 
 const pluginConfig = {
@@ -8,14 +7,18 @@ const pluginConfig = {
     docs: {
         get: {
             description: 'validates session token for each step of survey',
-            notes: 'validates session token for each step of survey',
+            notes: 'Validates session token for each step of survey',
         },
     },
 }
 
+const validators = {
+    payload: Joi.string(),
+}
+
 module.exports = {
     method: 'POST',
-    path: '/validatesession',
+    path: '/validate-session',
     options: {
         ...pluginConfig.docs.get,
         tags: ['api'],
@@ -25,35 +28,27 @@ module.exports = {
             exposedHeaders: ['Authorization', 'Access-Control-Expose-Headers'],
         },
         handler: async function (request, h) {
-            const hashedAccessToken = request.payload
+            const hashedSessionToken = request.payload
             const { userService, profileService } = request.server.services()
             try {
                 const validatedSessionToken =
-                    userService.validateSession(hashedAccessToken)
+                    userService.validateSession(hashedSessionToken)
                 const user = await userService.findByUserEmail(
                     validatedSessionToken.email,
                 )
-                const type = user.is_poster == 1 ? 'poster' : 'seeker'
+                const type = user.is_poster === 1 ? 'poster' : 'seeker'
                 const profiles = await profileService.getCompleteProfilesFor(
                     user.user_id,
                     type,
                 )
                 // TODO: handle user with multiple profiles...
                 const profileId = profiles[0].profile_id
-                const responses = []
-                profiles[0].responses.forEach(response => {
-                    responses.push({
-                        response_key_id: response.response_key_id,
-                        val: response.val,
-                    })
-                })
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
                     data: {
                         ...validatedSessionToken,
                         profileId: profileId,
-                        responses: responses,
                     },
                 }
             } catch (err) {
@@ -65,6 +60,7 @@ module.exports = {
             }
         },
         validate: {
+            ...validators,
             failAction: 'log',
         },
         response: {

backend/lib/routes/user/verifyactivesession.js → backend/lib/routes/user/verify-session.js

@@ -12,6 +12,12 @@ const pluginConfig = {
     },
 }
 
+const validators = {
+    params: Joi.object({
+        hashedSessionToken: Joi.string(),
+    }),
+}
+
 module.exports = {
     method: 'GET',
     path: '/verify/{hashedSessionToken}',
@@ -29,7 +35,7 @@ module.exports = {
                 ).find(hashedToken => {
                     return hashedToken === hash
                 })
-                if (!hashToMatch.length) {
+                if (!hashToMatch?.length) {
                     throw Error('hashToMatch Not Found!')
                 }
                 const now = Date.now()
@@ -45,6 +51,11 @@ module.exports = {
                 if (!hashToMatch) {
                     throw new Error('no record of email in cache')
                 }
+                // NOTE: When user responds to email,
+                // boolean value is set to true, allowing user back into the survey
+                userService.activeSessions[
+                    hashToMatch
+                ].emailWasRespondedTo = true
                 return {
                     ok: true,
                     handler: pluginConfig.handlerType,
@@ -64,6 +75,7 @@ module.exports = {
             }
         },
         validate: {
+            ...validators,
             failAction: 'log',
         },
         response: {

backend/lib/services/filter.js

@@ -29,24 +29,40 @@ module.exports = class FilterService extends Schmervice.Service {
         })
     }
 
-    byDuration(profileList, duration) {
-        return profileList.filter(profile => {
-            // TODO find duration
-            return profile.duration === duration
-        })
-    }
-
     byPresence(profileList, presence) {
-        return profileList.filter(profile => {
-            // TODO find presence
-            return profile.presence === presence
-        })
+        const matchingProfiles = []
+        for (const profile of profileList) {
+            for (const response of profile.responses) {
+                if (
+                    response.response_key_id === 15 &&
+                    response.val === presence
+                ) {
+                    matchingProfiles.push(profile)
+                }
+            }
+        }
+        return matchingProfiles
     }
 
-    byCertifications(profileList, certifications) {
-        return profileList.filter(profile => {
-            // TODO find certifications
-            return profile.certifications === certifications
-        })
+    byDuration(profileList, duration) {
+        const matchingProfiles = []
+        for (const profile of profileList) {
+            for (const response of profile.responses) {
+                if (
+                    response.response_key_id === 14 &&
+                    response.val === duration
+                ) {
+                    matchingProfiles.push(profile)
+                }
+            }
+        }
+        return matchingProfiles
     }
+
+    // TODO: Implement filtering by matching certification
+    // byCertifications(profileList, certifications) {
+    // return profileList.filter(profile => {
+    // return profile.certifications === certifications
+    // })
+    // }
 }

backend/lib/services/matchqueue.js

@@ -9,9 +9,9 @@ module.exports = class MatchQueueService extends Schmervice.Service {
      * @param {number} profileId
      * @returns {array} MatchQueue
      */
-    async getQueue(profileId, limit, offset=0) {
+    async getQueue(profileId, limit, offset = 0) {
         const { MatchQueue } = this.server.models()
-        if(typeof limit==='undefined') {
+        if (typeof limit === 'undefined') {
             return await MatchQueue.query()
                 .where('profile_id', profileId)
                 .where('is_deleted', 0)

backend/lib/services/profile/index.js

@@ -4,7 +4,8 @@ const config = require('../../../db/data-generator/config.json')
 const profiler = require('./profiler')
 const scoring = require('./scorer')
 const zipcoder = require('./zipcoder')
-const filter = require('../filter')
+const Filter = require('../filter')
+const filter = new Filter()
 
 module.exports = class ProfileService extends Schmervice.Service {
     constructor(...args) {
@@ -28,10 +29,12 @@ module.exports = class ProfileService extends Schmervice.Service {
         if (Object.keys(this.tagLookup).length) return
         const { Tag } = this.server.models()
         const allTagDescriptions = await Tag.query()
-        allTagDescriptions.forEach(desc => {
-            if (!desc.is_active) return
-            this.tagLookup[desc.tag_id] = desc
-        })
+        if (allTagDescriptions.length) {
+            allTagDescriptions.forEach(desc => {
+                if (!desc.is_active) return
+                this.tagLookup[desc.tag_id] = desc
+            })
+        } else return
     }
     /**
      * Internal method to get list of profile_ids for this user
@@ -40,15 +43,12 @@ module.exports = class ProfileService extends Schmervice.Service {
      */
     async _getProfileIdsForUserId(userId) {
         const { Profile } = this.server.models()
-
         /** Grab every Profile associated with this id */
         const allProfiles = await Profile.query().where('user_id', userId)
-
         /** Copy a list of the just the Profiles */
-        const profileIdsToGrab = allProfiles.map(profile => profile.profile_id)
-
-        /** Uncomment to dedupe the list just in case */
-        return [...new Set(profileIdsToGrab)]
+        return typeof allProfiles === 'object' && allProfiles !== null
+            ? [...new Set(allProfiles.map(profile => profile.profile_id))]
+            : [allProfiles]
     }
 
     /**
@@ -252,7 +252,6 @@ module.exports = class ProfileService extends Schmervice.Service {
         certifications,
     ) {
         const { Profile } = this.server.models()
-
         await this._setScoreLookup()
 
         // Our User Profile to score for
@@ -276,10 +275,12 @@ module.exports = class ProfileService extends Schmervice.Service {
             distanceUnit,
             userZip,
         )
+
         matchPool = filter.byDistance(matchPool, maxDistance)
         matchPool = filter.byDuration(matchPool, duration)
         matchPool = filter.byPresence(matchPool, presence)
-        matchPool = filter.byCertifications(matchPool, certifications)
+        // TODO: Incorporate filtering by certifications (see filter.js)
+        // matchPool = filter.byCertifications(matchPool, certifications)
 
         const scoredProfilesWithDistance = scoring.scoreAll(
             matchPool,
@@ -293,12 +294,11 @@ module.exports = class ProfileService extends Schmervice.Service {
     }
 
     async calcProfileDistances(matchPool, distanceUnit, userZip) {
-        await Promise.all(
+        const returnVal = await Promise.all(
             matchPool.map(async profile => {
                 const targetZip = zipcoder.getZipCodeFromProfile(profile)
                 if (!userZip || !targetZip)
                     return { ...profile, distance: [9999, distanceUnit] }
-
                 const distance = await this._compareDistance(
                     userZip,
                     targetZip,
@@ -310,6 +310,7 @@ module.exports = class ProfileService extends Schmervice.Service {
                 }
             }),
         )
+        return returnVal
     }
 
     /**
@@ -324,11 +325,14 @@ module.exports = class ProfileService extends Schmervice.Service {
             parseInt(zipCode),
         )
         if (!zipInfo) {
-            console.error('zip:', zipCode)
-        }
-        return {
-            latitude: parseFloat(zipInfo.latitude),
-            longitude: parseFloat(zipInfo.longitude),
+            throw new Error(
+                `ERROR :=> no zipInfo found for zipCode: ${zipCode}`,
+            )
+        } else {
+            return {
+                latitude: parseFloat(zipInfo.latitude),
+                longitude: parseFloat(zipInfo.longitude),
+            }
         }
     }
     /**
@@ -339,7 +343,13 @@ module.exports = class ProfileService extends Schmervice.Service {
      * @param {number} distance in miles
      */
     async _compareDistance(start_zip, end_zip, distanceUnit) {
-        if (!start_zip || !end_zip || isNaN(start_zip) || isNaN(end_zip)) return
+        if (
+            !start_zip ||
+            !end_zip ||
+            Number.isNaN(start_zip) ||
+            Number.isNaN(end_zip)
+        )
+            return
         const start = await this._latLonForZip(start_zip)
         const end = await this._latLonForZip(end_zip)
         return haversine(start, end, { unit: distanceUnit })
@@ -356,8 +366,8 @@ module.exports = class ProfileService extends Schmervice.Service {
         await this._setTagLookup()
         let associations = groupingId
             ? await TagAssociation.query()
-                .where('grouping_id', groupingId)
-                .andWhere('profile_id', profileId)
+                  .where('grouping_id', groupingId)
+                  .andWhere('profile_id', profileId)
             : await TagAssociation.query().andWhere('profile_id', profileId)
         return associations
             .map(assoc => ({

backend/lib/services/profile/profiler.js

@@ -105,9 +105,13 @@ const makeOrderedCompleteProfiles = (
  * @returns {Array}
  */
 const makeCompleteFromProfileEntries = (profilesEntries, type, tagLookup) => {
-    return profilesEntries.map(entry =>
-        _makeCompleteProfile(entry, type, tagLookup),
-    )
+    try {
+        return profilesEntries.map(entry =>
+            _makeCompleteProfile(entry, type, tagLookup),
+        )
+    } catch (err) {
+        throw new Error(err)
+    }
 }
 
 module.exports = {

backend/lib/services/user.js

@@ -7,23 +7,15 @@ const Schmervice = require('@hapipal/schmervice')
 const SecurePassword = require('secure-password')
 
 // Configuration for Brevo
-const SibApiV3Sdk = require('sib-api-v3-sdk')
-const { access, accessSync } = require('fs')
-const defaultClient = SibApiV3Sdk.ApiClient.instance
+const Brevo = require('@getbrevo/brevo')
+const defaultClient = Brevo.ApiClient.instance
 const apiKey = defaultClient.authentications['api-key']
 apiKey.apiKey = process.env.BREVO_KEY
+const apiInstance = new Brevo.TransactionalEmailsApi()
+const sendSmtpEmail = new Brevo.SendSmtpEmail()
 
-const apiInstance = new SibApiV3Sdk.TransactionalEmailsApi()
-
-const hashToken = async token => {
-    const salt = process.env.APP_SESSION_SALT
-    try {
-        return crypto.createHmac('sha256', salt).update(token).digest('hex')
-    } catch (err) {
-        throw new Error(err.message)
-    }
-}
-
+// TODO: Consider implementing, nice use of SecurePassword,
+// but currently not used anywhere...
 const hasher = async (pwd, steak) => {
     const hash = await pwd.hash(steak)
     const result = await pwd.verify(steak, hash)
@@ -66,24 +58,7 @@ module.exports = class UserService extends Schmervice.Service {
         const pwd = new SecurePassword()
         // TODO: Invalidate this application state somehow after a
         // certain time period has passed
-        this.activeSessions = {
-            // abc123456: '123456689',
-            // eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...hashedSessionToken: {
-            // email: rawEmailString,
-            // name: 'Joe Doe',
-            // seeking: 'candidate'
-            // sessionToken: rawSessionToken, // use for expires instead of expires?
-            // expires: expirationTime in seconds
-            // }
-        }
-        // Check the hashedCookie which is our hashedSessionToken string
-        // validate whether or not the rawAccessToken is still valid, if valid good to go.
-        // if NOT valid, then we need to reassign accessToken to a newAccessToken
-        // this.activeSessions = {
-        // eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...hashedSessionToken: {
-        // accessToken: 'as;dflkja;;dlfkja;sldkf... rawAccessToken'
-        // }
-        // }
+        this.activeSessions = {}
 
         this.pwd = {
             hash: Util.promisify(pwd.hash.bind(pwd)),
@@ -136,6 +111,15 @@ module.exports = class UserService extends Schmervice.Service {
         return user
     }
 
+    hashToken(token) {
+        const salt = process.env.APP_SESSION_SALT
+        try {
+            return crypto.createHmac('sha256', salt).update(token).digest('hex')
+        } catch (err) {
+            throw new Error(err.message)
+        }
+    }
+
     /**
      * Signup function
      * @param {*} param0
@@ -208,11 +192,11 @@ module.exports = class UserService extends Schmervice.Service {
             .throwIfNotFound()
             .first()
             .where({ user_email: email })
-
         const bufferPepper = Buffer.from(process.env.PEPPER + password)
 
         /** Uncomment to run password check using SecurePassword */
         const passwordCheck = await this.pwd.verify(bufferPepper, user.token)
+
         if (passwordCheck === SecurePassword.VALID_NEEDS_REHASH) {
             await this.changePassword(user.user_email, password, txn)
         } else if (passwordCheck !== SecurePassword.VALID) {
@@ -234,6 +218,22 @@ module.exports = class UserService extends Schmervice.Service {
         return JWT.sign(obj, key, { expiresIn: expiration })
     }
 
+    async makeUserCredentials(email) {
+        const user = await this.findByUserEmail(email)
+        const userCredentials = {
+            email: user.user_email,
+            name: user.user_name,
+            seeking: user.is_poster === 1 ? 'poster' : 'seeker',
+        }
+        const token = this.createToken({
+            payload: userCredentials,
+        })
+        return {
+            userCredentials,
+            token,
+        }
+    }
+
     /**
      * Validates whether a token has expired or not
      * @param {User} user
@@ -253,18 +253,31 @@ module.exports = class UserService extends Schmervice.Service {
      * @param {HashedSessionToken} hashedSessionToken
      * @returns {PayloadFromActiveSessions}
      */
-    validateSession(hashedAccessToken) {
-        const userSession = this.activeSessions[hashedAccessToken]
+    validateSession(hashedSessionToken) {
+        const userSession = this.activeSessions[hashedSessionToken]
         if (!userSession) {
             throw new Error(
                 'hashedSessionToken not in activeSessions registry!',
             )
         }
-        const accessToken = userSession.accessToken
-        const accessTokenIsValid = this.validateToken(accessToken)
+        if (!userSession.emailWasRespondedTo) {
+            throw new Error('email was never responded to!')
+        }
+        const sessionToken = userSession.sessionToken
+        const sessionTokenIsValid = this.validateToken(sessionToken)
         return {
-            ...accessTokenIsValid.payload,
-            accessToken: this.activeSessions[hashedAccessToken].accessToken,
+            ...sessionTokenIsValid.payload,
+            sessionToken: this.activeSessions[hashedSessionToken].sessionToken,
+        }
+    }
+    removeSession(hashedSessionToken) {
+        const userSession = this.activeSessions[hashedSessionToken]
+        if (!userSession) {
+            throw new Error(
+                'hashedSessionToken not in activeSessions registry!',
+            )
+        } else {
+            delete this.activeSessions[hashedSessionToken]
         }
     }
     /**
@@ -297,7 +310,6 @@ module.exports = class UserService extends Schmervice.Service {
         const passwordRow = await Auth.query(txn)
             .where('user_email', email)
             .first()
-
         return passwordRow ? passwordRow.token : null
     }
 
@@ -306,35 +318,39 @@ module.exports = class UserService extends Schmervice.Service {
      * @ returns {Object}
      */
     async emailSent(userCredentials) {
-        const hashedAccessToken = await hashToken(userCredentials.accessToken)
-        if (Object.keys(this.activeSessions).includes(hashedAccessToken)) {
+        const hashedSessionToken = this.hashToken(userCredentials.sessionToken)
+        if (Object.keys(this.activeSessions).includes(hashedSessionToken)) {
             return new Error('session already in cache!!')
         }
         // Set expiration time for ten minutes from now
         const duration = 600000
 
-        this.activeSessions[hashedAccessToken] = {
+        this.activeSessions[hashedSessionToken] = {
             email: userCredentials.email,
             name: userCredentials.name,
             seeking: userCredentials.seeking,
-            accessToken: userCredentials.accessToken,
+            sessionToken: userCredentials.sessionToken,
             expiration: Date.now() + duration,
-            sessionToken: null,
+            emailWasRespondedTo: false,
+            accessToken: null,
         }
-
-        const sendSmtpEmail = {
-            to: [
-                {
-                    email: userCredentials.email,
-                },
-            ],
-            templateId: 2,
-            params: {
-                // TODO: Change this in production...
-                link: `localhost:3000/verify/${hashedAccessToken}`,
+        // NOTE: Although this looks messy, Brevo requries these
+        // parameters be defined individually like this, attempts
+        // to configure this in a singel object cause errors on their API
+        sendSmtpEmail.sender = {
+            name: 'My Test Company',
+            email: 'mytestemail@email.com',
+        }
+        sendSmtpEmail.subject = 'My Test Company'
+        sendSmtpEmail.to = [
+            {
+                email: userCredentials.email,
             },
+        ]
+        sendSmtpEmail.templateId = Number(process.env.BREVO_TEMPLATE_ID)
+        sendSmtpEmail.params = {
+            link: `${process.env.BREVO_LINK}/verify/${hashedSessionToken}`,
         }
-
         return await apiInstance.sendTransacEmail(sendSmtpEmail).then(
             data => {
                 return { wasSuccessfull: true, data: data }

backend/package-lock.json

@@ -9,6 +9,7 @@
             "version": "1.0.0",
             "license": "UNLICENSED",
             "dependencies": {
+                "@getbrevo/brevo": "^1.0.1",
                 "@hapi/glue": "^8.0.0",
                 "@hapi/hapi": "^20.1.3",
                 "@hapi/inert": "^6.0.3",
@@ -28,8 +29,7 @@
                 "knex": "^0.21.19",
                 "mysql": "^2.18.1",
                 "objection": "^2.2.18",
-                "secure-password": "^4.0.0",
-                "sib-api-v3-sdk": "^8.5.0"
+                "secure-password": "^4.0.0"
             },
             "devDependencies": {
                 "ava": "^3.15.0",
@@ -577,6 +577,15 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/@getbrevo/brevo": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@getbrevo/brevo/-/brevo-1.0.1.tgz",
+            "integrity": "sha512-NwUOlkft6NwLSKTph9FWQujMM5ysSGWOa9Wdf0Bc/RezejOW5VG5KXvTmXrF1Q+MHmjzTh6GDWjq5EukQsDdnA==",
+            "dependencies": {
+                "querystring": "^0.2.1",
+                "superagent": "^8.0.9"
+            }
+        },
         "node_modules/@hapi/accept": {
             "version": "5.0.2",
             "resolved": "https://registry.npmjs.org/@hapi/accept/-/accept-5.0.2.tgz",
@@ -1409,6 +1418,11 @@
                 "node": ">=8"
             }
         },
+        "node_modules/asap": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+            "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
+        },
         "node_modules/assign-symbols": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -1876,12 +1890,13 @@
             }
         },
         "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+            "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.1",
+                "set-function-length": "^1.1.1"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -2481,6 +2496,7 @@
             "version": "3.2.7",
             "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
             "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+            "dev": true,
             "dependencies": {
                 "ms": "^2.1.1"
             }
@@ -2565,6 +2581,19 @@
             "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
             "dev": true
         },
+        "node_modules/define-data-property": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+            "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/define-property": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -2615,6 +2644,15 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/dezalgo": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+            "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+            "dependencies": {
+                "asap": "^2.0.0",
+                "wrappy": "1"
+            }
+        },
         "node_modules/diff": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@@ -3370,6 +3408,11 @@
             "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
             "dev": true
         },
+        "node_modules/fast-safe-stringify": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+        },
         "node_modules/fastq": {
             "version": "1.11.0",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -3536,16 +3579,16 @@
             }
         },
         "node_modules/form-data": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz",
-            "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
             "dependencies": {
                 "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.6",
+                "combined-stream": "^1.0.8",
                 "mime-types": "^2.1.12"
             },
             "engines": {
-                "node": ">= 0.12"
+                "node": ">= 6"
             }
         },
         "node_modules/format-util": {
@@ -3554,10 +3597,15 @@
             "integrity": "sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="
         },
         "node_modules/formidable": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
-            "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
-            "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
+            "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
+            "dependencies": {
+                "dezalgo": "^1.0.4",
+                "hexoid": "^1.0.0",
+                "once": "^1.4.0",
+                "qs": "^6.11.0"
+            },
             "funding": {
                 "url": "https://ko-fi.com/tunnckoCore/commissions"
             }
@@ -3614,9 +3662,12 @@
             }
         },
         "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/functional-red-black-tree": {
             "version": "1.0.1",
@@ -3803,6 +3854,17 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "dependencies": {
+                "get-intrinsic": "^1.1.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/got": {
             "version": "9.6.0",
             "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -3918,6 +3980,17 @@
                 "node": ">=4"
             }
         },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+            "dependencies": {
+                "get-intrinsic": "^1.1.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/has-proto": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
@@ -4028,6 +4101,14 @@
             "resolved": "https://registry.npmjs.org/haversine/-/haversine-1.1.1.tgz",
             "integrity": "sha512-KW4MS8+krLIeiw8bF5z532CptG0ZyGGFj0UbKMxx25lKnnJ1hMUbuzQl+PXQjNiDLnl1bOyz23U6hSK10r4guw=="
         },
+        "node_modules/hexoid": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz",
+            "integrity": "sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/homedir-polyfill": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -5337,14 +5418,14 @@
             }
         },
         "node_modules/mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
             "bin": {
                 "mime": "cli.js"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=4.0.0"
             }
         },
         "node_modules/mime-db": {
@@ -5830,9 +5911,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.12.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-            "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
             }
@@ -5904,7 +5985,6 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "dev": true,
             "dependencies": {
                 "wrappy": "1"
             }
@@ -6499,9 +6579,9 @@
             }
         },
         "node_modules/querystring": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+            "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
             "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
             "engines": {
                 "node": ">=0.4.x"
@@ -6935,6 +7015,20 @@
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
             "dev": true
         },
+        "node_modules/set-function-length": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+            "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+            "dependencies": {
+                "define-data-property": "^1.1.1",
+                "get-intrinsic": "^1.2.1",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
         "node_modules/set-value": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -6989,16 +7083,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/sib-api-v3-sdk": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/sib-api-v3-sdk/-/sib-api-v3-sdk-8.5.0.tgz",
-            "integrity": "sha512-6Ratp5kLN/rEEvk4XVIQ4L8IrCIrcfE9m1HjvHz/WepC+CVXPsjOlgRcK/jQjpN5kC+dmhDAqrTo1OtnF6i1wA==",
-            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-            "dependencies": {
-                "querystring": "0.2.0",
-                "superagent": "3.7.0"
-            }
-        },
         "node_modules/side-channel": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
@@ -7578,24 +7662,58 @@
             }
         },
         "node_modules/superagent": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.7.0.tgz",
-            "integrity": "sha512-/8trxO6NbLx4YXb7IeeFTSmsQ35pQBiTBsLNvobZx7qBzBeHYvKCyIIhW2gNcWbLzYxPAjdgFbiepd8ypwC0Gw==",
-            "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
-            "dependencies": {
-                "component-emitter": "^1.2.0",
-                "cookiejar": "^2.1.0",
-                "debug": "^3.1.0",
-                "extend": "^3.0.0",
-                "form-data": "^2.3.1",
-                "formidable": "^1.1.1",
-                "methods": "^1.1.1",
-                "mime": "^1.4.1",
-                "qs": "^6.5.1",
-                "readable-stream": "^2.0.5"
+            "version": "8.1.2",
+            "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.1.2.tgz",
+            "integrity": "sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==",
+            "dependencies": {
+                "component-emitter": "^1.3.0",
+                "cookiejar": "^2.1.4",
+                "debug": "^4.3.4",
+                "fast-safe-stringify": "^2.1.1",
+                "form-data": "^4.0.0",
+                "formidable": "^2.1.2",
+                "methods": "^1.1.2",
+                "mime": "2.6.0",
+                "qs": "^6.11.0",
+                "semver": "^7.3.8"
             },
             "engines": {
-                "node": ">= 4.0"
+                "node": ">=6.4.0 <13 || >=14"
+            }
+        },
+        "node_modules/superagent/node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/superagent/node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "node_modules/superagent/node_modules/semver": {
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
         "node_modules/supertap": {
@@ -8200,8 +8318,7 @@
         "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-            "dev": true
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "node_modules/write-file-atomic": {
             "version": "3.0.3",

backend/package.json

@@ -12,11 +12,12 @@
         "reseed": "knex migrate:rollback --all && knex migrate:latest && knex seed:run",
         "generate": "node ./db/data-generator/index.js",
         "seed": "knex seed:run",
-        "test": "nyc ava --timeout=100000"
+        "test": "nyc ava --timeout=100000 --verbose"
     },
     "author": "TOJ",
     "license": "UNLICENSED",
     "dependencies": {
+        "@getbrevo/brevo": "^1.0.1",
         "@hapi/glue": "^8.0.0",
         "@hapi/hapi": "^20.1.3",
         "@hapi/inert": "^6.0.3",
@@ -36,8 +37,7 @@
         "knex": "^0.21.19",
         "mysql": "^2.18.1",
         "objection": "^2.2.18",
-        "secure-password": "^4.0.0",
-        "sib-api-v3-sdk": "^8.5.0"
+        "secure-password": "^4.0.0"
     },
     "devDependencies": {
         "ava": "^3.15.0",

backend/tests/user-auth-pass.spec.js

@@ -0,0 +1,74 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+const Auth = require('../lib/models/authentication.js')
+
+const params = {
+    user_email: 'test@testemail.com',
+}
+
+const mockReturn = {
+    password: 'a;slkdfja;ldfjk;alkdsfja;lsdkfj',
+}
+
+const pathToTest = {
+    method: 'GET',
+    url: `/${params.user_email}/password`,
+}
+
+test(`path /${params.user_email}/password should return OK on GET`, async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     * -
+     * NOTE: We use a mocked registerModel() and register
+     * models manually. Normally this is handled by
+     * Schwifty at runtime.
+     */
+    const server = Hapi.server()
+    /**
+     * Overload so we don't register any models
+     * using the plugin call (see plugins/profile.js)
+     * and Manually load the model we need for the test
+     */
+
+    server.models = () => ({ Auth })
+    // TODO: Apply server.registrations to other test specs
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Routes and Services as usual
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+
+    /**
+     * Replace Objection model methods with our own mock functions
+     * !: Janky - might be better to temp knex sqlite instance
+     */
+    stub(server.models()['Auth'], 'query').returns({
+        where: () => ({
+            first: () => ({
+                token: 'a;slkdfja;ldfjk;alkdsfja;lsdkfj',
+            }),
+        }),
+    })
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-create-profile.spec.js

@@ -0,0 +1,112 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+const ProfileService = require('../lib/services/profile/index.js')
+
+const plugin = require('../lib/plugins/user.js')
+const User = require('../lib/models/user.js')
+const Profile = require('../lib/models/profile.js')
+const Tag = require('../lib/models/tag.js')
+const Response = require('../lib/models/response.js')
+
+const params = {
+    user_id: 102,
+}
+const payload = [
+    { response_key_id: 8, val: 'bobby@bob.com' },
+    { response_key_id: 9, val: 'password' },
+    { response_key_id: 7, val: 'fk' },
+    { response_key_id: 11, val: 'position' },
+]
+
+const mockProfile = {
+    user_id: 102,
+    id: 147,
+}
+
+const mockReturn = {
+    user_id: 102,
+    profile_id: 147,
+}
+
+const pathToTest = {
+    method: 'POST',
+    url: `/${params.user_id}/profile`,
+    payload: JSON.stringify(payload),
+}
+
+test('path /<user_id>/profile should return new profile info', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     * -
+     * NOTE: We use register models manually.
+     * Normally this is handled by
+     * Schwifty at runtime.
+     */
+    const server = Hapi.server()
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+    /**
+     * Register Routes and Services as usual
+     */
+    await plugin.register(server)
+
+    server.models = () => ({
+        User,
+        Profile,
+        Tag,
+        Response,
+    })
+
+    server.services()['userService'] = new UserService(server)
+    server.services()['profileService'] = new ProfileService(server)
+
+    /**
+     * Replace Objection model methods with our own mock functions
+     * !: Janky - might be better to temp knex sqlite instance
+     */
+    stub(server.models()['User'], 'query').returns({
+        throwIfNotFound: () => ({
+            first: () => ({
+                where: () => mockProfile.user_id,
+            }),
+        }),
+    })
+
+    stub(server.models()['Tag'], 'query').returns({})
+    stub(server.models()['Profile'], 'query').returns({
+        where: () => mockProfile.user_id,
+        whereIn: () => ({
+            withGraphFetched: () => ({
+                withGraphFetched: () => ({
+                    withGraphFetched: () => [],
+                }),
+            }),
+        }),
+        insert: () => mockProfile,
+    })
+
+    stub(server.models()['Response'], 'query').returns({
+        insert: () => ({
+            profile_id: 147,
+            response_key_id: 11,
+            val: 'position',
+            id: 3,
+        }),
+    })
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-create-token.spec.js

@@ -0,0 +1,64 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+
+const JWT = require('jsonwebtoken')
+
+const payload = {
+    email: 'test@testemail.com',
+    name: 'fk',
+    seeking: 'seeker',
+}
+
+const data = payload
+
+const pathToTest = {
+    method: 'POST',
+    url: '/token',
+    payload: JSON.stringify(payload),
+}
+
+test('path /token should return OK', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     */
+    const server = Hapi.server()
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Services
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+
+    const createToken = (data, expiration = 600) => {
+        const key = process.env.APP_SECRET
+        const obj = {}
+        Object.assign(obj, { ...data })
+        return JWT.sign(obj, key, { expiresIn: expiration })
+    }
+
+    stub(server.services()['userService'], 'createToken').returns(
+        createToken(data),
+    )
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.assert(res.data)
+    t.is(res.data.error, undefined)
+    server.stop()
+})

backend/tests/user-credential.spec.js

@@ -0,0 +1,111 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const Objection = require('objection')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+
+const Auth = require('../lib/models/authentication.js')
+const User = require('../lib/models/user.js')
+
+/**
+ * Route parameters
+ */
+const payload = {
+    user_email: 'test@testemail.com',
+    password: 'abcd123',
+}
+
+const mockReturn = {
+    user_id: 1234,
+    user_name: 'brian',
+    user_email: 'test@testemail.com',
+    is_poster: 1,
+    is_admin: 0,
+    is_verified: 1,
+}
+
+const pathToTest = {
+    method: 'POST',
+    url: `/login`,
+    payload: JSON.stringify(payload),
+}
+
+test('path /login should return ok', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     * -
+     * NOTE: We use a mocked registerModel() and register
+     * models manually. Normally this is handled by
+     * Schwifty at runtime.
+     */
+    const server = Hapi.server()
+    /**
+     * Overload so we don't register any models
+     * using the plugin call (see plugins/profile.js)
+     * and Manually load the model we need for the test
+     */
+    server.registerModel = () => {}
+
+    server.models = () => ({ User, Auth })
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+    server.registrations['main-app-plugin'].options.jwtKey = {
+        $filter: 'NODE_ENV',
+        $default: {
+            $param: 'APP_SECRET',
+            $default: 'app-secret',
+        },
+        // Use .env file in production
+        production: {
+            $param: 'APP_SECRET',
+        },
+    }
+    stub(Objection, 'transaction').returns({})
+    /**
+     * Register Routes and Services as usual
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+    server.services()['userService'].createToken = () =>
+        'a;slkdf;asdfa;sdfkja;lsdfj;askdfj;laskdjf;laskjdf'
+
+    /**
+     * Replace Objection model methods with our own mock functions
+     * !: Janky - might be better to temp knex sqlite instance
+     */
+
+    stub(server.models()['Auth'], 'query').returns({
+        throwIfNotFound: () => ({
+            first: () => ({
+                where: () => ({ ...mockReturn }),
+            }),
+        }),
+    })
+    stub(server.models()['User'], 'createNotFoundError').returns({})
+    stub(server.models()['User'], 'query').returns({
+        throwIfNotFound: () => ({
+            first: () => ({
+                where: () => ({ ...mockReturn }),
+            }),
+        }),
+    })
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data.answered.email, mockReturn.user_email)
+    t.deepEqual(res.data.answered.name, mockReturn.user_name)
+    t.deepEqual(res.data.answered.seeking, 'poster')
+})

backend/tests/user-remove-session.spec.js

@@ -0,0 +1,76 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+
+const payload = 'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk'
+const hashedSessionToken = 'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk'
+
+const activeSessions = {
+    'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk': {
+        email: 'test@testemail.com',
+        name: 'john_doe',
+        seeking: 'position',
+        sessionToken: 'efasdf;laksdfja;lkdjfa;lkdjf',
+        expiration: Date.now() + 600000,
+        emailWasRespondedTo: false,
+        accessToken: null,
+    },
+}
+
+const mockReturn = {
+    sessionTokenIsRemoved: true,
+}
+
+const pathToTest = {
+    method: 'POST',
+    url: '/remove-session',
+    payload: JSON.stringify(payload),
+}
+
+test('path /remove-session should return confirmation of removed session', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     */
+    const server = Hapi.server()
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Services
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+
+    const removeSession = hashedSessionToken => {
+        const userSession = activeSessions[hashedSessionToken]
+        if (!userSession) {
+            throw new Error(
+                'hashedSessionToken not in activeSessions registry!',
+            )
+        } else {
+            delete activeSessions[hashedSessionToken]
+        }
+    }
+
+    stub(server.services()['userService'], 'removeSession').returns(
+        removeSession(hashedSessionToken),
+    )
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-send-email.spec.js

@@ -0,0 +1,147 @@
+'use strict'
+
+/*
+ * NOTE: This test ACTUALLY will send an email
+ * (see commented out email variable below)
+ */
+
+// Change email here to your actual email
+// const email = 'myalias@myactualemail.com'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+const plugin = require('../lib/plugins/user.js')
+
+// Necessary Dependencies/Configurations for Brevo Transac Email
+const crypto = require('crypto')
+const SibApiV3Sdk = require('sib-api-v3-sdk')
+const defaultClient = SibApiV3Sdk.ApiClient.instance
+const apiKey = defaultClient.authentications['api-key']
+apiKey.apiKey = process.env.BREVO_KEY
+const apiInstance = new SibApiV3Sdk.TransactionalEmailsApi()
+
+// Existing activeSession to test against (should not match)
+const activeSessions = {
+    'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk': {
+        email: 'test@testemail.com',
+        name: 'john_doe',
+        seeking: 'position',
+        sessionToken: 'efasdf;laksdfja;lkdjfa;lkdjf',
+        expiration: Date.now() + 600000,
+        emailWasRespondedTo: false,
+        accessToken: null,
+    },
+}
+
+let hashedSessionToken = ''
+
+const payload = {
+    email: email,
+    name: 'fk',
+    seeking: 'seeker',
+    sessionToken: 'a;slkdjfa;lskdf;asjkdfl;asdf;klj',
+}
+
+const userCredentials = payload
+
+const pathToTest = {
+    method: 'POST',
+    url: '/send-email/',
+    payload: JSON.stringify(payload),
+}
+
+test('path /send-email should send test transac email', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     */
+    const server = Hapi.server()
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Services
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+    server.services()['userService']['activeSessions'] = activeSessions
+
+    const hashToken = token => {
+        const salt = process.env.APP_SESSION_SALT
+        try {
+            return crypto.createHmac('sha256', salt).update(token).digest('hex')
+        } catch (err) {
+            throw new Error(err.message)
+        }
+    }
+
+    /**
+     * Sends a Transactional Email via Brevo
+     * @ returns {Object}
+     */
+    const emailSent = async userCredentials => {
+        hashedSessionToken = hashToken(userCredentials.sessionToken)
+        if (Object.keys(activeSessions).includes(hashedSessionToken)) {
+            return new Error('session already in cache!!')
+        }
+        // Set expiration time for ten minutes from now
+        const duration = 600000
+
+        activeSessions[hashedSessionToken] = {
+            email: userCredentials.email,
+            name: userCredentials.name,
+            seeking: userCredentials.seeking,
+            sessionToken: userCredentials.sessionToken,
+            expiration: Date.now() + duration,
+            emailWasRespondedTo: false,
+            accessToken: null,
+        }
+        const sendSmtpEmail = {
+            to: [
+                {
+                    email: userCredentials.email,
+                },
+            ],
+            templateId: 1,
+            params: {
+                // TODO: Change this in production...
+                link: `localhost:3000/verify/${hashedSessionToken}`,
+            },
+        }
+        return await apiInstance.sendTransacEmail(sendSmtpEmail).then(
+            data => {
+                return { wasSuccessfull: true, data: data }
+            },
+            error => {
+                return { wasSuccessfull: false, error: error }
+            },
+        )
+    }
+
+    hashedSessionToken = Object.keys(activeSessions).find(hashedToken => {
+        return activeSessions[`${hashedToken}`].email === userCredentials.email
+    })
+
+    stub(server.services()['userService'], 'emailSent').returns(
+        await emailSent(userCredentials),
+    )
+
+    const mockReturn = {
+        emailSentSuccessfully: true,
+        hashedSessionToken,
+    }
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-signup.spec.js

@@ -0,0 +1,101 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+const User = require('../lib/models/user.js')
+const Auth = require('../lib/models/authentication.js')
+
+const payload = {
+    user_name: 'john_doe',
+    user_email: 'test@testemail.com',
+    is_poster: 1,
+    user_pass: 'password',
+}
+
+const mockInsert = {
+    ...payload,
+    id: 15,
+    is_admin: 0,
+    is_verified: 1,
+}
+
+const mockReturn = {
+    is_admin: 0,
+    is_poster: 1,
+    is_verified: 1,
+    user_email: 'test@testemail.com',
+    user_id: 15,
+    user_name: 'john_doe',
+}
+
+const pathToTest = {
+    method: 'POST',
+    url: '/signup',
+    payload: JSON.stringify(payload),
+}
+
+test('path /signup should return new user info', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     * -
+     * NOTE: We use a mocked registerModel() and register
+     * models manually. Normally this is handled by
+     * Schwifty at runtime.
+     */
+    const server = Hapi.server()
+    /**
+     * Overload so we don't register any models
+     * using the plugin call (see plugins/profile.js)
+     * and Manually load the model we need for the test
+     */
+    server.registerModel = () => {}
+    server.models = () => ({ User, Auth })
+    // TODO: Apply server.registrations to other test specs
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Routes and Services as usual
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+
+    /**
+     * Replace Objection model methods with our own mock functions
+     * !: Janky - might be better to temp knex sqlite instance
+     */
+    stub(server.models()['User'], 'query').returns({
+        where: () => {
+            if (mockInsert.user_email !== 'test@testemail.com') {
+                return [mockInsert.user_email]
+            } else return []
+        },
+        insert: () => mockInsert,
+    })
+
+    stub(server.models()['Auth'], 'query').returns({
+        insert: () => mockInsert,
+        throwIfNotFound: () => ({
+            where: () => ({
+                patch: () => ({}),
+            }),
+        }),
+    })
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-validate-session.spec.js

@@ -0,0 +1,173 @@
+'use strict'
+
+const test = require('ava')
+const { stub } = require('sinon')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+const ProfileService = require('../lib/services/profile/index.js')
+
+const plugin = require('../lib/plugins/user.js')
+const JWT = require('jsonwebtoken')
+const User = require('../lib/models/user.js')
+const Profile = require('../lib/models/profile.js')
+
+// Dummy Method So JWT can be verified
+const createToken = (data, expiration = 600) => {
+    const key = process.env.APP_SECRET
+    const obj = {}
+
+    Object.assign(obj, { ...data })
+    return JWT.sign(obj, key, { expiresIn: expiration })
+}
+
+// Dummy Data
+const payload = 'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk'
+const email = 'test@testemail.com'
+
+const userData = {
+    email,
+    name: 'fk',
+    seeking: 'position',
+    sessionToken: createToken(this),
+}
+
+const userInDb = {
+    user_id: 101,
+    user_name: 'john_doe',
+    user_email: email,
+    is_admin: 0,
+    is_poster: 0,
+    is_verified: 0,
+}
+
+const allProfiles = [
+    {
+        profile_id: 147,
+        user_id: 101,
+    },
+]
+
+// Existing activeSession
+const activeSessions = {
+    'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk': {
+        email,
+        name: 'john_doe',
+        seeking: 'position',
+        sessionToken: userData.sessionToken,
+        expiration: Date.now() + 600000,
+        emailWasRespondedTo: true,
+        accessToken: null,
+    },
+}
+
+const mockReturn = {
+    profileId: allProfiles[0].profile_id,
+    sessionToken: userData.sessionToken,
+}
+
+const pathToTest = {
+    method: 'POST',
+    url: '/validate-session',
+    payload: JSON.stringify(payload),
+}
+
+test('path /validate-session should return validated session data and profileId', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     * -
+     * NOTE: We use register models manually.
+     * Normally this is handled by
+     * Schwifty at runtime.
+     */
+    const server = Hapi.server()
+
+    /**
+     * Register Routes and Services as usual
+     */
+    server.registerModel = () => {}
+
+    server.models = () => ({
+        User,
+        Profile,
+    })
+
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    server.registrations['main-app-plugin'].options.jwtKey = {
+        $filter: 'NODE_ENV',
+        $default: {
+            $param: 'APP_SECRET',
+            $default: 'app-secret',
+        },
+        // Use .env file in production
+        production: {
+            $param: 'APP_SECRET',
+        },
+    }
+
+    await plugin.register(server)
+    server.models = () => ({
+        User,
+        Profile,
+    })
+
+    server.services()['userService'] = new UserService(server)
+    server.services()['userService']['activeSessions'] = activeSessions
+
+    server.services()['profileService'] = new ProfileService(server)
+    server.services()['profileService']['_setTagLookup'] = () => {}
+
+    stub(server.models()['User'], 'query').returns({
+        throwIfNotFound: () => ({
+            first: () => ({
+                where: () => {
+                    if (userData.email === userInDb.user_email) {
+                        return userInDb
+                    }
+                },
+            }),
+        }),
+    })
+
+    stub(server.models()['Profile'], 'query').returns({
+        where: () => {
+            return [allProfiles.find(obj => obj.user_id === userInDb.user_id)]
+        },
+        whereIn: () => ({
+            withGraphFetched: () => ({
+                withGraphFetched: () => ({
+                    withGraphFetched: () => [
+                        {
+                            profile_id: 147,
+                            user_id: 101,
+                            tags: [],
+                            responses: [],
+                            user: {
+                                user_id: 101,
+                                user_name: 'fk',
+                                user_email: email,
+                                is_admin: 0,
+                                is_poster: 0,
+                                is_verified: 0,
+                            },
+                        },
+                    ],
+                }),
+            }),
+        }),
+    })
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

backend/tests/user-verify-session.spec.js

@@ -0,0 +1,70 @@
+'use strict'
+
+const test = require('ava')
+const Hapi = require('@hapi/hapi')
+const UserService = require('../lib/services/user.js')
+
+const plugin = require('../lib/plugins/user.js')
+
+const params = {
+    hashedSessionToken: 'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk',
+    // Replace to get hashToMatchNotFound
+    // hashedSessionToken : 'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk1'
+}
+
+// Existing activeSession to test against
+const activeSessions = {
+    'a;lsdkfja;ldfjka;ldfja;lskjdfa;dfjk': {
+        email: 'test@testemail.com',
+        name: 'john_doe',
+        seeking: 'position',
+        sessionToken: 'efasdf;laksdfja;lkdjfa;lkdjf',
+        expiration: Date.now() + 600000,
+        // Should return error took too long to respond to email
+        // expiration: 600000,
+        emailWasRespondedTo: false,
+        accessToken: null,
+    },
+}
+
+const mockReturn = {
+    hashesMatch: true,
+}
+
+const pathToTest = {
+    method: 'GET',
+    url: `/verify/${params.hashedSessionToken}`,
+}
+
+test('path /verify/<hashedSessionToken> should return OK on GET', async t => {
+    /**
+     * Create a new server and register services,
+     * models and routes for testing
+     */
+    const server = Hapi.server()
+    server.registrations = {
+        'main-app-plugin': {
+            options: {},
+        },
+    }
+
+    /**
+     * Register Routes and Services as usual
+     */
+    await plugin.register(server)
+    server.services()['userService'] = new UserService(server)
+    server.services()['userService']['activeSessions'] = activeSessions
+
+    /**
+     * Test the server with registered models and services
+     */
+    const { payload } = await server.inject(pathToTest)
+    const res = JSON.parse(payload)
+    t.deepEqual(res.ok, true)
+    t.deepEqual(
+        activeSessions[params.hashedSessionToken].emailWasRespondedTo,
+        true,
+    )
+    t.deepEqual(res.data, mockReturn)
+    server.stop()
+})

frontend/src/App.vue

@@ -13,7 +13,7 @@ import 'wave-ui/dist/wave-ui.css'
 import SideBar from './components/SideBar.vue'
 import TopNav from './components/TopNav.vue'
 
-import { currentProfile } from './services'
+import { currentProfile, authenticator } from './services'
 import { surveyFactory } from './utils'
 
 const DEV_MODE = import.meta.env.VITE_DEV == 'true'
@@ -58,7 +58,6 @@ export default {
             if (currentProfile.isLoggedIn) {
                 currentProfile.logout()
             }
-
             await currentProfile.login(profileId, this.$waveui.notify)
             console.log('---')
 

frontend/src/components/AspectBar.vue

@@ -1,12 +1,8 @@
 <template lang="pug">
 figure.w-flex.column
     figcaption.w-flex.xs12.justify-space-between.align-center
-        p(
-            :class='{ main: index === 1 }'
-            :key='label'
-            v-for='(label, index) in labels'
-        ) {{ label }}
-    w-progress.mb7(round size='0.5em' v-model='progress')
+        p(v-for="(label, index) in labels" :key="label" :class="{ 'main': index === 1 }")  {{ label }}
+    w-progress(:model-value="percentage" size="0.5em" round).mb7
 </template>
 
 <script>
@@ -16,14 +12,9 @@ export default {
             required: true,
             type: Array,
         },
-        percentage: {
-            required: false,
-            type: Number,
-            default: 50,
-        },
     },
     data: () => ({
-        progress: props.percentage,
+        percentage: 50,
     }),
 }
 </script>
@@ -37,7 +28,6 @@ figure
             font-weight: bold
             text-transform: uppercase
 
-
     .w-progress
         background-color: #4C5264
         .w-progress__progress

frontend/src/components/MainNav.vue

@@ -19,6 +19,8 @@ w-toolbar.mt6.py1(bottom fixed)
         w-button.pa8(disabled)
             w-icon.mr1.icon-cog(xl :class="{ 'icon-selected': $route.path === '/settings' }")
             //- p.text-upper settings
+    w-button.pa4(v-if="!$route.params.pid" bg-color='transparent' @click="$emit('log-out')")
+            w-icon.mr1.icon-lock(xl)
 </template>
 
 <script>
@@ -40,11 +42,10 @@ export default {
 
     .w-button
         background-color: $dark-grey
-    
+
     .icon-selected
         color: $light-green
-    
+
     a
         color:$light-grey
 </style>
-

frontend/src/components/onboarding/Auth.vue

@@ -5,9 +5,10 @@
 </template>
 
 <script>
-import { Authenticator } from '../../services/auth.service.js'
+import { authenticator } from '../../services/auth.service.js'
 import { createProfileForUserId } from '../../services/profile.service'
 import { signupUser } from '../../services/user.service.js'
+import { scoreSurveyByProfileId } from '@/services'
 
 export default {
     name: 'Auth',
@@ -32,12 +33,8 @@ export default {
         },
     },
     emits: ['update-answers'],
-    data: () => ({
-        authenticator: {},
-    }),
     async created() {
         // Establishes New User And Sends Auth Email
-        this.authenticator = new Authenticator()
         try {
             this.doesUserHaveMinResponses(this.responses)
             const userPass = this.responses.find(
@@ -48,15 +45,14 @@ export default {
                 password: userPass.val,
             })
             await this.createProfileForNewUser(newUserId, this.responses)
-            const accessToken = await this.getAccessToken({
+            const sessionToken = await this.createToken({
                 ...this.answered,
             })
-            console.log('accessToken :=>', accessToken)
-            const sessionInfo = await this.authenticator.sendAuthEmail({
+            const sessionInfo = await authenticator.sendEmail({
                 ...this.answered,
-                accessToken: accessToken,
+                sessionToken: sessionToken,
             })
-            document.cookie = `siimee_access=${sessionInfo.hashedAccessToken}; max-age=600; path=/; secure`
+            document.cookie = `siimee_session=${sessionInfo.hashedSessionToken}; max-age=600; path=/`
         } catch (err) {
             // TODO: render an error page in this component displaying which
             // error occurred and how to reach out to staff
@@ -70,8 +66,8 @@ export default {
                     'User has not answered minimum amount of questions to create profile',
                 )
         },
-        async getAccessToken(payload) {
-            return await this.authenticator.getAccessToken({
+        async createToken(payload) {
+            return await authenticator.createToken({
                 payload,
             })
         },
@@ -86,7 +82,37 @@ export default {
         },
         async createProfileForNewUser(userId, responses) {
             try {
-                await createProfileForUserId(userId, responses)
+                const newProfileForNewUser = await createProfileForUserId(
+                    userId,
+                    responses,
+                )
+                if (!newProfileForNewUser)
+                    throw Error(
+                        `ERROR: Unable to create newProfile for userId: ${userId}`,
+                    )
+
+                // NOTE: Populates matchQueue table with bare bone
+                // minimum filtered results of possible matches
+                // Based off of initial survey answers
+                const createdProfileId = newProfileForNewUser.profile_id
+                const maxDistance = this.responses
+                    .find(response => {
+                        return response.response_key_id === 19
+                    })
+                    .val.split(' ')[0]
+                const presence = this.responses.find(response => {
+                    return response.response_key_id === 15
+                }).val
+
+                // NOTE: duration hard coded for now as bare bones
+                // survey doesn't have duration as one of its steps...
+                const duration = 'full-time'
+                await scoreSurveyByProfileId(
+                    createdProfileId,
+                    maxDistance,
+                    duration,
+                    presence,
+                )
             } catch (err) {
                 throw new Error(err)
             }

frontend/src/components/onboarding/QuestionResponse.vue

@@ -28,9 +28,10 @@ export default {
             type: Number,
             required: true,
         },
-        surveyStepsCount: {
-            type: Number,
+        survey: {
+            type: Object,
             required: true,
+            default: () => {},
         },
     },
     emits: ['update-answers'],
@@ -38,7 +39,11 @@ export default {
         radioItems: [1, 2, 3, 4, 5],
         answer: null,
         noChoiceMade: null,
+        surveyStepsCount: null,
     }),
+    created() {
+        this.surveyStepsCount = this.survey?.steps.length
+    },
     methods: {
         onUpdate(index) {
             this.noChoiceMade = false

frontend/src/entities/profile/profile.js

@@ -13,7 +13,6 @@ class Profile extends _baseRecord {
      */
     constructor({ email, ...profileData }) {
         super()
-
         this.type = this.constructor.name.toLowerCase()
 
         /**  Fields */

frontend/src/entities/survey/survey.js

@@ -40,15 +40,13 @@ class Survey extends _baseRecord {
     }
 
     hasMinResponsesToCreateProfile(responses) {
-        const neededResponseKeys = [8, 7, 11, 9]
-        const hasNeededResponseKey = responses => {
-            return responses.every(response => {
-                neededResponseKeys.includes(response.response_key_id)
+        const neededResponseKeys = [8, 7, 10, 11, 15, 19, 9]
+        const hasMinResponses = () =>
+            responses.every(response => {
+                return neededResponseKeys.includes(response.response_key_id)
             })
-        }
-        return hasNeededResponseKey
+        return hasMinResponses()
     }
-
     validateAnswer(payload) {
         const { question, input } = payload
 

frontend/src/router/guards.js

@@ -1,4 +1,5 @@
-import { currentProfile } from '../services'
+import WaveUI from '../../node_modules/wave-ui/src/wave-ui/core'
+import { authenticator, currentProfile } from '../services'
 
 const DEV_MODE = import.meta.env.VITE_DEV == 'true'
 
@@ -13,7 +14,25 @@ async function log(to) {
     }
 }
 
-const checkLoginStatus = (destination, nextCb) => {
+const loginIfToken = async () => {
+    const sessionData = await authenticator.verifySessionCookie(
+        'siimee_session',
+    )
+    if (
+        sessionData?.profileId &&
+        sessionData?.sessionToken &&
+        !currentProfile.isLoggedIn
+    ) {
+        await currentProfile.login(
+            sessionData.profileId,
+            WaveUI.instance.notify,
+            sessionData.sessionToken,
+        )
+    }
+}
+
+const checkLoginStatus = async (destination, nextCb) => {
+    await loginIfToken()
     log(destination)
     if (DEV_MODE) {
         nextCb()
@@ -32,6 +51,6 @@ const checkLoginStatus = (destination, nextCb) => {
     } else {
         nextCb()
     }
-}
+        }
 
 export { checkLoginStatus }

frontend/src/services/auth.service.js

@@ -1,21 +1,46 @@
 import { db } from '../utils/db.js'
 
 class Authenticator {
-    constructor() {
-        this.curentUser = null
+    async sendEmail(answered) {
+        return await db.post('/user/send-email/', answered)
     }
-    async sendAuthEmail(answered) {
-        return await db.post('/user/sendemail/', answered)
-    }
-    async verifyAuthSession(hashedToken) {
+    async verifySession(hashedToken) {
         return await db.get(`/user/verify/${hashedToken}`)
     }
-    async getAccessToken(req) {
-        return await db.post('/user/getaccess', req, true)
+    async createToken(req) {
+        return await db.post('/user/token', req, true)
+    }
+    async validateSession(hashedSessionToken) {
+        return await db.post('/user/validate-session', hashedSessionToken, true)
+    }
+    async authenticateLoginCredentials(credentials) {
+        return await db.post('/user/login', credentials)
+    }
+    async removeSession(hashedSessionToken) {
+        return await db.post('/user/remove-session', hashedSessionToken, true)
+    }
+    grabStoredCookie(cookieKey) {
+        const cookies = document.cookie.split('; ').reduce((prev, current) => {
+            const [name, ...value] = current.split('=')
+            prev[name] = value.join('=')
+            return prev
+        }, {})
+        const cookieVal =
+            cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
+        return cookieVal
     }
-    async validateSession(hashedAccessToken) {
-        return await db.post('/user/validatesession', hashedAccessToken, true)
+    async verifySessionCookie(sessionCookie) {
+        const hashedAccessToken = this.grabStoredCookie(sessionCookie)
+        if (!hashedAccessToken)
+            return console.warn('WARNING :=> accessToken is not defined')
+        const validatedToken = await this.validateSession(hashedAccessToken)
+        if (validatedToken.error) {
+            console.error('ERROR :=>', validatedToken.error)
+        } else {
+            return validatedToken
+        }
     }
 }
+const authenticator = new Authenticator()
 
-export { Authenticator }
+export { authenticator, Authenticator }

frontend/src/services/index.js

@@ -6,3 +6,4 @@ export * from './queue.service.js'
 export * from './chat.service.js'
 export * from './notification.service.js'
 export * from './login.service.js'
+export * from './auth.service.js'

frontend/src/services/login.service.js

@@ -77,13 +77,13 @@ class Login {
      * @param {number} profileId
      * @returns {number} stored reactive id
      */
-    async login(profileId, cb) {
+    async login(profileId, cb, sessionToken = null) {
         this._loading.value = true
         // First check if profile exists
         console.warn('[Login Service warn]: Logging in:', profileId)
 
         // TODO: You can probably use this call to get responses, groupings and tags
-        this._profile = await fetchProfileByProfileId(profileId)
+        this._profile = await fetchProfileByProfileId(profileId, sessionToken)
         this.id.value = this._profile.profile_id
 
         if (!this.id.value) {
@@ -114,13 +114,22 @@ class Login {
     }
     logout() {
         console.warn('[Login Service warn]: Logging out:', this.id.value)
+        this._loading.value = true
+        this._profile = null
         this.id.value = null
+        this.groupings = []
+        this.queue = []
+        this.responses = []
+        this.tags = []
         if (this.toaster) {
             this.toaster.stop()
         }
         if (this.chatter) {
             this.chatter.stop()
         }
+        this.toaster = null
+        this.chatter = null
+        this._loading.value = false
     }
 
     async getTags() {

frontend/src/services/user.service.js

@@ -9,9 +9,9 @@ const signupUser = async user => {
         user_name: user.name,
         user_email: user.email,
         user_pass: user.password,
-        is_poster: user.seeking == 'position' ? 0 : 1,
+        is_poster: user.seeking === 'position' ? 0 : 1,
     }
-    return await db.post(`/user/signup`, payload)
+    return await db.post('/user/signup', payload)
 }
 
 export { signupUser }

frontend/src/utils/index.js

@@ -2,6 +2,7 @@ import Joi from 'joi'
 import { SurveyFactory } from './survey.js'
 import { possible } from './lang.js'
 import { pidMixin, profileMixin } from './mixins.js'
+import { authenticator } from '../services/auth.service.js'
 
 // This will NOT work until ES2022 gets assert in browsers
 // import config from '../../../backend/db/data-generator/config.json' assert { type: 'json' }

frontend/src/utils/lang.js

@@ -34,7 +34,10 @@ const initialSteps = {
     splash: 'splash',
     email: 'email',
     name: 'name',
+    zipcode: 'zipcode',
     seeking: 'seeking',
+    presence: 'presence',
+    distance: 'distance',
     password: 'password',
 }
 
@@ -45,17 +48,14 @@ const allSteps = {
         aspect01: 'aspect-1',
         aspect02: 'aspect-2',
         aspect03: 'aspect-3',
-        zipcode: 'zipcode',
         urgency: 'urgency',
         aspect04: 'aspect-4',
         aspect05: 'aspect-5',
         aspect06: 'aspect-6',
-        presence: 'presence',
         duration: 'duration',
         pronouns: 'pronouns',
         language: 'language',
         image: 'image',
-        distance: 'distance',
         blurb: 'blurb',
         // experience: 'experience',
         // roles: 'role',

frontend/src/utils/survey.js

@@ -84,7 +84,7 @@ class SurveyFactory {
         // Splash page is placed at beginning of survey
         mutatedResponseKeys.unshift(splash)
         // Auth page is placed after email/password
-        mutatedResponseKeys.splice(5, 0, auth)
+        mutatedResponseKeys.splice(8, 0, auth)
         return mutatedResponseKeys
     }
     async getQuestions() {

frontend/src/views/HomeView.vue

@@ -1,4 +1,5 @@
 <template lang="pug">
+// TODO: Add router link to OnboardingView.vue's survey
 main.view--home
     article.w-flex.sm-column.md-row.align-center
         template(v-if='isLoading')
@@ -9,7 +10,7 @@ main.view--home
 
         template(v-else-if='cards.length === 0')
             p No profiles in match_queue.
-    MainNav
+    MainNav(@log-out='logout')
 </template>
 
 <script>
@@ -21,7 +22,11 @@ import PairingButton from '../components/PairingButton.vue'
 
 import { Card } from '../entities'
 
-import { currentProfile, fetchQueueByProfileId } from '../services'
+import {
+    currentProfile,
+    authenticator,
+    fetchQueueByProfileId,
+} from '../services'
 import { mixins } from '../utils'
 
 const notificationOpts = {
@@ -90,6 +95,20 @@ export default {
             )
             this.fetchedCards.push(...newQueue) // update fetchedCards => recalculate cards
         },
+        async logout() {
+            if (currentProfile.isLoggedIn) {
+                currentProfile.logout()
+            }
+            const hashedSessionToken =
+                authenticator.grabStoredCookie('siimee_session')
+            const removedSession = await authenticator.removeSession(
+                hashedSessionToken,
+            )
+            if (removedSession.error)
+                console.error('ERROR :=>', removedSession.error)
+            document.cookie = `siimee_session=''; max-age=0; path=/`
+            this.$router.push('/onboarding')
+        },
         // this can be placed in utils/notification.js
         notify(payload) {
             notificationOpts.message = payload

frontend/src/views/LoginView.vue

@@ -1,21 +1,73 @@
 <template lang="pug">
 main.view--login
-
     article.pa12
-        form
-            w-input.mb4(label="User E-mail" tile outline v-model="form.profileId" inner-icon-left='icon-envelope')
-            w-input(label="Password" type="password" tile outline inner-icon-left='icon-eye')
-
-            //- Emit up an event so we can sync App pid with currentProfile.id
-            w-button.xs12.mt12(@click="$emit('updatePid', form.profileId)" type="submit") submit
+        div(v-if='emailSentSuccessfully === null')
+            form
+                w-input.mb4(
+                    inner-icon-left='icon-envelope'
+                    label='User E-mail'
+                    outline
+                    tile
+                    v-model='form.email'
+                )
+                w-input(
+                    inner-icon-left='icon-eye'
+                    label='Password'
+                    outline
+                    tile
+                    type='password'
+                    v-model='form.password'
+                )
+                w-button.xs12.mt12(@click='login') submit
+        div(v-else-if='emailSentSuccessfully === false')
+            p.verify-message Email Was Not Sent Successfully, please contact your Email Service Provider or Systems Administrator.
+        div(v-else)
+            p.verify-message Thanks for logging in!
+            p.verify-message We'll just need you to verify your email address to continue. Please check your email!
 </template>
 
 <script>
+import { authenticator } from '../services'
 export default {
     data: () => ({
         form: {
             profileId: null,
+            email: null,
+            password: null,
         },
+        emailSentSuccessfully: null,
     }),
+    methods: {
+        async login() {
+            const loginCredentials = {
+                user_email: this.form.email,
+                password: this.form.password,
+            }
+            const credentials =
+                await authenticator.authenticateLoginCredentials(
+                    loginCredentials,
+                )
+            // emailSentSuccessfully: emailSent.wasSuccessfull,
+            const sessionInfo = await authenticator.sendEmail({
+                ...credentials.answered,
+                sessionToken: credentials.jwt,
+            })
+            if (sessionInfo.emailSentSuccessfully) {
+                this.emailSentSuccessfully = true
+            }
+            document.cookie = `siimee_session=${sessionInfo.hashedSessionToken}; max-age=600; path=/`
+        },
+    },
 }
 </script>
+
+<style>
+.verify-message {
+    display: flex;
+    justify-content: center;
+    text-align: center;
+    margin: 0 auto;
+    font-weight: 700;
+    font-size: 160%;
+}
+</style>

frontend/src/views/OnboardingView.vue

@@ -15,7 +15,6 @@ main.view--onboarding
                 :question='step'
                 :responses='responses'
                 :survey='survey'
-                :surveyStepsCount='survey?.steps?.length'
                 @handle-submit='onSubmit'
                 @update-answers='updateAnswers'
                 v-if='step && currentStep == i'
@@ -30,16 +29,14 @@ main.view--onboarding
             p(v-if='currentStep != 0') You have completed: {{ currentStep }} / {{ survey?.steps?.length }} survey steps
 
     article(v-else)
-        SurveyCompleteView(:answers='answered' :surveySteps='survey?.steps')
+        SurveyCompleteView(:answers='answered' :surveySteps='survey.steps' :responses='responses')
 </template>
 
 <script>
-import { Authenticator } from '../services/auth.service.js'
+import { currentProfile, authenticator } from '../services'
 import { surveyFactory } from '@/utils'
 import stepViews from '@/components/onboarding'
 import SurveyCompleteView from './SurveyCompleteView.vue'
-let hashedAccessToken = null
-let currentProfileId = null
 
 export default {
     name: 'OnboardingView',
@@ -54,18 +51,19 @@ export default {
         currentStep: 0,
         survey: null,
         invalidResponse: false,
-        authenticator: {},
     }),
     async created() {
         this.survey = await surveyFactory.createSurvey()
-        this.authenticator = new Authenticator()
-        hashedAccessToken = this.grabStoredCookie('siimee_access')
         try {
-            const sessionData = await this.verifySession(hashedAccessToken)
-            currentProfileId = sessionData.profileId
-            this.responses = sessionData.responses
-            this.currentStep = this.responses.length + 3
-            this.goToStep(this.currentStep)
+            const sessionData =
+                await authenticator.verifySessionCookie('siimee_session')
+            if (sessionData) {
+                this.responses = this.formatResponses(
+                    currentProfile._profile.responses,
+                )
+                this.currentStep = this.responses.length + 3
+                this.goToStep(this.currentStep)
+            }
         } catch (err) {
             console.error('ERROR :=>', err)
             this.goToStep(0)
@@ -78,29 +76,13 @@ export default {
         async goToStep(num) {
             this.currentStep = num
         },
-        grabStoredCookie(cookieKey) {
-            const cookies = document.cookie
-                .split('; ')
-                .reduce((prev, current) => {
-                    const [name, ...value] = current.split('=')
-                    prev[name] = value.join('=')
-                    return prev
-                }, {})
-            const cookieVal =
-                cookieKey in cookies ? cookies[`${cookieKey}`] : undefined
-            return cookieVal
-        },
-        async verifySession(hashedAccessToken) {
-            if (!hashedAccessToken)
-                return console.warn('WARNING :=> accessToken is not defined')
-            const validatedToken = await this.authenticator.validateSession(
-                hashedAccessToken,
-            )
-            if (validatedToken.error) {
-                throw new Error(validatedToken.error)
-            } else {
-                return validatedToken
-            }
+        formatResponses(responses) {
+            return responses.map(response => {
+                return {
+                    response_key_id: response.response_key_id,
+                    val: response.val,
+                }
+            })
         },
         async updateAnswers(payload) {
             if (payload) {
@@ -120,15 +102,14 @@ export default {
                 this.responses.push(response)
                 if (k === 'aspects') return
             }
-            // NOTE: If user has finished minimum profile creation,
-            // Adds survey answers to responses table and verifies tokens on each step
-            if (currentProfileId) {
+            if (currentProfile._profile?.profile_id) {
                 await surveyFactory.addNewSurveyAnswer(
                     this.responses[this.responses.length - 1],
-                    currentProfileId,
+                    currentProfile._profile.profile_id,
                 )
+                currentProfile._profile.responses = this.responses
                 try {
-                    await this.verifySession(hashedAccessToken)
+                    await authenticator.verifySessionCookie('siimee_session')
                 } catch (err) {
                     this.currentStep = 0
                     this.goToStep(this.currentStep)

frontend/src/views/SurveyCompleteView.vue

@@ -1,104 +1,151 @@
 <template lang="pug">
 main.view--surveycomplete
-    article(style='display: flex; flex-direction: column; align-items: center; text-align: center;')
+    article(
+        style='display: flex; flex-direction: column; align-items: center; text-align: center'
+    )
         h2 Thanks for Completing Our Survey!!
         h1 Please review your answers and let us know if you need to change anything.
+        div(v-for='response in responses')
+            p Your {{ response.stage }}:
+            p {{ response.val }}
+            br
+        .survey-spacer
+        div(v-for='aspectResponse in aspectResponses')
+            p {{ aspectResponse.question }} :
+            br
+            p {{ aspectResponse.response }}
+            br
         br
-        p(v-for='input in formInputs')
-            p(v-for='(value, key) in answers')
-                p(v-if='input.survey_stage == key && key !== "password"')
-                    p Your {{ key }}: {{ value }}
-        br
-        p(v-for='input in formDropdowns')
-            p(v-for='(value, key) in answers')
-                p(v-if='input.survey_stage == key')
-                    p Your {{ key }}: {{ value }}
-        br
-        p(v-for='(response, responseIndex) in questionResponses')
-            p(v-for='(value, key) in answers')
-                p(v-if='response.survey_stage == key') 
-                    p Survey Question {{ responseIndex + 1 }}: 
-                    p {{ response.response_key_prompt }}
-                    p You Answered: {{ value }}
-                    br
-        w-button.ma1(@click="changeAnswers") Change Answers
-        w-button.ma1(@click="finalSubmit") Submit Answers
+        // TODO: Bring user to another View.vue page that allows 
+        // them to change their answers to the survey
+        // OR render radio buttons next to the questions/answers above,
+        // allowing them to return to ONLY that specific survey step 
+        // using this.$emit('somefunc') back up to OnboardingView.vue
+        // Toggling a boolean flag that prevents "SUBMIT" from goToStep(), 
+        // and instead brings them back here...
+        // 
+        // w-button.ma1(@click="changeAnswers") Change Answers
 </template>
 
 <script>
-import {
-    createProfileForUserId,
-    currentProfile,
-    signUpUser
-} from '@/services'
-
+import { currentProfile } from '../services'
 export default {
     props: {
-        answers: {
-            type: Object,
-            default: () => ({}),
-        },
         surveySteps: {
             type: Array,
             default: () => [],
         },
     },
     data: () => ({
-        surveyObjects: [],
-        formInputs: [],
-        questionResponses: [],
-        formDropdowns: [],
+        responses: {},
+        aspectQuestions: {},
+        surveyStages: {},
+        aspectResponses: [],
     }),
     created() {
-        this.surveySteps.forEach((step) => {
-            switch (step.component) {
-                case 'FormInput':
-                    this.formInputs.push(step)
-                    break
-                case 'FormDropdown':
-                    this.formDropdowns.push(step)
-                    break
-                case 'QuestionResponse':
-                    this.questionResponses.push(step)
-                    break
-            }
-        })
+        this.parseSurvey(this.surveySteps)
+        this.aspectResponses = this.grabAspectResponses(
+            currentProfile._profile.responses,
+            this.aspectQuestions,
+        )
+        const responses = this.grabResponsesFromProfile(this.aspectQuestions)
+        this.responses = this.appendStagesToResponses(
+            responses,
+            this.surveyStages,
+        )
     },
     methods: {
-        changeAnswers(){
+        parseSurvey(surveySteps) {
+            surveySteps.forEach(step => {
+                const isAspect = step.category === 'aspect'
+                if (isAspect) {
+                    this.aspectQuestions[`${step.response_key_id}`] =
+                        step.response_key_prompt
+                } else {
+                    this.surveyStages[`${step.response_key_id}`] =
+                        step.survey_stage
+                }
+            })
+        },
+        grabResponsesFromProfile(aspectQuestions) {
+            const aspectQuestionsKeys = Object.keys(aspectQuestions).map(Number)
+            const responses = currentProfile._profile.responses
+                .map(response => {
+                    if (
+                        !aspectQuestionsKeys.includes(response.response_key_id)
+                    ) {
+                        return response
+                    }
+                })
+                .filter(res => {
+                    return typeof res === 'object'
+                })
+            return responses
+        },
+        appendStagesToResponses(responses, surveyStages) {
+            const responsesWithStages = responses.map(response => {
+                return {
+                    ...response,
+                    stage: surveyStages[`${response.response_key_id}`],
+                }
+            })
+            return responsesWithStages
+        },
+        grabAspectResponses(responses, questions) {
+            return responses
+                .map(response => {
+                    const prompt = questions[`${response.response_key_id}`]
+                    if (prompt) {
+                        return {
+                            question: questions[`${response.response_key_id}`],
+                            response: response.val,
+                        }
+                    }
+                })
+                .filter(res => {
+                    return typeof res === 'object'
+                })
+        },
+        // changeAnswers() {},
+    },
+    /* 
+    NOTE: Incomplete logic for adjusting matchQueue results based 
+    off of further completion of survey, commented out for now as 
+    to not overwrite methods
+    methods: {
+        changeAnswers() {
             console.log('change answers')
-            
         },
 
-        async finalSubmit(){
+        async finalSubmit() {
             // separate user info from responses
-            const [user, survey] = this._separateUserInfoFromResponses(this.answers)
+            const [user, survey] = this._separateUserInfoFromResponses(
+                this.answers,
+            )
 
             // create user
             const createdUser = await signUpUser(user)
             if (!createdUser) return
 
-            // create profile 
-            const userProfile = await createProfileForUserId(createdUser.user_id, survey)
-            if(!userProfile) return
-
-            /**
-             * Login only after there is a user and
-             * that user has a profile and all responses
-             */
+            // create profile
+            const userProfile = await createProfileForUserId(
+                createdUser.user_id,
+                survey,
+            )
+            if (!userProfile) return
             this._setLoginForProfile(userProfile)
 
             this.$router.push({ name: 'HomeView' })
         },
 
         // TODO write logic to parse answers
-        _separateUserInfoFromResponses(answers){
-            return ['','']
+        _separateUserInfoFromResponses(answers) {
+            return ['', '']
         },
 
-        async _setLoginForProfile(profile){
+        async _setLoginForProfile(profile) {
             const currentId = currentProfile.login(profile.profile_id)
-            if(currentId && profile.responses.length){
+            if (currentId && profile.responses.length) {
                 currentProfile.setResponses(profile.responses)
             }
             if (!currentProfile.isComplete) {
@@ -107,7 +154,13 @@ export default {
                 )
                 return
             }
-        }
-    }
+        },
+    },
+    */
 }
 </script>
+<style>
+.survey-spacer {
+    height: 1.25rem;
+}
+</style>

frontend/src/views/VerifyView.vue

@@ -5,62 +5,36 @@
 </template>
 
 <script>
-import { Authenticator } from '../services/auth.service.js'
+import { currentProfile, authenticator } from '../services'
 let hash = null
-let hashedAccessToken = null
 export default {
     name: 'VerifyView',
-    data: () => ({
-        authenticator: {},
-    }),
     async created() {
-        this.authenticator = new Authenticator()
         hash = this.$route.params.hashedToken
-        hashedAccessToken = this.grabCookie('siimee_access')
         try {
             this.isHashInUrl(hash)
-            await this.doesAccessTokenExist(hashedAccessToken)
             await this.verifyActiveSession(hash)
-            await this.isSessionTokenValid(hash)
+            const sessionData =
+                await authenticator.verifySessionCookie('siimee_session')
+            currentProfile.login(
+                sessionData.profileId,
+                this.$waveui.notify,
+                sessionData.accessToken,
+            )
         } catch (err) {
             console.error(err)
         }
-        this.$router.push('/onboarding')
+        this.$router.push('/')
     },
     methods: {
-        grabCookie(cookieKey) {
-            const cookies = document.cookie
-                .split('; ')
-                .reduce((prev, current) => {
-                    const [name, ...value] = current.split('=')
-                    prev[name] = value.join('=')
-                    return prev
-                }, {})
-            return `${cookieKey}` in cookies
-                ? cookies[`${cookieKey}`]
-                : undefined
-        },
         isHashInUrl(hash) {
             if (!hash) throw new Error('URL contains no hash!')
         },
-        async doesAccessTokenExist(hashedAccessToken) {
-            if (!hashedAccessToken)
-                throw new Error('accessToken not in cookie store!')
-        },
         async verifyActiveSession(hashedToken) {
-            const sessionData = await this.authenticator.verifyAuthSession(
-                hashedToken,
-            )
+            const sessionData = await authenticator.verifySession(hashedToken)
             if (!sessionData.hashesMatch)
                 throw new Error('Hash is not in activeSessions!')
         },
-        async isSessionTokenValid(hash) {
-            const sessionTokenIsValid =
-                await this.authenticator.validateSession(hash)
-            if (sessionTokenIsValid.error) {
-                throw new Error(sessionTokenIsValid.error)
-            }
-        },
     },
 }
 </script>