:sparkles: adding services via schmervice

backend/lib/plugins/user.js

@@ -1,3 +1,4 @@
+const Schmervice = require('@hapipal/schmervice');
 const Schwifty = require('@hapipal/schwifty');
 const Jwt = require('@hapi/jwt');
 const JwtStrategy = require('../auth/strategies/jwt')
@@ -19,7 +20,19 @@ module.exports = {
         server.auth.strategy('default_jwt', 'jwt', jwtOptions)
         server.auth.default('default_jwt')
 
+
+        await server.register(Schmervice)
+        server.registerService(
+            class MathService extends Schmervice.Service {
+                add(x, y) {
+                    this.server.log(['math-service'], 'Adding')
+                    return Number(x) + Number(y)
+                }
+            }
+        )
+
         await server.route(UserCurrentRoute)
         await server.route(UserLoginRoute)
     }
-}
+}
+

backend/lib/routes/user/login.js

@@ -32,6 +32,8 @@ module.exports = {
     handler: async (request, h) => {
         try {
             const { user: { email, password } } = request.payload
+            const { mathService } = request.services()
+            console.log(mathService.add(10, 1))
             // const { userService, displayService } = request.services();
 
             // const login = async (txn) => {

backend/lib/services/user.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const Util = require('util');
+const Jwt = require('@hapi/jwt');
+const Schmervice = require('@hapipal/schmervice');
+const SecurePassword = require('secure-password');
+
+module.exports = class UserService extends Schmervice.Service {
+    constructor(...args) {
+        super(...args)
+        const pwd = new SecurePassword()
+        this.pwd = {
+            hash: Util.promisify(pwd.hash.bind(pwd)),
+            verify: Util.promisify(pwd.verify.bind(pwd))
+        }
+    }
+    async findById(id, txn) {
+        const { User } = this.server.models()
+        return await User.query(txn).throwIfNotFound().findById(id)
+    }
+    async findByUsername(username, txn) {
+        const { User } = this.server.models()
+
+        return await User.query(txn).throwIfNotFound().first().where({ username })
+    }
+    async signup({ password, ...userInfo }, txn) {
+        const { User } = this.server.models()
+        const { id } = await User.query(txn).insert(userInfo)
+        await this.changePassword(id, password, txn)
+        return id
+    }
+    async update(id, { password, ...userInfo }, txn) {
+        const { User } = this.server.models()
+
+        if (Object.keys(userInfo).length > 0) {
+            await User.query(txn).throwIfNotFound().where({ id }).patch(userInfo)
+        }
+
+        if (password) {
+            await this.changePassword(id, password, txn)
+        }
+
+        return id
+    }
+    async login({ email, password }, txn) {
+        const { User } = this.server.models()
+
+        const user = await User.query(txn).throwIfNotFound().first().where({
+            email: User.raw('? collate nocase', 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()
+        }
+
+        return user
+    }
+    createToken(id) {
+        return Jwt.token.generate({ id }, {
+            key: this.options.jwtKey,
+            algorithm: 'HS256'
+        }, {
+            ttlSec: 7 * 24 * 60 * 60 // 7 days
+        })
+    }
+    async changePassword(id, password, txn) {
+        const { User } = this.server.models()
+
+        await User.query(txn).throwIfNotFound().where({ id }).patch({
+            password: await this.pwd.hash(Buffer.from(password))
+        })
+        return id
+    }
+}

backend/package-lock.json

@@ -15,6 +15,7 @@
         "@hapi/jwt": "^2.0.1",
         "@hapi/vision": "^6.0.1",
         "@hapipal/confidence": "^6.0.1",
+        "@hapipal/schmervice": "^2.0.0",
         "@hapipal/schwifty": "^6.0.0",
         "dotenv": "^10.0.0",
         "exiting": "^6.0.1",
@@ -22,7 +23,8 @@
         "joi": "^17.4.0",
         "knex": "^0.21.19",
         "mysql": "^2.18.1",
-        "objection": "^2.2.15"
+        "objection": "^2.2.15",
+        "secure-password": "^4.0.0"
       },
       "devDependencies": {
         "nodemon": "^2.0.7"
@@ -401,6 +403,20 @@
         "confidence": "bin/confidence"
       }
     },
+    "node_modules/@hapipal/schmervice": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapipal/schmervice/-/schmervice-2.0.0.tgz",
+      "integrity": "sha512-EmQLVM4MdPXCw1iijqfG0gQXnawYsPypagdEFMo5c0kf637Sjj7x5DjDOMN2Qmce+tIm2Nv70vrSk6qfrJW3qw==",
+      "dependencies": {
+        "@hapi/hoek": "9.x.x"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "@hapi/hapi": ">=19 <21"
+      }
+    },
     "node_modules/@hapipal/schwifty": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@hapipal/schwifty/-/schwifty-6.0.0.tgz",
@@ -2576,6 +2592,11 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/nanoassert": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
+      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
+    },
     "node_modules/nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -2602,6 +2623,16 @@
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
+    "node_modules/node-gyp-build": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
+      "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==",
+      "bin": {
+        "node-gyp-build": "bin.js",
+        "node-gyp-build-optional": "optional.js",
+        "node-gyp-build-test": "build-test.js"
+      }
+    },
     "node_modules/nodemon": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz",
@@ -3147,6 +3178,15 @@
         "ret": "~0.1.10"
       }
     },
+    "node_modules/secure-password": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/secure-password/-/secure-password-4.0.0.tgz",
+      "integrity": "sha512-B268T/tx+hq7q85KH6gonEqK/lhrLhNtzYzqojuMtBPVFBtwiIwxqF+4yr9POsJu5cIxbJyM66eYfXZiPZUXRA==",
+      "dependencies": {
+        "nanoassert": "^1.0.0",
+        "sodium-native": "^3.1.1"
+      }
+    },
     "node_modules/semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -3396,6 +3436,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sodium-native": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.1.tgz",
+      "integrity": "sha512-EgDZ/Z7PxL2kCasKk7wnRkV8W9kvwuIlHuHXAxkQm3FF0MgVsjyLBXGjSRGhjE6u7rhSpk3KaMfFM23bfMysIQ==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "node-gyp-build": "^4.2.0"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4393,6 +4443,14 @@
         "joi": "17.x.x"
       }
     },
+    "@hapipal/schmervice": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@hapipal/schmervice/-/schmervice-2.0.0.tgz",
+      "integrity": "sha512-EmQLVM4MdPXCw1iijqfG0gQXnawYsPypagdEFMo5c0kf637Sjj7x5DjDOMN2Qmce+tIm2Nv70vrSk6qfrJW3qw==",
+      "requires": {
+        "@hapi/hoek": "9.x.x"
+      }
+    },
     "@hapipal/schwifty": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@hapipal/schwifty/-/schwifty-6.0.0.tgz",
@@ -6046,6 +6104,11 @@
         "sqlstring": "2.3.1"
       }
     },
+    "nanoassert": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
+      "integrity": "sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -6069,6 +6132,11 @@
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
     },
+    "node-gyp-build": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.3.tgz",
+      "integrity": "sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="
+    },
     "nodemon": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz",
@@ -6482,6 +6550,15 @@
         "ret": "~0.1.10"
       }
     },
+    "secure-password": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/secure-password/-/secure-password-4.0.0.tgz",
+      "integrity": "sha512-B268T/tx+hq7q85KH6gonEqK/lhrLhNtzYzqojuMtBPVFBtwiIwxqF+4yr9POsJu5cIxbJyM66eYfXZiPZUXRA==",
+      "requires": {
+        "nanoassert": "^1.0.0",
+        "sodium-native": "^3.1.1"
+      }
+    },
     "semver": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -6682,6 +6759,15 @@
         }
       }
     },
+    "sodium-native": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.1.tgz",
+      "integrity": "sha512-EgDZ/Z7PxL2kCasKk7wnRkV8W9kvwuIlHuHXAxkQm3FF0MgVsjyLBXGjSRGhjE6u7rhSpk3KaMfFM23bfMysIQ==",
+      "requires": {
+        "ini": "^1.3.5",
+        "node-gyp-build": "^4.2.0"
+      }
+    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",

backend/package.json

@@ -17,6 +17,7 @@
     "@hapi/jwt": "^2.0.1",
     "@hapi/vision": "^6.0.1",
     "@hapipal/confidence": "^6.0.1",
+    "@hapipal/schmervice": "^2.0.0",
     "@hapipal/schwifty": "^6.0.0",
     "dotenv": "^10.0.0",
     "exiting": "^6.0.1",
@@ -24,7 +25,8 @@
     "joi": "^17.4.0",
     "knex": "^0.21.19",
     "mysql": "^2.18.1",
-    "objection": "^2.2.15"
+    "objection": "^2.2.15",
+    "secure-password": "^4.0.0"
   },
   "devDependencies": {
     "nodemon": "^2.0.7"