krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Logged users out if they were logged in with facebook (#10322)

Browse Source
This commit is contained in:
Keith Holliday
2018-05-03 13:00:50 -05:00
committed by GitHub
parent c1ed02d383
commit 5e6541faa6
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/components/auth/authForm.vue
View File

@@ -105,7 +105,12 @@ export default {
}); });
}, },
methods: { methods: {
// @TODO: Abstract hello in to action or lib
async socialAuth (network) { async socialAuth (network) {
try {
await hello(network).logout();
} catch (e) {} // eslint-disable-line
try { try {
let auth = await hello(network).login({ let auth = await hello(network).login({
scope: 'email', scope: 'email',

5
website/client/components/auth/registerLoginReset.vue
View File

@@ -427,7 +427,12 @@ export default {
// ALSO it's the only way to make sure language data is reloaded and correct for the logged in user // ALSO it's the only way to make sure language data is reloaded and correct for the logged in user
window.location.href = redirectTo; window.location.href = redirectTo;
}, },
// @TODO: Abstract hello in to action or lib
async socialAuth (network) { async socialAuth (network) {
try {
await hello(network).logout();
} catch (e) {} // eslint-disable-line
const url = window.location.href; const url = window.location.href;
let auth = await hello(network).login({ let auth = await hello(network).login({

6
website/client/components/static/home.vue
View File

@@ -652,7 +652,13 @@
}); });
this.$router.push('/register'); this.$router.push('/register');
}, },
// @TODO: Abstract hello in to action or lib
async socialAuth (network) { async socialAuth (network) {
try {
await hello(network).logout();
} catch (e) {} // eslint-disable-line
const url = window.location.href; const url = window.location.href;
let auth = await hello(network).login({ let auth = await hello(network).login({