Merge pull request #1589 from bcgov/fix/EDX-1892

EDX-1892: relink user fixes
bcgov · Oct 18, 2023 · eae6643 · eae6643
2 parents 7e72993 + dc066ef
commit eae6643
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/backend/src/components/edx/exchange.js b/backend/src/components/edx/exchange.js
@@ -853,6 +853,7 @@ async function relinkUserSchoolOrDistrictAccess(req, res) {
         email: edxUserDetails.email,
         edxUserId: req.body.params.userToRelink,
         edxUserSchoolID: req.body.params.userSchoolID,
+        edxUserExpiryDate: req.body.params.edxUserExpiryDate
       };
       await postData(token, config.get('server:edx:exchangeURL') + '/school-user-activation-relink-saga', payload,null, userName);
     } else {
@@ -867,6 +868,7 @@ async function relinkUserSchoolOrDistrictAccess(req, res) {
         email: edxUserDetails.email,
         edxUserId: req.body.params.userToRelink,
         edxUserDistrictID: req.body.params.edxUserDistrictID,
+        edxUserExpiryDate: req.body.params.edxUserExpiryDate
       };
       await postData(token, config.get('server:edx:exchangeURL') + '/district-user-activation-relink-saga', payload,null, userName);
     }

diff --git a/frontend/src/components/secure-message/AccessUserCard.vue b/frontend/src/components/secure-message/AccessUserCard.vue
@@ -391,6 +391,7 @@ export default {
       const payload = {
         params: {
           userToRelink: this.user.edxUserID,
+          edxUserExpiryDate: this.getExpiryDate(this.user)
         }
       };
       if (this.instituteTypeCode === 'SCHOOL') {
@@ -402,6 +403,7 @@ export default {
         payload.params.districtID = this.instituteCode;
         payload.params.edxUserDistrictID = userDistrict.edxUserDistrictID;
       }
+
       ApiService.apiAxios.post(Routes.edx.EXCHANGE_RELINK_USER, payload)
         .then(() => {
           this.setSuccessAlert('User has been removed, email sent with instructions to re-link.');