[Starts #173466929] Fixes some user profile data that couldn't be updated

Author: devel605

server/controllers/authController.js

@@ -4,7 +4,6 @@ import UserHelper from '../helpers/userHelper';
 import TokenHelper from '../helpers/tokenHelper';
 import passwordHelper from '../helpers/passwordHelper';
 
-
 /**
  * This class contains all methods
  * required to handle all

server/controllers/userController.js

@@ -132,6 +132,7 @@ class UserController {
         firstname,
         username,
         gender,
+        profileImage,
         birthDate,
         preferredLanguage,
         preferredCurrency,
@@ -146,6 +147,7 @@ class UserController {
         firstname,
         username,
         gender,
+        profileImage,
         birthDate,
         preferredLanguage,
         preferredCurrency,
@@ -197,5 +199,4 @@ class UserController {
   }
 }
 
-
 export default UserController;

server/helpers/authHelper.js

@@ -139,7 +139,6 @@ class AuthHelper {
     try {
       const {
         id,
-        displayName: username,
         provider: authType,
         name: { givenName: firstname, familyName: lastname },
         _json: { email },
@@ -150,7 +149,7 @@ class AuthHelper {
         firstname,
         lastname,
         email,
-        username: username || firstname,
+        username: firstname,
         role: 'Requester',
         authType,
         lineManager: null,

server/index.js

@@ -21,7 +21,6 @@ app.use(bodyParser.urlencoded({ extended: true }));
 const port = process.env.PORT || 3000;
 const basePath = '/api/v1';
 
-
 app.use(cors());
 app.use(passport.initialize());
 app.use(passport.session());

server/schemas/accommodationSchema.js

@@ -1,6 +1,5 @@
 import Joi from '@hapi/joi';
 
-
 const accommodationSchema = Joi.object().keys({
   name: Joi.string().required().trim(),
   description: Joi.string().required().trim(),

server/schemas/userSchema.js

@@ -5,11 +5,12 @@ const userSchema = Joi.object().keys({
   firstname: Joi.string().alphanum().min(3).max(30),
   username: Joi.string().alphanum().min(3).max(15),
   gender: Joi.string().alphanum().min(3).max(30),
-  birthDate: Joi.date(),
+  birthDate: Joi.string(),
   preferredLanguage: Joi.string().alphanum().min(3).max(15),
   preferredCurrency: Joi.string().alphanum().min(3).max(30),
   location: Joi.string().min(3).max(30),
   department: Joi.string(),
+  profileImage: Joi.string(),
   emailNotifications: Joi.boolean(),
   inAppNotifications: Joi.boolean()
 });

server/sequelize/migrations/20200325105904-create-user.js

@@ -20,6 +20,9 @@ module.exports = {
     facebookId: {
       type: Sequelize.STRING,
     },
+    profileImage: {
+      type: Sequelize.STRING,
+    },
     username: {
       allowNull: false,
       type: Sequelize.STRING

server/sequelize/models/user.js

@@ -21,6 +21,7 @@ export default (sequelize, DataTypes) => {
       inAppNotifications: DataTypes.BOOLEAN,
       googleId: DataTypes.STRING,
       facebookId: DataTypes.STRING,
+      profileImage: DataTypes.STRING
     },
   );
   User.associate = (models) => {

server/sequelize/seeders/20200325133338-User.js

@@ -7,6 +7,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
     lastname: 'dontmodifieme',
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     email: '[email protected]',
     username: 'dummydata01',
     password: PasswordHelper.hashPassword('123456789'),
@@ -20,6 +21,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'dummy',
     lastname: 'Data',
     email: '[email protected]',
@@ -35,6 +37,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'dummy3',
     lastname: 'Data',
     email: '[email protected]',
@@ -50,6 +53,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'dummy4',
     lastname: 'Data',
     email: '[email protected]',
@@ -65,6 +69,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'Dumebi',
     lastname: 'Hiu',
     email: '[email protected]',
@@ -80,6 +85,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'Dumebi',
     lastname: 'Hiu',
     email: '[email protected]',
@@ -95,6 +101,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'ag',
     lastname: 'gy',
     email: '[email protected]',
@@ -110,6 +117,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'chris',
     lastname: 'meme',
     email: '[email protected]',
@@ -125,6 +133,7 @@ const up = (queryInterface) => queryInterface.bulkInsert(
   {
     googleId: '',
     facebookId: '',
+    profileImage: 'https://mcdn.wallpapersafari.com/medium/57/33/UW0jhS.jpg',
     firstname: 'Dumebi',
     lastname: 'Hiu',
     email: '[email protected]',