adapt-authoring-roles 1.4.1 → 1.5.1

package/.github/workflows/standardjs.yml

@@ -1,4 +1,4 @@
-name: Standard.js formatting check
+name: Lint
 on: push
 jobs:
   default:
@@ -9,4 +9,4 @@ jobs:
         with:
           node-version: 'lts/*'
       - run: npm install
-      - run: npx standard
+      - run: npx standard

package/lib/RolesModule.js

@@ -30,7 +30,7 @@ class RolesModule extends AbstractApiModule {
   async initConfigRoles () {
     const mongodb = await this.app.waitForModule('mongodb')
     return Promise.allSettled(this.getConfig('roleDefinitions').map(async r => {
-      const [doc] = await this.find({ shortName: r.shortName })
+      const doc = await this.findOne({ shortName: r.shortName }, { strict: false })
       if (doc) {
         try {
           await mongodb.replace(this.collectionName, { _id: doc._id }, r)
@@ -55,8 +55,7 @@ class RolesModule extends AbstractApiModule {
    */
   async shortNamesToIds (roles) {
     return Promise.all(roles.map(async r => {
-      const [role] = await this.find({ shortName: r })
-      if (!role) throw new Error(`role '${r}' not found`)
+      const role = await this.findOne({ shortName: r })
       return role._id.toString()
     }))
   }
@@ -96,10 +95,9 @@ class RolesModule extends AbstractApiModule {
 
   /** @override */
   async setValues () {
-    /** @ignore */ this.root = 'roles'
+    await super.setValues()
     /** @ignore */ this.schemaName = 'role'
     /** @ignore */ this.collectionName = 'roles'
-    this.useDefaultRouteConfig()
   }
 
   /**
@@ -140,13 +138,13 @@ class RolesModule extends AbstractApiModule {
   }
 
   async getSuperRoleId () {
-    const [superRole] = await this.find({ scopes: ['*:*'] })
+    const superRole = await this.findOne({ scopes: ['*:*'] })
     return superRole._id.toString()
   }
 
   async isTargetSuper (_id) {
     const users = await this.app.waitForModule('users')
-    const [user] = await users.find({ _id }, { projection: { roles: 1 } })
+    const user = await users.findOne({ _id }, { projection: { roles: 1 } })
     return user.roles.length === 1 && user.roles[0].toString() === await this.getSuperRoleId()
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-roles",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "Module for managing user roles",
   "homepage": "https://github.com/adapt-security/adapt-authoring-roles",
   "license": "GPL-3.0",
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "adapt-authoring-api": "^2.0.0"
+    "adapt-authoring-api": "^3.0.0"
   },
   "peerDependencies": {
     "adapt-authoring-auth": "^2.0.0",

package/routes.json

@@ -0,0 +1,3 @@
+{
+  "root": "roles"
+}

package/tests/RolesModule.spec.js

@@ -13,10 +13,8 @@ import assert from 'node:assert/strict'
 /** Build a minimal RolesModule-like instance with sensible stub defaults */
 function createInstance (overrides) {
   const instance = {
-    root: undefined,
     schemaName: undefined,
     collectionName: undefined,
-    useDefaultRouteConfig: mock.fn(),
     app: {
       waitForModule: mock.fn(async () => ({})),
       errors: {
@@ -46,10 +44,8 @@ function createInstance (overrides) {
 // ── Method references (copied from source for isolated testing) ─────
 
 async function setValues () {
-  this.root = 'roles'
   this.schemaName = 'role'
   this.collectionName = 'roles'
-  this.useDefaultRouteConfig()
 }
 
 async function getScopesForRole (_id) {
@@ -171,12 +167,6 @@ describe('RolesModule', () => {
   // ── setValues ──────────────────────────────────────────────────────
 
   describe('setValues', () => {
-    it('should set root to "roles"', async () => {
-      const inst = createInstance()
-      await setValues.call(inst)
-      assert.equal(inst.root, 'roles')
-    })
-
     it('should set schemaName to "role"', async () => {
       const inst = createInstance()
       await setValues.call(inst)
@@ -188,12 +178,6 @@ describe('RolesModule', () => {
       await setValues.call(inst)
       assert.equal(inst.collectionName, 'roles')
     })
-
-    it('should call useDefaultRouteConfig', async () => {
-      const inst = createInstance()
-      await setValues.call(inst)
-      assert.equal(inst.useDefaultRouteConfig.mock.callCount(), 1)
-    })
   })
 
   // ── getScopesForRole ───────────────────────────────────────────────