adapt-authoring-config 1.1.5 → 1.2.0

package/lib/ConfigModule.js

@@ -21,11 +21,6 @@ class ConfigModule extends AbstractModule {
      * @type {String}
      */
     this.configFilePath = path.join(this.app.rootDir, 'conf', `${process.env.NODE_ENV}.config.js`)
-    /**
-     * The keys for all attributes which can be modified during runtime
-     * @type {Array<String>}
-     */
-    this.mutableAttributes = []
     /**
      * The keys for all attributes marked as public
      * @type {Array<String>}
@@ -61,7 +56,7 @@ class ConfigModule extends AbstractModule {
     const [auth, server] = await this.app.waitForModule('auth', 'server')
     const router = server.api.createChildRouter('config', [{
       route: '/',
-      handlers: { get: (req, res) => res.json(this.getPublicConfig(req.params.mutable)) },
+      handlers: { get: (_req, res) => res.json(this.getPublicConfig()) },
       meta: {
         get: {
           summary: 'Retrieve public config data',
@@ -86,7 +81,7 @@ class ConfigModule extends AbstractModule {
       try { // try to parse to allow for non-string values
         val = JSON.parse(val)
       } catch {} // ignore errors
-      this.set(this.envVarToConfigKey(key), val)
+      this._config[this.envVarToConfigKey(key)] = val
     })
   }
 
@@ -126,7 +121,7 @@ class ConfigModule extends AbstractModule {
     }
     Object.entries(config).forEach(([name, c]) => {
       Object.entries(c).forEach(([key, val]) => {
-        this.set(`${name}.${key}`, val)
+        this._config[`${name}.${key}`] = val
       })
     })
   }
@@ -178,7 +173,6 @@ class ConfigModule extends AbstractModule {
     }
     // validate user config data
     let data = Object.entries(schema.raw.properties).reduce((m, [k, v]) => {
-      if (v?._adapt?.isMutable) this.mutableAttributes.push(`${pkg.name}.${k}`)
       if (v?._adapt?.isPublic) this.publicAttributes.push(`${pkg.name}.${k}`)
       return { ...m, [k]: this.get(`${pkg.name}.${k}`) }
     }, {})
@@ -189,7 +183,7 @@ class ConfigModule extends AbstractModule {
       throw e
     }
     // apply validated config settings
-    Object.entries(data).forEach(([key, val]) => this.set(`${pkg.name}.${key}`, val, { force: true }))
+    Object.entries(data).forEach(([key, val]) => { this._config[`${pkg.name}.${key}`] = val })
   }
 
   /**
@@ -210,30 +204,13 @@ class ConfigModule extends AbstractModule {
     return this._config[attr]
   }
 
-  /**
-   * Stores a value for the passed attribute
-   * @param {String} attr Attribute key name
-   * @param {*} val Value to set
-   * @param {objeect} options Custom options
-   * @param {objeect} options.force Whether to force an update
-   */
-  set (attr, val, options = {}) {
-    if (this.has(attr) && !this.mutableAttributes.includes(attr) && options.force !== true) {
-      return
-    }
-    this._config[attr] = val
-  }
-
   /**
    * Retrieves all config options marked as 'public'
-   * @param {Boolean} isMutable Whether options should also be mutable
    * @return {Object}
    */
-  getPublicConfig (isMutable) {
+  getPublicConfig () {
     return this.publicAttributes.reduce((m, a) => {
-      if (!isMutable || (isMutable && this.mutableAttributes.includes(a))) {
-        m[a] = this.get(a)
-      }
+      m[a] = this.get(a)
       return m
     }, {})
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-config",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "A configuration module for the Adapt authoring tool.",
   "homepage": "https://github.com/adapt-security/adapt-authoring-config",
   "license": "GPL-3.0",
@@ -16,7 +16,7 @@
     "glob": "^13.0.0"
   },
   "peerDependencies": {
-    "adapt-authoring-auth": "^1.0.5",
+    "adapt-authoring-auth": "^1.0.7",
     "adapt-authoring-errors": "^1.1.2",
     "adapt-authoring-jsonschema": "^1.2.0",
     "adapt-authoring-server": "^1.2.1"

package/tests/configModule.spec.js

@@ -31,14 +31,6 @@ describe('Config module', function () {
       actualValue.should.equal(expectedValue)
     })
   })
-  describe('#set()', function () {
-    it('should be able to set a value', function () {
-      const newValue = 'newtestvalue'
-      this.config.set('adapt-authoring-testing.test', newValue)
-      const actualValue = this.config.get('adapt-authoring-testing.test')
-      actualValue.should.equal(newValue)
-    })
-  })
   describe('#getPublicConfig()', function () {
     it('should be able to retrieve values marked as public', function () {
       this.config.app.dependencies = [{ name: 'adapt-authoring-testing', dir: path.join(__dirname, 'data') }]