Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-auth-with-url' into release

Browse Source
This commit is contained in:
Sabe Jones
2018-08-20 09:12:59 -05:00
parent 29ed33461c 2672cbd790
commit 7bd4e6a5a9
7 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/components/settings/promoCode.vue
+1 -1
View File
@@ -40,7 +40,7 @@ export default {
...mapState({user: 'user.data', credentials: 'credentials'}),
getCodesUrl () {
if (!this.user) return '';
return `/api/v4/coupons?_id=${this.user._id}&apiToken=${this.credentials.API_TOKEN}`;
return '/api/v4/coupons';
},
},
methods: {
website/client/mixins/payments.js
+4 -6
View File
@@ -13,10 +13,10 @@ export default {
...mapState(['credentials']),
// @TODO refactor into one single computed property
paypalCheckoutLink () {
return `/paypal/checkout?_id=${this.credentials.API_ID}&apiToken=${this.credentials.API_TOKEN}`;
return '/paypal/checkout';
},
paypalSubscriptionLink () {
return `/paypal/subscribe?_id=${this.credentials.API_ID}&apiToken=${this.credentials.API_TOKEN}&sub=${this.subscriptionPlan}`;
return `/paypal/subscribe?sub=${this.subscriptionPlan}`;
},
paypalPurchaseLink () {
if (!this.subscription) {
@@ -26,7 +26,7 @@ export default {
}
let couponString = '';
if (this.subscription.coupon) couponString = `&coupon=${this.subscription.coupon}`;
return `/paypal/subscribe?_id=${this.credentials.API_ID}&apiToken=${this.credentials.API_TOKEN}&sub=${this.subscription.key}${couponString}`;
return `/paypal/subscribe?sub=${this.subscription.key}${couponString}`;
},
},
methods: {
@@ -39,7 +39,7 @@ export default {
if (!this.checkGemAmount(data)) return;
let gift = this.encodeGift(data.giftedTo, data.gift);
const url = `/paypal/checkout?_id=${this.credentials.API_ID}&apiToken=${this.credentials.API_TOKEN}&gift=${gift}`;
const url = `/paypal/checkout?gift=${gift}`;
window.open(url, '_blank');
},
@@ -210,8 +210,6 @@ export default {
}
let queryParams = {
_id: this.user._id,
apiToken: this.credentials.API_TOKEN,
noRedirect: true,
};