expressa 1.2.2 → 1.2.3

package/db/postgres.js

@@ -1,103 +1,100 @@
-const mongoToPostgres = require('mongo-query-to-postgres-jsonb')
-const util = require('../util')
-
-module.exports = function (settings, collectionId, collection) {
-  const pool = util.getPgPool(settings.postgresql_uri)
-
-  return {
-    init: async function () {
-      if (collection.plainStringIds) {
-        await pool.query('CREATE TABLE IF NOT EXISTS ' + collectionId + ' (id text primary key, data jsonb)')
-      } else {
-        await pool.query('CREATE TABLE IF NOT EXISTS ' + collectionId + ' (id uuid primary key, data jsonb)')
-      }
-    },
-    all: async function () {
-      return this.find({})
-    },
-    find: async function (rawQuery, offset, limit, orderby, fields) {
-      const arrayFields = util.getArrayPaths('', collection.schema)
-      const pgQuery = mongoToPostgres('data', rawQuery || {}, arrayFields)
-      const select = fields ? mongoToPostgres.convertSelect('data', fields, arrayFields) : '*'
-      let query = 'SELECT ' + select + ' FROM ' + collectionId + (pgQuery ? ' WHERE ' + pgQuery : '')
-      if (typeof orderby !== 'undefined') {
-        query += ' ORDER BY '
-        query += orderby.map((ordering) => {
-          return mongoToPostgres.convertDotNotation('data', ordering[0]) + (ordering[1] > 0 ? ' ASC' : ' DESC')
-        }).join(', ')
-      }
-      if (typeof offset !== 'undefined') {
-        query += ' OFFSET ' + offset
-      }
-      if (typeof limit !== 'undefined') {
-        query += ' LIMIT ' + limit
-      }
-      const result = await pool.query(query)
-      return result.rows.map((row) => row.data)
-    },
-    count: async function(rawQuery, offset, limit) {
-      const arrayFields = util.getArrayPaths('', collection.schema)
-      const pgQuery = mongoToPostgres('data', rawQuery || {}, arrayFields)
-      let query = 'SELECT COUNT(*) FROM ' + collectionId + (pgQuery ? ' WHERE ' + pgQuery : '')
-      if (typeof offset !== 'undefined') {
-        query += ' OFFSET ' + offset
-      }
-      if (typeof limit !== 'undefined') {
-        query += ' LIMIT ' + limit
-      }
-      const result = await pool.query(query)
-      return parseInt(result.rows[0].count)
-    },
-    get: async function (id, fields) {
-      const arrayFields = util.getArrayPaths('', collection.schema)
-      const select = fields ? mongoToPostgres.convertSelect('data', fields, arrayFields) : '*'
-      const result = await pool.query(`SELECT ${select} FROM ${collectionId} WHERE id = $1`, [id])
-      if (result.rowCount === 0) {
-        throw new util.ApiError(404, 'document not found')
-      }
-      return result.rows[0].data
-    },
-    create: async function (data) {
-      util.addIdIfMissing(data)
-      try {
-        await pool.query('INSERT INTO ' + collectionId + ' (id, data) VALUES ($1, $2)', [data._id, data])
-      } catch (e) {
-        if (e.message.includes('duplicate key')) {
-          throw new util.ApiError(409, 'document already exists')
-        }
-        throw e
-      }
-      return data._id
-    },
-    update: async function (id, data) {
-      if (typeof data._id === 'undefined') {
-        data._id = id
-      }
-      const result = await pool.query('UPDATE ' + collectionId + ' SET data=$2,id=$3 WHERE id=$1', [id, data, data._id])
-      if (result.rowCount === 0) {
-        throw new util.ApiError(404, 'document not found')
-      }
-      return data
-    },
-    // eslint-disable-next-line no-unused-vars
-    updateWithQuery: async function (query, update, options) {
-      const arrayFields = util.getArrayPaths('', collection.schema)
-      const pgQuery = mongoToPostgres('data', query || {}, arrayFields)
-      const updateSql = mongoToPostgres.convertUpdate('data', update,false)
-      const result = await pool.query('UPDATE ' + collectionId + ' SET data=' + updateSql + ' WHERE ' + pgQuery)
-      if (result.rowCount === 0) {
-        throw new util.ApiError(404, 'document not found')
-      }
-      return {
-        matchedCount: result.rowCount
-      }
-    },
-    delete: async function (id) {
-      const result = await pool.query('DELETE FROM ' + collectionId + ' WHERE id=$1', [id])
-      if (result.rowCount === 0) {
-        throw new util.ApiError(404, 'document not found')
-      }
-      return 'OK'
-    }
-  }
-}
+const mongoToPostgres = require('mongo-query-to-postgres-jsonb')
+const util = require('../util')
+
+module.exports = function (settings, collectionId, collection) {
+  const pool = util.getPgPool(settings.postgresql_uri)
+
+  return {
+    init: async function () {
+      if (collection.plainStringIds) {
+        await pool.query('CREATE TABLE IF NOT EXISTS ' + collectionId + ' (id text primary key, data jsonb)')
+      } else {
+        await pool.query('CREATE TABLE IF NOT EXISTS ' + collectionId + ' (id uuid primary key, data jsonb)')
+      }
+    },
+    all: async function () {
+      return this.find({})
+    },
+    find: async function (rawQuery, offset, limit, orderby, fields) {
+      const arrayFields = util.getArrayPaths('', collection.schema)
+      const pgQuery = mongoToPostgres('data', rawQuery || {}, arrayFields)
+      const select = fields ? mongoToPostgres.convertSelect('data', fields, arrayFields) : '*'
+      let query = 'SELECT ' + select + ' FROM ' + collectionId + (pgQuery ? ' WHERE ' + pgQuery : '')
+      if (typeof orderby !== 'undefined') {
+        query += ' ORDER BY '
+        query += orderby.map((ordering) => {
+          return mongoToPostgres.convertDotNotation('data', ordering[0]) + (ordering[1] > 0 ? ' ASC' : ' DESC')
+        }).join(', ')
+      }
+      if (typeof offset !== 'undefined') {
+        query += ' OFFSET ' + offset
+      }
+      if (typeof limit !== 'undefined') {
+        query += ' LIMIT ' + limit
+      }
+      const result = await pool.query(query)
+      return result.rows.map((row) => row.data)
+    },
+    count: async function(rawQuery, offset, limit) {
+      const arrayFields = util.getArrayPaths('', collection.schema)
+      const pgQuery = mongoToPostgres('data', rawQuery || {}, arrayFields)
+      let query = 'SELECT COUNT(*) FROM ' + collectionId + (pgQuery ? ' WHERE ' + pgQuery : '')
+      if (typeof offset !== 'undefined') {
+        query += ' OFFSET ' + offset
+      }
+      if (typeof limit !== 'undefined') {
+        query += ' LIMIT ' + limit
+      }
+      const result = await pool.query(query)
+      return parseInt(result.rows[0].count)
+    },
+    get: async function (id, fields) {
+      const arrayFields = util.getArrayPaths('', collection.schema)
+      const select = fields ? mongoToPostgres.convertSelect('data', fields, arrayFields) : '*'
+      const result = await pool.query(`SELECT ${select} FROM ${collectionId} WHERE id = $1`, [id])
+      if (result.rowCount === 0) {
+        throw new util.ApiError(404, 'document not found')
+      }
+      return result.rows[0].data
+    },
+    create: async function (data) {
+      util.addIdIfMissing(data)
+      try {
+        await pool.query('INSERT INTO ' + collectionId + ' (id, data) VALUES ($1, $2)', [data._id, data])
+      } catch (e) {
+        if (e.message.includes('duplicate key')) {
+          throw new util.ApiError(409, 'document already exists')
+        }
+        throw e
+      }
+      return data._id
+    },
+    update: async function (id, data) {
+      if (typeof data._id === 'undefined') {
+        data._id = id
+      }
+      const result = await pool.query('UPDATE ' + collectionId + ' SET data=$2,id=$3 WHERE id=$1', [id, data, data._id])
+      if (result.rowCount === 0) {
+        throw new util.ApiError(404, 'document not found')
+      }
+      return data
+    },
+    // eslint-disable-next-line no-unused-vars
+    updateWithQuery: async function (query, update, options) {
+      const arrayFields = util.getArrayPaths('', collection.schema)
+      const pgQuery = mongoToPostgres('data', query || {}, arrayFields)
+      const updateSql = mongoToPostgres.convertUpdate('data', update,false)
+      const result = await pool.query('UPDATE ' + collectionId + ' SET data=' + updateSql + ' WHERE ' + pgQuery)
+      return {
+        matchedCount: result.rowCount
+      }
+    },
+    delete: async function (id) {
+      const result = await pool.query('DELETE FROM ' + collectionId + ' WHERE id=$1', [id])
+      if (result.rowCount === 0) {
+        throw new util.ApiError(404, 'document not found')
+      }
+      return 'OK'
+    }
+  }
+}

package/middleware/permissions.js

@@ -1,49 +1,53 @@
-const util = require('../util')
-
-async function addRolePermissions (req, roles) {
-  req.permissions = req.permissions || {}
-  const roleDocs = await Promise.all(roles.map((name) => req.db.role.get(name)))
-  roleDocs.forEach((roleDoc) => {
-    for (const permission in roleDoc.permissions) {
-      if (roleDoc.permissions[permission]) {
-        req.permissions[permission] = true
-      }
-    }
-  })
-}
-
-async function doesAuthenticatedRoleExist(req) {
-  try {
-    await req.db.role.get('Authenticated')
-    return true
-  } catch (e) {
-    return false
-  }
-}
-
-module.exports.addRolePermissionsAsync = async function addRolePermissionsMiddlewareAsync(req) {
-  if (!req.settings || !req.settings.enforce_permissions) {
-    // Use a dummy permission getter
-    req.hasPermission = () => true
-    return
-  }
-  req.hasPermission = (permission) => req.permissions && req.permissions[permission]
-  let roles = ['Anonymous']
-  const isAuthenticatedRole = await doesAuthenticatedRoleExist(req)
-  if (req.uid) {
-    try {
-      const user = await req.db[req.ucollection].get(req.uid)
-      req.user = user
-      roles = (user.roles || []).concat(isAuthenticatedRole ? ['Authenticated'] : [])
-    } catch (e) {
-      throw new util.ApiError(404, 'User no longer exists')
-    }
-  } else {
-    req.user = {}
-  }
-  await addRolePermissions(req, roles)
-}
-
-module.exports.middleware = function addRolePermissionsMiddleware (req, res, next) {
-  module.exports.addRolePermissionsAsync(req).then(next).catch(next)
-}
+const util = require('../util')
+let authenticatedRoleExists
+
+async function addRolePermissions (req, roles) {
+  req.permissions = req.permissions || {}
+  const roleDocs = await Promise.all(roles.map((name) => req.db.role.get(name)))
+  roleDocs.forEach((roleDoc) => {
+    for (const permission in roleDoc.permissions) {
+      if (roleDoc.permissions[permission]) {
+        req.permissions[permission] = true
+      }
+    }
+  })
+}
+
+async function doesAuthenticatedRoleExist(req) {
+  if (typeof authenticatedRoleExists === 'undefined') {
+    try {
+      await req.db.role.get('Authenticated')
+      authenticatedRoleExists = true
+    } catch (e) {
+      authenticatedRoleExists = false
+    }
+  }
+  return authenticatedRoleExists
+}
+
+module.exports.addRolePermissionsAsync = async function addRolePermissionsMiddlewareAsync(req) {
+  if (!req.settings || !req.settings.enforce_permissions) {
+    // Use a dummy permission getter
+    req.hasPermission = () => true
+    return
+  }
+  req.hasPermission = (permission) => req.permissions && req.permissions[permission]
+  let roles = ['Anonymous']
+  const isAuthenticatedRole = await doesAuthenticatedRoleExist(req)
+  if (req.uid) {
+    try {
+      const user = await req.db[req.ucollection].get(req.uid)
+      req.user = user
+      roles = (user.roles || []).concat(isAuthenticatedRole ? ['Authenticated'] : [])
+    } catch (e) {
+      throw new util.ApiError(404, 'User no longer exists')
+    }
+  } else {
+    req.user = {}
+  }
+  await addRolePermissions(req, roles)
+}
+
+module.exports.middleware = function addRolePermissionsMiddleware (req, res, next) {
+  module.exports.addRolePermissionsAsync(req).then(next).catch(next)
+}

package/modules/admin/.babelrc

@@ -1,13 +1,12 @@
-{
-  "sourceType": "module",
-  "presets": [
-    ["env", {
-      "targets": {
-        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
-      },
-      "exclude": ["transform-regenerator"]
-    }],
-    "stage-2"
-  ],
-  "plugins":["transform-vue-jsx", "transform-runtime"]
-}
+{
+  "sourceType": "module",
+  "presets": [
+    ["env", {
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
+    "stage-2"
+  ],
+  "plugins":["transform-vue-jsx", "transform-runtime"]
+}

package/modules/admin/src/utils/request.js

@@ -1,47 +1,48 @@
-import axios from 'axios'
-import { Message } from 'element-ui'
-import store from '../store'
-import { getToken } from '@/utils/auth'
-
-const get = (o, p) =>
-  p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o)
-
-const service = axios.create({
-  // eslint-disable-next-line
-  baseURL: (typeof settings !== 'undefined' ? settings.apiurl : 'https://dev.racepass.com/api/v1/'),  timeout: 5000 // 请求超时时间
-})
-
-// request拦截器
-service.interceptors.request.use(
-  config => {
-    if (store.getters.token) {
-      config.headers['x-access-token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-    }
-    return config
-  },
-  error => {
-    // Do something with request error
-    console.log(error) // for debug
-    Promise.reject(error)
-  }
-)
-
-// response 拦截器
-service.interceptors.response.use(
-  response => {
-    return response
-  },
-  error => {
-    console.log(error) // for debug
-    const errorMessage = get(error, ['response', 'data', 'error']) || error.message
-    Message({
-      message: errorMessage,
-      type: 'error',
-      duration: 0,
-      showClose: true,
-    })
-    return Promise.reject(error)
-  }
-)
-
-export default service
+import axios from 'axios'
+import { Message } from 'element-ui'
+import store from '../store'
+import { getToken } from '@/utils/auth'
+
+const get = (o, p) =>
+  p.reduce((xs, x) => (xs && xs[x]) ? xs[x] : null, o)
+
+const service = axios.create({
+  // eslint-disable-next-line
+  baseURL: (typeof settings !== 'undefined' ? settings.apiurl : process.env.BASE_API),
+  timeout: 5000 // 请求超时时间
+})
+
+// request拦截器
+service.interceptors.request.use(
+  config => {
+    if (store.getters.token) {
+      config.headers['x-access-token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    return config
+  },
+  error => {
+    // Do something with request error
+    console.log(error) // for debug
+    Promise.reject(error)
+  }
+)
+
+// response 拦截器
+service.interceptors.response.use(
+  response => {
+    return response
+  },
+  error => {
+    console.log(error) // for debug
+    const errorMessage = get(error, ['response', 'data', 'error']) || error.message
+    Message({
+      message: errorMessage,
+      type: 'error',
+      duration: 0,
+      showClose: true,
+    })
+    return Promise.reject(error)
+  }
+)
+
+export default service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",