expressa 2.1.1 → 2.1.2

package/controllers/install.js

@@ -1,105 +1,105 @@
-const util = require('../util')
-
-exports.updateAdminPermissions = async function (api) {
-  if (!api.db.role) {
-    return // not installed yet
-  }
-  const modules = Object.values(api.modules)
-  const permissions = [].concat(...await Promise.all(modules.map((m) => util.resolve(m.permissions, api)))).filter(x => x !== undefined)
-  let adminRole = { permissions: {} }
-  try {
-    adminRole = await api.db.role.get('Admin')
-  } catch (e) {
-    // expected if not installed
-  }
-  const neededPermissions = permissions.reduce((obj, p) => { obj[p] = 1; return obj }, {})
-  adminRole.permissions = { ...neededPermissions, ...adminRole.permissions }
-  await api.db.role.update('Admin', adminRole)
-}
-
-exports.install = async (req, api) => {
-  const selectedModules = req.body.modules
-  const installedModules = Object.keys(req.modules)
-  const missingModules = selectedModules.filter((module) => !installedModules.includes(module))
-  if (missingModules.length > 0) {
-    throw new util.ApiError(400, 'unknown modules')
-  }
-
-  const modules = selectedModules.map((name) => req.modules[name])
-
-  let settings = await api.db.settings.get(process.env.NODE_ENV).catch(() => {})
-
-  if (!settings) {
-    settings = JSON.parse(JSON.stringify(req.body.settings))
-    settings._id = process.env.NODE_ENV
-    settings.jwt_secret = util.createSecureRandomId()
-    // Remove fields that are not real settings
-    delete settings.email
-    delete settings.user_storage
-    delete settings.password
-    Object.assign(req.settings, settings)
-    await req.db.settings.create(settings)
-
-    for (const m of modules) {
-      const colls = await util.resolve(m.collections, api)
-      if (colls) {
-        for (const coll of colls) {
-          if (!coll.storage) {
-            coll.storage = 'file'
-          }
-          if (coll._id == 'users') {
-            if (req.body.settings.user_storage) {
-              coll.storage = req.body.settings.user_storage
-            }
-            coll.enableLogin = true
-          }
-          await req.db.collection.create(coll)
-          await api.notify('changed', req, 'collection', coll)
-          // await collectionsApi.insert(Object.assign({}, req, { body: coll }))
-        }
-      }
-      await util.resolve(m.install, api)
-    }
-    await exports.updateAdminPermissions(api)
-  }
-  else {
-    if (settings.installed) {
-      throw new Error(`${process.env.NODE_ENV}.json exists and indicates expressa is already installed. Try setting 'installed' to false if you are attempting to reinstall.`)
-    }
-  }
-
-  settings.installed = true
-  settings.enforce_permissions = true
-  Object.assign(req.settings, settings)
-  await req.db.settings.update(settings._id, settings)
-  return { }
-}
-
-exports.getSettingsSchema = async (req, api) => {
-  const colls = await util.resolve(api.modules.core.collections, api)
-  const settings = colls.find((m) => m._id === 'settings')
-  settings.schema.properties = {
-    /*collection_storage: {
-      type: 'string',
-      enum: ['file', 'mongo', 'postgres']
-    },*/
-    user_storage: {
-      type: 'string',
-      enum: ['file', 'mongo', 'postgres']
-    },
-    email: {
-      type: 'string',
-      description: 'Administrator Email'
-    },
-    password: {
-      type: 'string',
-      description: 'Administrator Password'
-    },
-    ...settings.schema.properties
-  }
-  settings.schema.required = settings.schema.required || ['postgresql_uri', 'mongodb_uri']
-  settings.schema.required.push('email')
-  settings.schema.required.push('password')
-  settings.schema.required.push('user_storage')
-  return settings
-}
+const util = require('../util')
+
+exports.updateAdminPermissions = async function (api) {
+  if (!api.db.role) {
+    return // not installed yet
+  }
+  const modules = Object.values(api.modules)
+  const permissions = [].concat(...await Promise.all(modules.map((m) => util.resolve(m.permissions, api)))).filter(x => x !== undefined)
+  let adminRole = { permissions: {} }
+  try {
+    adminRole = await api.db.role.get('Admin')
+  } catch (e) {
+    // expected if not installed
+  }
+  const neededPermissions = permissions.reduce((obj, p) => { obj[p] = 1; return obj }, {})
+  adminRole.permissions = { ...neededPermissions, ...adminRole.permissions }
+  await api.db.role.update('Admin', adminRole)
+}
+
+exports.install = async (req, api) => {
+  const selectedModules = req.body.modules
+  const installedModules = Object.keys(req.modules)
+  const missingModules = selectedModules.filter((module) => !installedModules.includes(module))
+  if (missingModules.length > 0) {
+    throw new util.ApiError(400, 'unknown modules')
+  }
+
+  const modules = selectedModules.map((name) => req.modules[name])
+
+  let settings = await api.db.settings.get(process.env.NODE_ENV).catch(() => {})
+
+  if (!settings) {
+    settings = JSON.parse(JSON.stringify(req.body.settings))
+    settings._id = process.env.NODE_ENV
+    settings.jwt_secret = util.createSecureRandomId()
+    // Remove fields that are not real settings
+    delete settings.email
+    delete settings.user_storage
+    delete settings.password
+    Object.assign(req.settings, settings)
+    await req.db.settings.create(settings)
+
+    for (const m of modules) {
+      const colls = await util.resolve(m.collections, api)
+      if (colls) {
+        for (const coll of colls) {
+          if (!coll.storage) {
+            coll.storage = 'file'
+          }
+          if (coll._id == 'users') {
+            if (req.body.settings.user_storage) {
+              coll.storage = req.body.settings.user_storage
+            }
+            coll.enableLogin = true
+          }
+          await req.db.collection.create(coll)
+          await api.notify('changed', req, 'collection', coll)
+          // await collectionsApi.insert(Object.assign({}, req, { body: coll }))
+        }
+      }
+      await util.resolve(m.install, api)
+    }
+    await exports.updateAdminPermissions(api)
+  }
+  else {
+    if (settings.installed) {
+      throw new Error(`${process.env.NODE_ENV}.json exists and indicates expressa is already installed. Try setting 'installed' to false if you are attempting to reinstall.`)
+    }
+  }
+
+  settings.installed = true
+  settings.enforce_permissions = true
+  Object.assign(req.settings, settings)
+  await req.db.settings.update(settings._id, settings)
+  return { }
+}
+
+exports.getSettingsSchema = async (req, api) => {
+  const colls = await util.resolve(api.modules.core.collections, api)
+  const settings = colls.find((m) => m._id === 'settings')
+  settings.schema.properties = {
+    /*collection_storage: {
+      type: 'string',
+      enum: ['file', 'mongo', 'postgres']
+    },*/
+    user_storage: {
+      type: 'string',
+      enum: ['file', 'mongo', 'postgres']
+    },
+    email: {
+      type: 'string',
+      description: 'Administrator Email'
+    },
+    password: {
+      type: 'string',
+      description: 'Administrator Password'
+    },
+    ...settings.schema.properties
+  }
+  settings.schema.required = settings.schema.required || ['postgresql_uri', 'mongodb_uri']
+  settings.schema.required.push('email')
+  settings.schema.required.push('password')
+  settings.schema.required.push('user_storage')
+  return settings
+}

package/controllers/status.js

@@ -1,43 +1,43 @@
-const util = require('../util')
-
-exports.getStatus = function(router) {
-  return async (req) => {
-    if (!req.hasPermission('view server details')) {
-      return {
-        env: process.env.NODE_ENV,
-        installed: req.settings.installed || false,
-      }
-    }
-    const allListeners = [].concat.apply([], Object.values(req.eventListeners))
-    const middleware = router.stack.filter((item) => !item.route).map((item) => ({
-      name: item.name,
-      params: util.getFunctionParamNames(item.handle),
-    }))
-    const uniqueListeners = [...new Set(allListeners)]
-    const eventTypes = ['get', 'post', 'put', 'delete', 'changed', 'deleted']
-    const listeners = uniqueListeners.map(function (listener) {
-      const o = {}
-      o.name = listener.name
-      o.priority = listener.priority
-      o.collections = listener.collections
-      for (const type of eventTypes) {
-        if (router.eventListeners[type].includes(listener)) {
-          o[type] = true
-        }
-      }
-      return o
-    })
-    listeners.sort((a, b) => a.priority - b.priority)
-    const collections = Object.keys(router.db)
-      .filter((collection) => req.hasPermission(`${collection}: view`) || req.hasPermission(`${collection}: view own`))
-    return {
-      nodeVersion: process.version,
-      uptime: util.friendlyDuration(process.uptime()),
-      env: process.env.NODE_ENV,
-      installed: req.settings.installed || false,
-      middleware,
-      listeners,
-      collections,
-    }
-  }
-}
+const util = require('../util')
+
+exports.getStatus = function(router) {
+  return async (req) => {
+    if (!req.hasPermission('view server details')) {
+      return {
+        env: process.env.NODE_ENV,
+        installed: req.settings.installed || false,
+      }
+    }
+    const allListeners = [].concat.apply([], Object.values(req.eventListeners))
+    const middleware = router.stack.filter((item) => !item.route).map((item) => ({
+      name: item.name,
+      params: util.getFunctionParamNames(item.handle),
+    }))
+    const uniqueListeners = [...new Set(allListeners)]
+    const eventTypes = ['get', 'post', 'put', 'delete', 'changed', 'deleted']
+    const listeners = uniqueListeners.map(function (listener) {
+      const o = {}
+      o.name = listener.name
+      o.priority = listener.priority
+      o.collections = listener.collections
+      for (const type of eventTypes) {
+        if (router.eventListeners[type].includes(listener)) {
+          o[type] = true
+        }
+      }
+      return o
+    })
+    listeners.sort((a, b) => a.priority - b.priority)
+    const collections = Object.keys(router.db)
+      .filter((collection) => req.hasPermission(`${collection}: view`) || req.hasPermission(`${collection}: view own`))
+    return {
+      nodeVersion: process.version,
+      uptime: util.friendlyDuration(process.uptime()),
+      env: process.env.NODE_ENV,
+      installed: req.settings.installed || false,
+      middleware,
+      listeners,
+      collections,
+    }
+  }
+}

package/controllers/users.js

@@ -1,52 +1,52 @@
-const auth = require('../auth')
-const util = require('../util')
-const collectionsApi = require('./collections')
-const permissions = require('../middleware/permissions')
-
-exports.login = async (req, collection) => {
-  const password = req.body.password
-
-  if (typeof req.body.email !== 'string') {
-    throw new util.ApiError(400, 'email must be a string')
-  }
-
-  req.body.email = req.body.email.toLowerCase()
-
-  // check if user exists
-  const result = await req.db[collection].find({
-    email: req.body.email
-  })
-  if (result.length === 0) {
-    throw new util.ApiError(400, 'No ' + collection + ' found with this email.')
-  }
-  const user = result[0]
-  if (!auth.isValidPassword(password, user.password)) {
-    throw new util.ApiError(401, 'Incorrect password')
-  }
-  const jwt_options = req.settings.jwt_expires_in ? { expiresIn: req.settings.jwt_expires_in } : {}
-  const payload = auth.doLogin({
-    id: user._id,
-    collection,
-    timestamp: user.meta.password_last_updated_at,
-    jwt_secret: req.getSetting('jwt_secret'),
-    jwt_options
-  })
-  req.uid = user._id
-  req.ucollection = collection
-  req.user = user
-  await permissions.addRolePermissionsAsync(req)
-  payload.canUseAdmin = req.hasPermission('login to admin')
-  return payload
-}
-
-exports.register = function (req, collection) {
-  req.url = `/${collection}`
-  req.params.collection = collection
-  return collectionsApi.insert(req)
-}
-
-exports.getMe = function (req, collection) {
-  req.params.collection = collection
-  req.params.id = req.uid
-  return collectionsApi.getById(req)
-}
+const auth = require('../auth')
+const util = require('../util')
+const collectionsApi = require('./collections')
+const permissions = require('../middleware/permissions')
+
+exports.login = async (req, collection) => {
+  const password = req.body.password
+
+  if (typeof req.body.email !== 'string') {
+    throw new util.ApiError(400, 'email must be a string')
+  }
+
+  req.body.email = req.body.email.toLowerCase()
+
+  // check if user exists
+  const result = await req.db[collection].find({
+    email: req.body.email
+  })
+  if (result.length === 0) {
+    throw new util.ApiError(400, 'No ' + collection + ' found with this email.')
+  }
+  const user = result[0]
+  if (!auth.isValidPassword(password, user.password)) {
+    throw new util.ApiError(401, 'Incorrect password')
+  }
+  const jwt_options = req.settings.jwt_expires_in ? { expiresIn: req.settings.jwt_expires_in } : {}
+  const payload = auth.doLogin({
+    id: user._id,
+    collection,
+    timestamp: user.meta.password_last_updated_at,
+    jwt_secret: req.getSetting('jwt_secret'),
+    jwt_options
+  })
+  req.uid = user._id
+  req.ucollection = collection
+  req.user = user
+  await permissions.addRolePermissionsAsync(req)
+  payload.canUseAdmin = req.hasPermission('login to admin')
+  return payload
+}
+
+exports.register = function (req, collection) {
+  req.url = `/${collection}`
+  req.params.collection = collection
+  return collectionsApi.insert(req)
+}
+
+exports.getMe = function (req, collection) {
+  req.params.collection = collection
+  req.params.id = req.uid
+  return collectionsApi.getById(req)
+}

package/cypress/fixtures/example.json

@@ -1,5 +1,5 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
 }

package/cypress/integration/0_install_spec.js

@@ -1,9 +1,9 @@
-describe('Install', function() {
-  it('Creates a user', function() {
-    cy.visit('/')
-    cy.get('input[name="root[email]"]').type('test@example.com')
-    cy.get('input[name="root[password]"]').type('expressa')
-    cy.get('.btn-primary').click()
-    cy.contains('Welcome: test@example.com')
-  })
+describe('Install', function() {
+  it('Creates a user', function() {
+    cy.visit('/')
+    cy.get('input[name="root[email]"]').type('test@example.com')
+    cy.get('input[name="root[password]"]').type('expressa')
+    cy.get('.btn-primary').click()
+    cy.contains('Welcome: test@example.com')
+  })
 })

package/cypress/integration/custom_collections.js

@@ -1,31 +1,31 @@
-import { randomId } from '../support/util'
-
-// TODO: remove error from JSONSchemaEditor so that this isn't necessary
-Cypress.on('uncaught:exception', (err, runnable) => {
-  // returning false here prevents Cypress from
-  // failing the test
-  return false
-})
-
-describe('Custom Collections', function() {
-  it('Supports creating new collections', function() {
-    cy.login()
-    cy.visit('/')
-    cy.get('.hamburger-container').click();
-    cy.wait(100)
-    cy.get('span').contains('Data').click();
-    cy.wait(1000)
-    cy.get('.is-opened span').contains('Collection').click();
-
-    cy.get('.btn-primary').contains('Add').click();
-    let id = `coll-${randomId()}`;
-    cy.fillValue('_id', id)
-
-    cy.wait(100)
-    cy.get('button').contains('Add another field').click();
-    cy.wait(100)
-    cy.get('input[name="field"]').type('field_1')
-
-    cy.get('.btn-primary').click();
-  })
+import { randomId } from '../support/util'
+
+// TODO: remove error from JSONSchemaEditor so that this isn't necessary
+Cypress.on('uncaught:exception', (err, runnable) => {
+  // returning false here prevents Cypress from
+  // failing the test
+  return false
+})
+
+describe('Custom Collections', function() {
+  it('Supports creating new collections', function() {
+    cy.login()
+    cy.visit('/')
+    cy.get('.hamburger-container').click();
+    cy.wait(100)
+    cy.get('span').contains('Data').click();
+    cy.wait(1000)
+    cy.get('.is-opened span').contains('Collection').click();
+
+    cy.get('.btn-primary').contains('Add').click();
+    let id = `coll-${randomId()}`;
+    cy.fillValue('_id', id)
+
+    cy.wait(100)
+    cy.get('button').contains('Add another field').click();
+    cy.wait(100)
+    cy.get('input[name="field"]').type('field_1')
+
+    cy.get('.btn-primary').click();
+  })
 })

package/cypress/integration/home.js

@@ -1,9 +1,9 @@
-describe('Home', function() {
-  it('Logs and shows 404s', function() {
-    cy.request({ url: 'http://localhost:3001/api/notexist', failOnStatusCode: false })
-    cy.login()
-    cy.visit('/')
-    cy.get('.el-table__body').contains('notexist')
-    cy.get('.el-table__body').contains('404')
-  })
-})
+describe('Home', function() {
+  it('Logs and shows 404s', function() {
+    cy.request({ url: 'http://localhost:3001/api/notexist', failOnStatusCode: false })
+    cy.login()
+    cy.visit('/')
+    cy.get('.el-table__body').contains('notexist')
+    cy.get('.el-table__body').contains('404')
+  })
+})

package/cypress/integration/settings.js

@@ -1,34 +1,34 @@
-describe('Settings', function() {
-  it('Can turn off enforce permissions', function() {
-    cy.request({ url: 'http://localhost:3001/api/role/Admin', failOnStatusCode: false })
-    .then((response) => {
-      expect(response.status).to.equal(401)
-    });
-
-    cy.login()
-    cy.visit('/')
-
-    cy.wait(250)
-    cy.get('a').contains('(edit settings)').click()
-    cy.wait(1500)
-
-    cy.get('[name="root[enforce_permissions]"]').uncheck()
-    cy.get('button.btn-primary').click()
-  })
-
-  it('Changed settings should take affect', function() {
-    cy.request({url: 'http://localhost:3001/api/role/Admin', failOnStatusCode: false})
-  })
-
-  it('Turn back on enforce permissions', function() {
-    cy.login()
-    cy.visit('/')
-
-    cy.wait(250)
-    cy.get('a').contains('(edit settings)').click()
-    cy.wait(1500)
-
-    cy.get('[name="root[enforce_permissions]"]').check()
-    cy.get('button.btn-primary').click()
-  })
-})
+describe('Settings', function() {
+  it('Can turn off enforce permissions', function() {
+    cy.request({ url: 'http://localhost:3001/api/role/Admin', failOnStatusCode: false })
+    .then((response) => {
+      expect(response.status).to.equal(401)
+    });
+
+    cy.login()
+    cy.visit('/')
+
+    cy.wait(250)
+    cy.get('a').contains('(edit settings)').click()
+    cy.wait(1500)
+
+    cy.get('[name="root[enforce_permissions]"]').uncheck()
+    cy.get('button.btn-primary').click()
+  })
+
+  it('Changed settings should take affect', function() {
+    cy.request({url: 'http://localhost:3001/api/role/Admin', failOnStatusCode: false})
+  })
+
+  it('Turn back on enforce permissions', function() {
+    cy.login()
+    cy.visit('/')
+
+    cy.wait(250)
+    cy.get('a').contains('(edit settings)').click()
+    cy.wait(1500)
+
+    cy.get('[name="root[enforce_permissions]"]').check()
+    cy.get('button.btn-primary').click()
+  })
+})