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

Ensured redirect is using base (#10497)

Browse Source
This commit is contained in:
Keith Holliday
2018-07-09 10:08:19 -05:00
committed by GitHub
parent 8a4c4e10f1
commit 1fcc0d8d3a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,9 +112,10 @@ export default {
} catch (e) {} // eslint-disable-line } catch (e) {} // eslint-disable-line
try { try {
const redirectUrl = `${window.location.protocol}//${window.location.host}`;
let auth = await hello(network).login({ let auth = await hello(network).login({
scope: 'email', scope: 'email',
redirect_uri: '', // eslint-disable-line camelcase redirect_uri: redirectUrl, // eslint-disable-line camelcase
}); });
await this.$store.dispatch('auth:socialAuth', { await this.$store.dispatch('auth:socialAuth', {

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

@@ -433,10 +433,11 @@ export default {
await hello(network).logout(); await hello(network).logout();
} catch (e) {} // eslint-disable-line } catch (e) {} // eslint-disable-line
const redirectUrl = `${window.location.protocol}//${window.location.host}`;
let auth = await hello(network).login({ let auth = await hello(network).login({
scope: 'email', scope: 'email',
// explicitly pass the redirect url or it might redirect to /home // explicitly pass the redirect url or it might redirect to /home
redirect_uri: '', // eslint-disable-line camelcase redirect_uri: redirectUrl, // eslint-disable-line camelcase
}); });
await this.$store.dispatch('auth:socialAuth', { await this.$store.dispatch('auth:socialAuth', {

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

@@ -663,10 +663,11 @@
await hello(network).logout(); await hello(network).logout();
} catch (e) {} // eslint-disable-line } catch (e) {} // eslint-disable-line
const redirectUrl = `${window.location.protocol}//${window.location.host}`;
const auth = await hello(network).login({ const auth = await hello(network).login({
scope: 'email', scope: 'email',
// explicitly pass the redirect url or it might redirect to /home // explicitly pass the redirect url or it might redirect to /home
redirect_uri: '', // eslint-disable-line camelcase redirect_uri: redirectUrl, // eslint-disable-line camelcase
}); });
await this.$store.dispatch('auth:socialAuth', { await this.$store.dispatch('auth:socialAuth', {