Merge pull request #304 from labzero/develop

Merge to master

Author: JeffreyATW

db/migrations/20230508195724-ChangeUserEmailToCitext.js

@@ -0,0 +1,15 @@
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.sequelize.query('CREATE EXTENSION IF NOT EXISTS citext;');
+    await queryInterface.changeColumn('users', 'email', {
+      type: Sequelize.CITEXT,
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.changeColumn('users', 'email', {
+      type: Sequelize.STRING
+    });
+    await queryInterface.sequelize.query('DROP EXTENSION citext;');
+  }
+};

db/migrations/20230508203447-ChangeInvitationEmailToCitext.js

@@ -0,0 +1,13 @@
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.changeColumn('invitations', 'email', {
+      type: Sequelize.CITEXT,
+    });
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.changeColumn('invitations', 'email', {
+      type: Sequelize.STRING
+    });
+  }
+};

src/api/main/user.js

@@ -66,6 +66,9 @@ export default () => {
 
             return res.status(200).json({ error: false, data: user });
           } catch (err) {
+            if (err.name === 'SequelizeUniqueConstraintError') {
+              return res.status(422).json({ error: true, data: { message: 'Email is already taken.' } });
+            }
             return next(err);
           }
         }

src/models/Invitation.ts

@@ -2,7 +2,7 @@ import { sequelize, DataTypes } from './db';
 
 const Invitation = sequelize.define('invitation', {
   email: {
-    type: DataTypes.STRING,
+    type: DataTypes.CITEXT,
     allowNull: false,
     unique: true
   },

src/models/User.ts

@@ -66,7 +66,7 @@ User.init({
   },
   googleId: DataTypes.STRING,
   name: DataTypes.STRING,
-  email: DataTypes.STRING,
+  email: DataTypes.CITEXT,
   encryptedPassword: DataTypes.STRING,
   resetPasswordToken: DataTypes.STRING,
   resetPasswordSentAt: DataTypes.DATE,