From 63ad27e2521da7bb1f11ccc2b67f3959813c9f06 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 9 Nov 2021 22:06:17 +0800 Subject: [PATCH 1/8] deploying --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88aca8cf49..e97c6ae855 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -343,6 +343,7 @@ workflows: branches: only: - develop + - fix-apply-cross # This is alternate dev env for parallel testing - "build-test": context : org-global From 2c372f429ab0fdee3f1bac2684dc6ae94c190500 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 9 Nov 2021 22:50:24 +0800 Subject: [PATCH 2/8] ci:deploying --- src/server/routes/recruitCRM.js | 49 ++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/src/server/routes/recruitCRM.js b/src/server/routes/recruitCRM.js index 11b193c756..d523744a3f 100644 --- a/src/server/routes/recruitCRM.js +++ b/src/server/routes/recruitCRM.js @@ -24,19 +24,42 @@ const routes = express.Router(); // Enables CORS on those routes according config above // ToDo configure CORS for set of our trusted domains -routes.use(cors()); -routes.options('*', cors()); - -routes.get('/jobs', (req, res, next) => new RecruitCRMService().getAllJobs(req, res, next)); -routes.get('/jobs/cache', (req, res, next) => new RecruitCRMService().getJobsCacheStats(req, res, next)); -routes.get('/jobs/cache/flush', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getJobsCacheFlush(req, res, next)); -routes.get('/jobs/search', (req, res, next) => new RecruitCRMService().getJobs(req, res, next)); -routes.get('/jobs/:id', (req, res, next) => new RecruitCRMService().getJob(req, res, next)); -routes.post('/jobs/:id/apply', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next)); -routes.get('/candidates/search', (req, res, next) => new RecruitCRMService().searchCandidates(req, res, next)); +// routes.use(cors()); +// routes.options('*', cors()); + +routes.options('/jobs', cors()); +routes.get('/jobs', cors(), (req, res, next) => new RecruitCRMService().getAllJobs(req, res, next)); + +routes.options('/jobs/cache', cors()); +routes.get('/jobs/cache', cors(), (req, res, next) => new RecruitCRMService().getJobsCacheStats(req, res, next)); + +routes.options('/jobs/cache/flush', cors()); +routes.get('/jobs/cache/flush', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getJobsCacheFlush(req, res, next)); + +routes.options('/jobs/search', cors()); +routes.get('/jobs/search', cors(), (req, res, next) => new RecruitCRMService().getJobs(req, res, next)); + +routes.options('/jobs/:id', cors()); +routes.get('/jobs/:id', cors(), (req, res, next) => new RecruitCRMService().getJob(req, res, next)); + +const applyOptions = { + origin: true, + methods: ['POST'], + credentials: true, + maxAge: 3600, + allowedHeaders: ['Content-Type', 'Authorization'], +}; +routes.options('/jobs/:id/apply', cors(applyOptions)); +routes.post('/jobs/:id/apply', cors(applyOptions), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().applyForJob(req, res, next)); + +routes.options('/candidates/search', cors()); +routes.get('/candidates/search', cors(), (req, res, next) => new RecruitCRMService().searchCandidates(req, res, next)); // new router added -routes.get('/profile', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getProfile(req, res, next)); -routes.post('/profile', (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().updateProfile(req, res, next)); -routes.get('/taasjobs', (req, res, next) => new RecruitCRMService().getJobsFromTaas(req, res, next)); +routes.options('/profile', cors()); +routes.get('/profile', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), (req, res, next) => new RecruitCRMService().getProfile(req, res, next)); +routes.post('/profile', cors(), (req, res, next) => authenticator(authenticatorOptions)(req, res, next), upload.single('resume'), (req, res, next) => new RecruitCRMService().updateProfile(req, res, next)); + +routes.options('/taasjobs', cors()); +routes.get('/taasjobs', cors(), (req, res, next) => new RecruitCRMService().getJobsFromTaas(req, res, next)); export default routes; From d14520673ccb48b59e0a7f15be5319b41c64b2a9 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 9 Nov 2021 23:34:47 +0800 Subject: [PATCH 3/8] redeploying --- src/server/services/recruitCRM.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index e18252f6ee..15bd854f2f 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -423,6 +423,8 @@ export default class RecruitCRMService { // finally, clear the cookie res.cookie(config.GROWSURF_COOKIE, '', { maxAge: 0, + httpOnly: true, + sameSite: 'none', overwrite: true, }); } From e6bd0dd7f3d774e6155ae45f38eb509f910b6685 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Tue, 9 Nov 2021 23:35:57 +0800 Subject: [PATCH 4/8] redeploying --- src/server/services/recruitCRM.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 15bd854f2f..50d88ca2cf 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -426,6 +426,7 @@ export default class RecruitCRMService { httpOnly: true, sameSite: 'none', overwrite: true, + secure: true, }); } // Check if candidate exsits in the system? From 9713518eac2f6066ebc64b2682f1651687df9e30 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Wed, 10 Nov 2021 00:24:20 +0800 Subject: [PATCH 5/8] reset --- src/server/services/recruitCRM.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index 50d88ca2cf..e18252f6ee 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -423,10 +423,7 @@ export default class RecruitCRMService { // finally, clear the cookie res.cookie(config.GROWSURF_COOKIE, '', { maxAge: 0, - httpOnly: true, - sameSite: 'none', overwrite: true, - secure: true, }); } // Check if candidate exsits in the system? From 7372074d2ce6bf09eca9684dd77467d7d7d9bc1c Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Wed, 10 Nov 2021 11:31:27 +0800 Subject: [PATCH 6/8] reset ci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e97c6ae855..88aca8cf49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -343,7 +343,6 @@ workflows: branches: only: - develop - - fix-apply-cross # This is alternate dev env for parallel testing - "build-test": context : org-global From 0a067c9fa2ce78abfc55df9f5390bf68a82e748a Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 11 Nov 2021 21:03:54 +0800 Subject: [PATCH 7/8] add logs --- .circleci/config.yml | 1 + src/server/services/recruitCRM.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88aca8cf49..e97c6ae855 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -343,6 +343,7 @@ workflows: branches: only: - develop + - fix-apply-cross # This is alternate dev env for parallel testing - "build-test": context : org-global diff --git a/src/server/services/recruitCRM.js b/src/server/services/recruitCRM.js index e18252f6ee..086ce533c5 100644 --- a/src/server/services/recruitCRM.js +++ b/src/server/services/recruitCRM.js @@ -373,6 +373,9 @@ export default class RecruitCRMService { let isReferred = false; let referralCookie = req.cookies[config.GROWSURF_COOKIE]; if (referralCookie) referralCookie = JSON.parse(referralCookie); + if (referralCookie) { + logger.info(`The referralId is: ${referralCookie.referralId}`); + } const tcHandle = _.findIndex(form.custom_fields, { field_id: 2 }); let growRes; try { From ec758ca04bfa165788404df159435e9fe01e7a20 Mon Sep 17 00:00:00 2001 From: LieutenantRoger Date: Thu, 11 Nov 2021 21:18:29 +0800 Subject: [PATCH 8/8] revert ci --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e97c6ae855..88aca8cf49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -343,7 +343,6 @@ workflows: branches: only: - develop - - fix-apply-cross # This is alternate dev env for parallel testing - "build-test": context : org-global