Merge pull request #1035 from Real-Dev-Squad/fix/new-user-redirection

Fix/new user redirection

Author: ankushdharkar

models/users.js

@@ -59,7 +59,7 @@ const addOrUpdate = async (userData, userId = null) => {
     userData.roles = { archived: false };
     userData.incompleteUserDetails = true;
     const userInfo = await userModel.add(userData);
-    return { isNewUser: true, userId: userInfo.id };
+    return { isNewUser: true, userId: userInfo.id, incompleteUserDetails: true };
   } catch (err) {
     logger.error("Error in adding or updating user", err);
     throw err;

test/fixtures/user/user.js

@@ -33,6 +33,7 @@ module.exports = () => {
         publicId: "profile/mtS4DhUvNYsKqI7oCWVB/aenklfhtjldc5ytei3ar",
         url: "https://res.cloudinary.com/realdevsquad/image/upload/v1667685133/profile/mtS4DhUvNYsKqI7oCWVB/aenklfhtjldc5ytei3ar.jpg",
       },
+      incompleteUserDetails: false,
     },
     {
       username: "nikhil",

test/integration/auth.test.js

@@ -6,6 +6,8 @@ const passport = require("passport");
 
 const app = require("../../server");
 const cleanDb = require("../utils/cleanDb");
+const { addUserToDBForTest } = require("../../utils/users");
+const userData = require("../fixtures/user/user")();
 
 chai.use(chaiHttp);
 
@@ -19,28 +21,38 @@ describe("auth", function () {
     sinon.restore();
   });
 
-  it("should redirect the request to the goto page on successful login", function (done) {
+  it("should redirect the user to new sign up flow if they are have incomplte user details true", async function () {
+    const redirectURL = "https://my.realdevsquad.com/new-signup";
+    sinon.stub(passport, "authenticate").callsFake((strategy, options, callback) => {
+      callback(null, "accessToken", githubUserInfo[0]);
+      return (req, res, next) => {};
+    });
+
+    const res = await chai
+      .request(app)
+      .get("/auth/github/callback")
+      .query({ code: "codeReturnedByGithub" })
+      .redirects(0);
+    expect(res).to.have.status(302);
+    expect(res.headers.location).to.equal(redirectURL);
+  });
+  // same data should be return from github and same data should be added there
+  it("should redirect the request to the goto page on successful login, if user has incomplete user details false", async function () {
+    await addUserToDBForTest(userData[0]);
     const rdsUiUrl = config.get("services.rdsUi.baseUrl");
 
     sinon.stub(passport, "authenticate").callsFake((strategy, options, callback) => {
       callback(null, "accessToken", githubUserInfo[0]);
       return (req, res, next) => {};
     });
 
-    chai
+    const res = await chai
       .request(app)
       .get("/auth/github/callback")
       .query({ code: "codeReturnedByGithub", state: rdsUiUrl })
-      .redirects(0)
-      .end((err, res) => {
-        if (err) {
-          return done(err);
-        }
-        expect(res).to.have.status(302);
-        expect(res.headers.location).to.equal(rdsUiUrl);
-
-        return done();
-      });
+      .redirects(0);
+    expect(res).to.have.status(302);
+    expect(res.headers.location).to.equal(rdsUiUrl);
   });
 
   it("should send a cookie with JWT in the response", function (done) {

utils/users.js

@@ -1,11 +1,18 @@
 const { fetchUser } = require("../models/users");
+const firestore = require("../utils/firestore");
+const userModel = firestore.collection("users");
+
+const addUserToDBForTest = async (userData) => {
+  await userModel.add(userData);
+};
 
 /**
  * Used for receiving userId when providing username
  *
  * @param username {String} - username of the User.
  * @returns id {String} - userId of the same user
  */
+
 const getUserId = async (username) => {
   try {
     const {
@@ -137,6 +144,7 @@ function getUsernamesFromPRs(allPRs) {
 }
 
 module.exports = {
+  addUserToDBForTest,
   getUserId,
   getUsername,
   getParticipantUserIds,