post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Refactor /api/web APIs to use the centralized axios instance (#6223)

Browse source 
Also adds the ability to decouple the centralized axios logic from the
state dispatcher
This commit is contained in:
nightpool 2018-01-08 14:01:33 -05:00 • committed by Eugen Rochko
parent ff6ca8bdc6
commit c235711ffe
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/javascript/mastodon/actions/push_notifications/registerer.js
View file

@ -1,4 +1,4 @@
import axios from 'axios';
import api from '../../api';
import { pushNotificationsSetting } from '../../settings';
import { setBrowserSupport, setSubscription, clearSubscription } from './setter';
@ -35,7 +35,7 @@ const subscribe = (registration) =>
const unsubscribe = ({ registration, subscription }) =>
subscription ? subscription.unsubscribe().then(() => registration) : registration;
const sendSubscriptionToBackend = (subscription, me) => {
const sendSubscriptionToBackend = (getState, subscription, me) => {
const params = { subscription };
if (me) {
@ -45,7 +45,7 @@ const sendSubscriptionToBackend = (subscription, me) => {
}
}
return axios.post('/api/web/push_subscriptions', params).then(response => response.data);
return api(getState).post('/api/web/push_subscriptions', params).then(response => response.data);
};
// Last one checks for payload support: https://web-push-book.gauntface.com/chapter-06/01-non-standards-browsers/#no-payload
@ -85,13 +85,13 @@ export function register () {
} else {
// Something went wrong, try to subscribe again
return unsubscribe({ registration, subscription }).then(subscribe).then(
subscription => sendSubscriptionToBackend(subscription, me));
subscription => sendSubscriptionToBackend(getState, subscription, me));
}
}
// No subscription, try to subscribe
return subscribe(registration).then(
subscription => sendSubscriptionToBackend(subscription, me));
subscription => sendSubscriptionToBackend(getState, subscription, me));
})
.then(subscription => {
// If we got a PushSubscription (and not a subscription object from the backend)
@ -137,7 +137,7 @@ export function saveSettings() {
const alerts = state.get('alerts');
const data = { alerts };
axios.put(`/api/web/push_subscriptions/${subscription.get('id')}`, {
api(getState).put(`/api/web/push_subscriptions/${subscription.get('id')}`, {
data,
}).then(() => {
const me = getState().getIn(['meta', 'me']);