Fix auth issue

Author: dhruvit-r

Diff for: src/controllers/GitlabController.js

@@ -84,7 +84,7 @@ async function ownerUserLoginCallback(req, res) {
   const expiry = new Date(new Date().getTime() + (expiresIn * MS_PER_SECOND));
   // ensure the user is valid owner user
   const ownerUser = await GitlabService.ensureUser(
-    accessToken, refreshToken, expiry, topcoderUsername, constants.USER_ROLES.OWNER);
+    accessToken, expiry, refreshToken, topcoderUsername, constants.USER_ROLES.OWNER);
   // save user token data
   await dbHelper.update(User, ownerUser.id, {
     accessToken,
@@ -317,7 +317,8 @@ async function guestUserCallback(req, res) {
     logger.debug(`[GitlabController#guestUserCallback] payload: ${JSON.stringify(result.body)}`);
 
     // Create/update user mapping
-    await GitlabService.ensureUser(accessToken, refreshToken, expiry, constants.USER_ROLES.GUEST);
+    await GitlabService.ensureUser(
+      accessToken, expiry, refreshToken, req.currentUser.handle, constants.USER_ROLES.GUEST);
 
     // redirect to success page
     res.redirect(`${constants.GUEST_ONBOARDING_COMPLETED_URL}?success=true`);

Diff for: src/services/GitlabService.js

@@ -58,13 +58,13 @@ getUserProfile.schema = Joi.object().keys({
 /**
  * Ensure the owner user is in database.
  * @param {String} token the access token of owner user
- * @param {Date} expiryTime the expiry time of owner user
+ * @param {Date} accessTokenExpiration the access token expiration of owner user
  * @param {String} refreshToken the refresh token of owner user
  * @param {String} topcoderUsername the topcoder handle of owner user
  * @param {String} userRole the role of user
  * @returns {Promise} the promise result of found owner user
  */
-async function ensureUser(token, expiryTime, refreshToken, topcoderUsername, userRole) {
+async function ensureUser(token, accessTokenExpiration, refreshToken, topcoderUsername, userRole) {
   const userProfile = await getUserProfile(token);
   const user = await dbHelper.queryOneUserByTypeAndRole(User,
     userProfile.username,
@@ -94,7 +94,7 @@ async function ensureUser(token, expiryTime, refreshToken, topcoderUsername, use
       userProviderId: userProfile.id,
       username: userProfile.username,
       accessToken: token,
-      accessTokenExpiration: expiryTime,
+      accessTokenExpiration,
       refreshToken,
     });
   }
@@ -103,14 +103,14 @@ async function ensureUser(token, expiryTime, refreshToken, topcoderUsername, use
     userProviderId: userProfile.id,
     username: userProfile.username,
     accessToken: token,
-    accessTokenExpiration: expiryTime,
+    accessTokenExpiration,
     refreshToken,
   });
 }
 
 ensureUser.schema = Joi.object().keys({
   token: Joi.string().required(),
-  expiryTime: Joi.date().required(),
+  accessTokenExpiration: Joi.date().required(),
   refreshToken: Joi.string().required(),
   topcoderUsername: Joi.string().required(),
   userRole: Joi.string().required(),