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

Prerequisites to removing Facebook authentication (#13683)

Browse Source 
* Don't sign in user when trying to connect a social account that was already created

* Log social users into matching local auth accounts

If the social account has an email that already exists as a local user, instead of creating a new account log them into their account and add the social auth to the account

* If possible set local authentication email for social users

* Allow password reset emails to be sent to social login users

* lint fixes

* Fix issues and tests

* fix tests

* Fix lint error.
This commit is contained in:
Phillip Thelen
2022-01-21 22:15:58 +01:00
committed by GitHub
parent d11810677c
commit 1177ad8b8c
12 changed files with 288 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
website/client/src/components/snackbars/notification.vue
View File

@@ -1,10 +1,17 @@
<template>
<div class="notification-animation-holder">
<div class="notification-holder"
@click="handleOnClick()">
<div v-if="notification.type === 'drop'"
class="icon-item">
<div :class="notification.icon" class="icon-negative-margin"></div>
<div
class="notification-holder"
@click="handleOnClick()"
>
<div
v-if="notification.type === 'drop'"
class="icon-item"
>
<div
:class="notification.icon"
class="icon-negative-margin"
></div>
</div>
<div
@@ -32,7 +39,10 @@
class="svg-icon"
v-html="icons.gold"
></div>
<div class="icon-text" v-html="notification.text"></div>
<div
class="icon-text"
v-html="notification.text"
></div>
</div>
</div>
<div
@@ -63,7 +73,10 @@
class="svg-icon"
v-html="icons.mana"
></div>
<div class="icon-text" v-html="notification.text"></div>
<div
class="icon-text"
v-html="notification.text"
></div>
</div>
</div>
<div
@@ -78,7 +91,10 @@
class="svg-icon"
v-html="icons.sword"
></div>
<div class="icon-text" v-html="notification.text"></div>
<div
class="icon-text"
v-html="notification.text"
></div>
</div>
</div>
<div
@@ -98,7 +114,6 @@
</div>
</div>
</div>
</div>
</div>
</template>