Add channel parameter to 3 subscription related redirect Urls; fixes #65

bcgov · Jan 29, 2020 · f8bc363 · f8bc363
1 parent e64153d
commit f8bc363
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/common/models/subscription.js b/common/models/subscription.js
@@ -448,6 +448,7 @@ module.exports = function(Subscription) {
           if (anonymousUnsubscription.acknowledgements.onScreen.redirectUrl) {
             var redirectUrl =
               anonymousUnsubscription.acknowledgements.onScreen.redirectUrl
+            redirectUrl += `?channel=${this.channel}`
             return await options.httpContext.res.redirect(redirectUrl)
           } else {
             options.httpContext.res.setHeader('Content-Type', 'text/plain')
@@ -530,7 +531,8 @@ module.exports = function(Subscription) {
       if (anonymousUnsubscription.acknowledgements.onScreen.redirectUrl) {
         var redirectUrl =
           anonymousUnsubscription.acknowledgements.onScreen.redirectUrl
-        redirectUrl += '?err=' + encodeURIComponent(error)
+        redirectUrl += `?channel=${this.channel}`
+        redirectUrl += '&err=' + encodeURIComponent(error)
         return await options.httpContext.res.redirect(redirectUrl)
       } else {
         options.httpContext.res.setHeader('Content-Type', 'text/plain')
@@ -556,7 +558,7 @@ module.exports = function(Subscription) {
       this.serviceName
     )
 
-    async function handleConfirmationAcknowledgement(err, message) {
+    let handleConfirmationAcknowledgement = async (err, message) => {
       if (!mergedSubscriptionConfig.confirmationAcknowledgements) {
         if (err) {
           throw err
@@ -566,8 +568,9 @@ module.exports = function(Subscription) {
       var redirectUrl =
         mergedSubscriptionConfig.confirmationAcknowledgements.redirectUrl
       if (redirectUrl) {
+        redirectUrl += `?channel=${this.channel}`
         if (err) {
-          redirectUrl += '?err=' + encodeURIComponent(err.toString())
+          redirectUrl += '&err=' + encodeURIComponent(err.toString())
         }
         return await options.httpContext.res.redirect(redirectUrl)
       } else {
@@ -665,6 +668,7 @@ module.exports = function(Subscription) {
         )
         if (anonymousUndoUnsubscription.redirectUrl) {
           var redirectUrl = anonymousUndoUnsubscription.redirectUrl
+          redirectUrl += `?channel=${this.channel}`
           return await options.httpContext.res.redirect(redirectUrl)
         } else {
           options.httpContext.res.setHeader('Content-Type', 'text/plain')
@@ -696,7 +700,8 @@ module.exports = function(Subscription) {
     } catch (err) {
       if (anonymousUndoUnsubscription.redirectUrl) {
         var redirectUrl = anonymousUndoUnsubscription.redirectUrl
-        redirectUrl += '?err=' + encodeURIComponent(err.message || err)
+        redirectUrl += `?channel=${this.channel}`
+        redirectUrl += '&err=' + encodeURIComponent(err.message || err)
         return await options.httpContext.res.redirect(redirectUrl)
       } else {
         options.httpContext.res.setHeader('Content-Type', 'text/plain')

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "notification",
-  "version": "1.12.0",
+  "version": "1.13.5",
   "dbSchemaVersion": "0.6.0",
   "main": "server/server.js",
   "scripts": {

diff --git a/spec/app/subscription.spec.js b/spec/app/subscription.spec.js
@@ -740,7 +740,7 @@ describe('DELETE /subscriptions/{id}', function() {
       )
       .set('Accept', 'application/json')
     expect(res.statusCode).toBe(302)
-    expect(res.header.location).toBe('http://nowhere')
+    expect(res.header.location).toBe('http://nowhere?channel=email')
     res = await app.models.Subscription.findById(data[3].id)
     expect(res.state).toBe('deleted')
   })
@@ -768,7 +768,7 @@ describe('DELETE /subscriptions/{id}', function() {
       )
       .set('Accept', 'application/json')
     expect(res.statusCode).toBe(302)
-    expect(res.header.location).toBe('http://nowhere?err=Error%3A%20Forbidden')
+    expect(res.header.location).toBe('http://nowhere?channel=email&err=Error%3A%20Forbidden')
   })
 
   it('should display onScreen acknowledgements failureMessage', async function() {
@@ -1023,7 +1023,7 @@ describe('GET /subscriptions/{id}/unsubscribe/undo', function() {
         '/unsubscribe/undo?unsubscriptionCode=50032'
     )
     expect(res.statusCode).toBe(302)
-    expect(res.headers.location).toBe('http://nowhere')
+    expect(res.headers.location).toBe('http://nowhere?channel=email')
     res = await app.models.Subscription.findById(data[0].id)
     expect(res.state).toBe('confirmed')
   })