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

fix(auth): initialize Hello for social

Browse Source 
fixes #9460
This commit is contained in:
Sabe Jones
2018-02-20 21:15:36 +00:00
parent b0974fc4fc
commit 416c24d1e2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/client/components/settings/site.vue
View File

@@ -111,7 +111,6 @@
div div
ul.list-inline ul.list-inline
li(v-for='network in SOCIAL_AUTH_NETWORKS') li(v-for='network in SOCIAL_AUTH_NETWORKS')
// @TODO this is broken
button.btn.btn-primary(v-if='!user.auth[network.key].id', @click='socialAuth(network.key, user)') {{ $t('registerWithSocial', {network: network.name}) }} button.btn.btn-primary(v-if='!user.auth[network.key].id', @click='socialAuth(network.key, user)') {{ $t('registerWithSocial', {network: network.name}) }}
button.btn.btn-primary(disabled='disabled', v-if='!hasBackupAuthOption(network.key) && user.auth[network.key].id') {{ $t('registeredWithSocial', {network: network.name}) }} button.btn.btn-primary(disabled='disabled', v-if='!hasBackupAuthOption(network.key) && user.auth[network.key].id') {{ $t('registeredWithSocial', {network: network.name}) }}
button.btn.btn-danger(@click='deleteSocialAuth(network.key)', v-if='hasBackupAuthOption(network.key) && user.auth[network.key].id') {{ $t('detachSocial', {network: network.name}) }} button.btn.btn-danger(@click='deleteSocialAuth(network.key)', v-if='hasBackupAuthOption(network.key) && user.auth[network.key].id') {{ $t('detachSocial', {network: network.name}) }}
@@ -239,6 +238,10 @@ export default {
// @TODO: We may need to request the party here // @TODO: We may need to request the party here
this.party = this.$store.state.party; this.party = this.$store.state.party;
this.newDayStart = this.user.preferences.dayStart; this.newDayStart = this.user.preferences.dayStart;
hello.init({
facebook: process.env.FACEBOOK_KEY, // eslint-disable line
google: process.env.GOOGLE_CLIENT_ID, // eslint-disable line
});
}, },
computed: { computed: {
...mapState({ ...mapState({