alter user tabel

src/core/MailProvider.js

@@ -160,7 +160,7 @@ export class MailProvider {
       return false;
     }
     await reguser.update({
-      mailVerified: true,
+      verified: true,
       verificationReqAt: null,
     });
     return reguser.name;

src/core/me.js

@@ -13,17 +13,17 @@ export default async function getMe(user, lang = 'default') {
   const userdata = await user.getUserData();
   // sanitize data
   const {
-    name, mailVerified,
+    name, verified,
   } = userdata;
   if (!name) userdata.name = null;
   const messages = [];
-  if (USE_MAILER && name && !mailVerified) {
+  if (USE_MAILER && name && !verified) {
     messages.push('not_verified');
   }
   if (messages.length > 0) {
     userdata.messages = messages;
   }
-  delete userdata.mailVerified;
+  delete userdata.verified;
 
   userdata.canvases = getLocalicedCanvases(lang);
   userdata.channels = {

src/data/User.js

@@ -244,7 +244,7 @@ class User {
       return {
         ...data,
         name: null,
-        mailVerified: false,
+        verified: false,
         blockDm: false,
         priv: false,
         mailreg: false,
@@ -260,7 +260,7 @@ class User {
     return {
       ...data,
       name: regUser.name,
-      mailVerified: regUser.mailVerified,
+      verified: regUser.verified,
       blockDm: regUser.blockDm,
       priv: regUser.priv,
       totalPixels,

src/data/sql/RegUser.js

@@ -38,7 +38,7 @@ const RegUser = sequelize.define('User', {
     defaultValue: false,
   },
 
-  // null if external oauth authentification
+  // null if only ever used external oauth
   password: {
     type: DataTypes.CHAR(60),
     allowNull: true,
@@ -51,9 +51,9 @@ const RegUser = sequelize.define('User', {
     defaultValue: 0,
   },
 
-  // mail and Minecraft verified
+  // currently just mail verification
   verified: {
-    type: DataTypes.TINYINT,
+    type: DataTypes.BOOLEAN,
     allowNull: false,
     defaultValue: false,
   },
@@ -98,10 +98,6 @@ const RegUser = sequelize.define('User', {
   updatedAt: false,
 
   getterMethods: {
-    mailVerified() {
-      return this.verified & 0x01;
-    },
-
     blockDm() {
       return this.blocks & 0x01;
     },
@@ -112,11 +108,6 @@ const RegUser = sequelize.define('User', {
   },
 
   setterMethods: {
-    mailVerified(num) {
-      const val = (num) ? (this.verified | 0x01) : (this.verified & ~0x01);
-      this.setDataValue('verified', val);
-    },
-
     blockDm(num) {
       const val = (num) ? (this.blocks | 0x01) : (this.blocks & ~0x01);
       this.setDataValue('blocks', val);

src/routes/api/auth/change_mail.js

@@ -56,7 +56,7 @@ export default async (req, res) => {
 
   await user.regUser.update({
     email,
-    mailVerified: false,
+    verified: false,
   });
 
   const host = getHostFromRequest(req);

src/routes/api/auth/resend_verify.js

@@ -15,8 +15,8 @@ export default async (req, res) => {
     return;
   }
 
-  const { name, email, mailVerified } = user.regUser;
+  const { name, email, verified } = user.regUser;
-  if (mailVerified) {
+  if (verified) {
     res.status(400);
     res.json({
       errors: ['You are already verified.'],

src/server.js

@@ -77,7 +77,7 @@ app.use(routes);
 // ip config
 // -----------------------------------------------------------------------------
 // sync sql models
-sequelize.sync({ alter: { drop: false } })
+sequelize.sync({ alter: { drop: true } })
   // connect to redis
   .then(connectRedis)
   .then(async () => {