adapt-authoring-auth-local 2.3.0 → 2.3.2

package/.github/workflows/standardjs.yml

@@ -0,0 +1,13 @@
+name: Lint
+on: push
+jobs:
+  default:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: actions/setup-node@master
+        with:
+          node-version: 'lts/*'
+      - run: npm install
+      - run: npx standard
+

package/lib/LocalAuthModule.js

@@ -99,7 +99,7 @@ class LocalAuthModule extends AbstractAuthModule {
    */
   async registerSuper (data) {
     const [roles, users] = await this.app.waitForModule('roles', 'users')
-    const [superRole] = await roles.find({ shortName: 'superuser' })
+    const superRole = await roles.findOne({ shortName: 'superuser' })
     const superUsers = await users.find({ roles: [superRole._id] })
     if (superUsers.length) {
       throw this.app.errors.SUPER_USER_EXISTS
@@ -256,7 +256,7 @@ class LocalAuthModule extends AbstractAuthModule {
         // allow for a specific email to be passed via body, falling back to the email from the auth data
         email = req.body.email || req.auth.user.email
         // validate the existing password for security
-        const [user] = await this.users.find({ email })
+        const user = await this.users.findOne({ email })
         await compare(req.body.oldPassword, user.password)
       } else { // no authenticated, so should expect body data
         const tokenData = await PasswordUtils.validateReset(req.body.token)

package/lib/PasswordUtils.js

@@ -69,11 +69,7 @@ class PasswordUtils {
    */
   static async createReset (email, lifespan) {
     const [mongodb, users] = await App.instance.waitForModule('mongodb', 'users')
-    const [user] = await users.find({ email })
-    if (!user) {
-      throw App.instance.errors.NOT_FOUND
-        .setData({ type: 'user', id: email })
-    }
+    const user = await users.findOne({ email })
     if (user.authType !== 'local') {
       const authlocal = await App.instance.waitForModule('auth-local')
       authlocal.log('error', `Failed to reset ${user._id} password, not authenticated with local auth`)
@@ -128,11 +124,7 @@ class PasswordUtils {
     if (new Date(tokenData.expiresAt) < new Date()) {
       throw App.instance.errors.AUTH_TOKEN_EXPIRED
     }
-    const [user] = await users.find({ email: tokenData.email })
-    if (!user) {
-      throw App.instance.errors.NOT_FOUND
-        .setData({ type: 'user', id: tokenData.email })
-    }
+    const user = await users.findOne({ email: tokenData.email })
     return tokenData
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-auth-local",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Module which implements username/password (local) authentication",
   "homepage": "https://github.com/adapt-security/adapt-authoring-auth-local",
   "license": "GPL-3.0",