bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refresh user token on pageload

Browse source
This commit is contained in:
Alex Gleason 2020-04-29 19:38:24 -05:00
parent bc3bb47829
commit f6212cf81b
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/gabsocial/actions/auth.js
View file

@ -75,6 +75,27 @@ function createUserToken(username, password) {
grant_type: 'password',
username: username,
password: password,
}).then(response => {
dispatch(authLoggedIn(response.data));
});
};
}
export function refreshUserToken() {
return (dispatch, getState) => {
const refreshToken = getState().getIn(['auth', 'user', 'refresh_token']);
const app = getState().getIn(['auth', 'app']);
if (!refreshToken) return dispatch(noOp());
return api(getState, 'app').post('/oauth/token', {
client_id: app.get('client_id'),
client_secret: app.get('client_secret'),
refresh_token: refreshToken,
redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
grant_type: 'refresh_token',
}).then(response => {
dispatch(authLoggedIn(response.data));
});
};
}
@ -83,8 +104,6 @@ export function logIn(username, password) {
return (dispatch, getState) => {
return dispatch(initAuthApp()).then(() => {
return dispatch(createUserToken(username, password));
}).then(response => {
return dispatch(authLoggedIn(response.data));
}).catch(error => {
dispatch(showAlert('Login failed.', 'Invalid username or password.'));
throw error;

10
app/gabsocial/actions/me.js
View file

@ -1,5 +1,6 @@
import api from '../api';
import { importFetchedAccount } from './importer';
import { refreshUserToken } from './auth';
export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
export const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS';
@ -18,10 +19,11 @@ export function fetchMe() {
dispatch({ type: ME_FETCH_SKIP }); return;
};
dispatch(fetchMeRequest());
api(getState).get('/api/v1/accounts/verify_credentials').then(response => {
dispatch(fetchMeSuccess(response.data));
dispatch(refreshUserToken()).then(() => {
dispatch(fetchMeRequest());
return api(getState).get('/api/v1/accounts/verify_credentials').then(response => {
dispatch(fetchMeSuccess(response.data));
});
}).catch(error => {
dispatch(fetchMeFail(error));
});