refactor: migrate to PostgreSQL + Sequelize

2017-07-22 23:56:46 -04:00
parent 8da98ce75a
commit d76f6182b2
40 changed files with 1044 additions and 745 deletions
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -1,109 +1,113 @@
 'use strict'

-/* global db, lang */
+/* global wiki */

-const Mongoose = require('mongoose')
 const Promise = require('bluebird')
 const bcrypt = require('bcryptjs-then')
 const _ = require('lodash')

 /**
 * Users schema
- *
- * @type       {<Mongoose.Schema>}
 */
-var userSchema = Mongoose.Schema({
+module.exports = (sequelize, DataTypes) => {
+  let userSchema = sequelize.define('user', {
+    email: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      validate: {
+        isEmail: true
+      }
+    },
+    provider: {
+      type: DataTypes.ENUM(wiki.data.authProviders),
+      allowNull: false
+    },
+    providerId: {
+      type: DataTypes.STRING,
+      allowNull: true
+    },
+    password: {
+      type: DataTypes.STRING,
+      allowNull: true
+    },
+    name: {
+      type: DataTypes.STRING,
+      allowNull: true
+    },
+    role: {
+      type: DataTypes.ENUM('admin', 'user', 'guest'),
+      allowNull: false
+    }
+  }, {
+    timestamps: true,
+    version: true,
+    indexes: [
+      {
+        unique: true,
+        fields: ['provider', 'email']
+      }
+    ]
+  })

-  email: {
-    type: String,
-    required: true,
-    index: true
-  },
-
-  provider: {
-    type: String,
-    required: true
-  },
-
-  providerId: {
-    type: String
-  },
-
-  password: {
-    type: String
-  },
-
-  name: {
-    type: String
-  },
-
-  rights: [{
-    role: String,
-    path: String,
-    exact: Boolean,
-    deny: Boolean
-  }]
-
-}, { timestamps: {} })
-
-userSchema.statics.processProfile = (profile) => {
-  let primaryEmail = ''
-  if (_.isArray(profile.emails)) {
-    let e = _.find(profile.emails, ['primary', true])
-    primaryEmail = (e) ? e.value : _.first(profile.emails).value
-  } else if (_.isString(profile.email) && profile.email.length > 5) {
-    primaryEmail = profile.email
-  } else if (_.isString(profile.mail) && profile.mail.length > 5) {
-    primaryEmail = profile.mail
-  } else if (profile.user && profile.user.email && profile.user.email.length > 5) {
-    primaryEmail = profile.user.email
-  } else {
-    return Promise.reject(new Error(lang.t('auth:errors.invaliduseremail')))
+  userSchema.prototype.validatePassword = function (rawPwd) {
+    return bcrypt.compare(rawPwd, this.password).then((isValid) => {
+      return (isValid) ? true : Promise.reject(new Error(wiki.lang.t('auth:errors:invalidlogin')))
+    })
  }

-  profile.provider = _.lowerCase(profile.provider)
-  primaryEmail = _.toLower(primaryEmail)
-
-  return db.User.findOneAndUpdate({
-    email: primaryEmail,
-    provider: profile.provider
-  }, {
-    email: primaryEmail,
-    provider: profile.provider,
-    providerId: profile.id,
-    name: profile.displayName || _.split(primaryEmail, '@')[0]
-  }, {
-    new: true
-  }).then((user) => {
-    // Handle unregistered accounts
-    if (!user && profile.provider !== 'local' && (appconfig.auth.defaultReadAccess || profile.provider === 'ldap' || profile.provider === 'azure')) {
-      let nUsr = {
-        email: primaryEmail,
-        provider: profile.provider,
-        providerId: profile.id,
-        password: '',
-        name: profile.displayName || profile.name || profile.cn,
-        rights: [{
-          role: 'read',
-          path: '/',
-          exact: false,
-          deny: false
-        }]
-      }
-      return db.User.create(nUsr)
+  userSchema.processProfile = (profile) => {
+    let primaryEmail = ''
+    if (_.isArray(profile.emails)) {
+      let e = _.find(profile.emails, ['primary', true])
+      primaryEmail = (e) ? e.value : _.first(profile.emails).value
+    } else if (_.isString(profile.email) && profile.email.length > 5) {
+      primaryEmail = profile.email
+    } else if (_.isString(profile.mail) && profile.mail.length > 5) {
+      primaryEmail = profile.mail
+    } else if (profile.user && profile.user.email && profile.user.email.length > 5) {
+      primaryEmail = profile.user.email
+    } else {
+      return Promise.reject(new Error(wiki.lang.t('auth:errors.invaliduseremail')))
    }
-    return user || Promise.reject(new Error(lang.t('auth:errors:notyetauthorized')))
-  })
-}

-userSchema.statics.hashPassword = (rawPwd) => {
-  return bcrypt.hash(rawPwd)
-}
+    profile.provider = _.lowerCase(profile.provider)
+    primaryEmail = _.toLower(primaryEmail)

-userSchema.methods.validatePassword = function (rawPwd) {
-  return bcrypt.compare(rawPwd, this.password).then((isValid) => {
-    return (isValid) ? true : Promise.reject(new Error(lang.t('auth:errors:invalidlogin')))
-  })
-}
+    return wiki.db.User.findOneAndUpdate({
+      email: primaryEmail,
+      provider: profile.provider
+    }, {
+      email: primaryEmail,
+      provider: profile.provider,
+      providerId: profile.id,
+      name: profile.displayName || _.split(primaryEmail, '@')[0]
+    }, {
+      new: true
+    }).then((user) => {
+      // Handle unregistered accounts
+      if (!user && profile.provider !== 'local' && (appconfig.auth.defaultReadAccess || profile.provider === 'ldap' || profile.provider === 'azure')) {
+        let nUsr = {
+          email: primaryEmail,
+          provider: profile.provider,
+          providerId: profile.id,
+          password: '',
+          name: profile.displayName || profile.name || profile.cn,
+          rights: [{
+            role: 'read',
+            path: '/',
+            exact: false,
+            deny: false
+          }]
+        }
+        return db.User.create(nUsr)
+      }
+      return user || Promise.reject(new Error(wiki.lang.t('auth:errors:notyetauthorized')))
+    })
+  }

-module.exports = Mongoose.model('User', userSchema)
+  userSchema.hashPassword = (rawPwd) => {
+    return bcrypt.hash(rawPwd)
+  }
+
+  return userSchema
+}