caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed account name problem

Browse Source
This commit is contained in:
benweet 2017-11-17 21:35:57 +00:00
parent dd336fab3f
commit 9a220790ef
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/providers/helpers/googleHelper.js
View File

@ -168,17 +168,21 @@ export default {
})) }))
// Call the user info endpoint // Call the user info endpoint
.then(token => this.getUser(token.sub) .then(token => this.getUser(token.sub)
.catch(() => { .catch((err) => {
store.dispatch('notification/info', 'Please activate Google Plus to change your account name!'); if (err.status === 404) {
store.dispatch('notification/info', 'Please activate Google Plus to change your account name!');
} else {
throw err;
}
}) })
.then((user = {}) => { .then((user = {}) => {
// Add name to token
token.name = user.displayName || 'Unknown';
const existingToken = store.getters['data/googleTokens'][token.sub]; const existingToken = store.getters['data/googleTokens'][token.sub];
// Add name to token
token.name = user.displayName || (existingToken && existingToken.name) || 'Unknown';
if (existingToken) { if (existingToken) {
// We probably retrieved a new token with restricted scopes. // We probably retrieved a new token with restricted scopes.
// That's no problem, token will be refreshed later with merged scopes. // That's no problem, token will be refreshed later with merged scopes.
// Save flags // Restore flags
token.isLogin = existingToken.isLogin || token.isLogin; token.isLogin = existingToken.isLogin || token.isLogin;
token.isSponsor = existingToken.isSponsor; token.isSponsor = existingToken.isSponsor;
token.isDrive = existingToken.isDrive || token.isDrive; token.isDrive = existingToken.isDrive || token.isDrive;