:sparkles: passing token

backend/lib/plugins/user.js

@@ -10,6 +10,7 @@ const UserCurrentRoute = require('../routes/user/current');
 const UserLoginRoute = require('../routes/user/login');
 
 const UserService = require('../services/user');
+const DisplayService = require('../services/display');
 
 module.exports = {
     name: 'user-plugin',
@@ -32,6 +33,7 @@ module.exports = {
 
         await server.register(Schmervice)
         server.registerService(UserService)
+        server.registerService(DisplayService)
 
         await server.route(UserCurrentRoute)
         await server.route(UserLoginRoute)

backend/lib/routes/user/login.js

@@ -18,10 +18,7 @@ const pluginConfig = {
 const validators = {
     post: {
         payload: Joi.object({
-            user: Joi.object().keys({
-                email: User.field('email'),
-                password: Joi.string()
-            }),
+            user: Joi.object(),
             error: Joi.string()
         })
     }
@@ -32,17 +29,18 @@ module.exports = {
     path: '/login',
     handler: async function (request, h) {
         try {
-            // const { userService, displayService } = request.services();
-            const { userService } = request.services()
+            const { userService, displayService } = request.services()
+
             const res = request.payload
-            console.log('---')
 
+            // Callback to use as transaction
             const login = async (txn) => {
                 return await userService.login({
                     email: res.user.email,
                     password: res.user.password
                 }, txn)
             }
+
             // Bound context from your plugin server declaration
             const user = await h.context.transaction(login)
             const token = userService.createToken(user.id)

backend/lib/services/display.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const Schmervice = require('@hapipal/schmervice');
+const internals = {};
+
+module.exports = class DisplayService extends Schmervice.Service {
+    user({ password, ...user }, token) {
+        return { ...user, token }
+    }
+
+    async profile(currentUserId, user, transaction)  {
+        const { User } = this.server.models()
+        const { toProfile } = internals
+
+        const result = await User.fetchGraph(user, `[
+            followedBy(currentUser) as following
+        ]`, {
+            transaction
+        }).modifiers({
+            currentUser: (builder) => builder.where('Users.id', currentUserId)
+        })
+
+        return toProfile(result)
+    }
+}
+
+internals.toProfile = ({ password, email, following, ...user }) => ({
+    ...user,
+    following: (following.length > 0)
+})

backend/lib/services/user.js

@@ -47,24 +47,27 @@ module.exports = class UserService extends Schmervice.Service {
 
         console.log('user service attempting login...')
 
-        const user = await User.query(txn).throwIfNotFound().first().where({
-            email: User.raw('? collate nocase', email)
-        })
+        const user = await User.query(txn)
+            .throwIfNotFound()
+            .first()
+            .where({ user_email: email })
 
-        const passwordCheck = await this.pwd.verify(Buffer.from(password), user.password)
 
-        if (passwordCheck === SecurePassword.VALID_NEEDS_REHASH) {
-            await this.changePassword(user.id, password, txn)
-        }
-        else if (passwordCheck !== SecurePassword.VALID) {
-            throw User.createNotFoundError()
-        }
+        // Uncomment to run password check using SecurePassword
+        // const passwordCheck = await this.pwd.verify(Buffer.from(password), user.password)
+        // if (passwordCheck === SecurePassword.VALID_NEEDS_REHASH) {
+        //     await this.changePassword(user.id, password, txn)
+        // }
+        // else if (passwordCheck !== SecurePassword.VALID) {
+        //     throw User.createNotFoundError()
+        // }
 
         return user
     }
     createToken(id) {
+        const key =this.server.registrations['main-app-plugin'].options.jwtKey
         return Jwt.token.generate({ id }, {
-            key: this.options.jwtKey,
+            key: key,
             algorithm: 'HS256'
         }, {
             ttlSec: 7 * 24 * 60 * 60 // 7 days