update invite route for subscription invite issue

Author: Zalasanjay

service/src/services/invite/invite.class.js

@@ -106,7 +106,7 @@ class Service {
         axios.put(baseUrl+'/user/updateuserdetails/' + userId, { package: previous_packages }, { headers: { 'Authorization': params.headers.authorization } })
           .then(async ((result) => {
             if (result.data.code == 201) {
-              let subscription_invite = await (self.subscription_invitation(data , res ));
+              let subscription_invite = await (self.subscription_invitation(data, res, params ));
               self.sendEmail(data, res, params.headers.authorization);
             }
             resolve(result.data); 
@@ -126,21 +126,18 @@ class Service {
         resolve(errorObj);
       });
     });
-
-    
   }
 
-  subscription_invitation(data, res) {
+  subscription_invitation(data, res, params) {
     let self = this;
-    this.app.service('subscription-invitation').find({query : { 'toEmail': data.toEmail, 'subscriptionId': data.subscriptionId, 'isDeleted': false }})
+    this.app.service('subscription-invitation').find({query : { 'toEmail': data.toEmail, 'subscriptionId': data.subscriptionId, 'isDeleted': false }, headers: { 'Authorization': params.headers.authorization }})
       .then(function (response) {
         if (response.data.length == 0) {
           self.app.service('subscription-invitation').create(data).then(function (response){
           }).catch(function(err){
             return err;
           });
         } else {
-          // console.log(response.data);
           response.data[0].isDeleted = true;
           self.app.service('subscription-invitation').patch(response.data[0].id, response.data[0] , '').then(function (response2) {
             // console.log('response2-----' ,response2);
@@ -151,17 +148,12 @@ class Service {
           }).catch(function (err) {
             return err;
           });
-        
         }
       }).catch(function (err) {
         return err;
       });
-    // this.app.service("subscription-invitation").create(data).then(function (response){
-    // }).catch(function(err){
-    //   return err
-    // })
   }
-
+	
   sendEmail(data, res, authToken) {
     let SendEmailBody = SendEmailBodyInvite.replace(/WriteSenderNameHere/i, data.fromEmail);
     SendEmailBody = SendEmailBody.replace(/DOMAIN/g, 'https://www.dashboard.' + domainKey);

service/src/services/subscription-invitation/subscription-invitation.hooks.js

@@ -1,7 +1,7 @@
 let axios = require('axios');
 let errors = require('@feathersjs/errors');
 const async = require('asyncawait/async');
-const await = require('asyncawait/await'); 
+// const await = require('asyncawait/await'); 
 
 module.exports = {
   before: {
@@ -50,13 +50,10 @@ function before_create(hook) {
 }
 
 let before_find = async((hook) => {
-  let res = await (validateUser(hook));
-  if (res.code == 401) {
-    throw new errors.NotAuthenticated('Invalid token');
-  } else {
+  return validateUser(hook).then(result => {
     if(hook.params.query.own == 'false') {
       delete hook.params.query.own;
-      hook.params.query.toEmail = res.data.data.email;
+      hook.params.query.toEmail = result.data.data.email;
     } 
     if (!hook.params.query.isDeleted) {
       hook.params.query.isDeleted = false;
@@ -68,22 +65,22 @@ let before_find = async((hook) => {
         hook.params.query.isDeleted = false;
       }
     }
-  }
+    return hook;
+  }).catch(error=> { // eslint-disable-line no-unused-vars
+    throw new errors.NotAuthenticated('Invalid token');
+  });
 });
 
 let validateUser = (data) => { // eslint-disable-line no-unused-vars
-  return new Promise((resolve, reject) => { // eslint-disable-line no-unused-vars
-    axios.get('http://api.' + process.env.domainKey +'/auth/api/userdetails', {
-      strictSSL: false,
-      headers: {
-        'Authorization': apiHeaders.authorization // eslint-disable-line no-undef
-      }
-    }).then(function (response) {
-      // console.log(response)
-      resolve(response);
-    }).catch(function (error) { // eslint-disable-line no-unused-vars
-      resolve({ 'code': 401 });
-    });
+  return axios.get('http://api.' + process.env.domainKey +'/auth/api/userdetails', {
+    strictSSL: false,
+    headers: {
+      'Authorization': apiHeaders.authorization // eslint-disable-line no-undef
+    }
+  }).then(function (response) {
+    return response;
+  }).catch(function (error) { // eslint-disable-line no-unused-vars
+    throw(error);
   });
 };