set email enabled on SetEmailPasswordForm if no email

Author: Resul Avan

functions/src/warmUpScheduledFunction.ts

@@ -4,7 +4,7 @@ import { HandlerConfig } from 'handlers-module'
 import { ApiConfig } from 'types-module'
 
 export const warmUpScheduledFunction = pubsub
-  .schedule('0 * * * *')
+  .schedule('0 */15 * * *')
   .onRun((context) => {
     syncRequest('GET', HandlerConfig.getWebsiteUrl())
     syncRequest('GET', `${HandlerConfig.getWebsiteUrl()}${ApiConfig.healthy}`)

src/components/form/SetEmailPasswordForm.vue

@@ -1,22 +1,33 @@
 <template>
   <div>
     <h3 class="title has-text-centered has-text-dark">
-      {{ title }}
+      {{ $t('provider.linkPasswordProvider.passwordForm.title') }}
     </h3>
+    <p class="has-text-centered has-margin-bottom-15">
+      {{ email ?
+      $t('provider.linkPasswordProvider.passwordForm.description',{email}) :
+      $t('provider.linkPasswordProvider.passwordForm.descriptionNoEmail') }}
+    </p>
     <div class="box">
-      <template v-if="description">
-        <p>{{ description }}</p>
-        <br>
-      </template>
+
       <ValidationObserver v-slot="{ passes }" tag="form">
+        <FieldWithValue
+          v-if="!!email"
+          :value="email"
+          :label="$t('common.field.email')"
+          :disabled="true"
+          label-position="on-border"
+          class="has-margin-bottom-15"
+        />
+
         <InputWithValidation
+          v-else
           v-model="credentials.email"
           :label="$t('common.field.email')"
           :placeholder="$t('common.field.emailPlaceholder')"
           input-type="email"
           rules="required|email"
           vid="email"
-          :disabled="!!credentials.email"
           label-position="on-border"
           class="has-margin-5"
         />
@@ -44,8 +55,8 @@
         />
 
         <div class="buttons">
-          <b-button type="is-primary" icon-left="lock-reset" icon-pack="mdi" @click="passes(submit)">
-            {{ buttonText }}
+          <b-button type="is-primary" icon-left="cog-outline" @click="passes(submit)">
+            {{ $t('provider.linkPasswordProvider.passwordForm.submit') }}
           </b-button>
         </div>
       </ValidationObserver>
@@ -58,19 +69,18 @@ import { Component, Prop, Vue } from 'nuxt-property-decorator'
 import { ValidationObserver } from 'vee-validate'
 import InputWithValidation from '~/components/ui/input/InputWithValidation.vue'
 import { LoginCredentials } from '~/types'
+import FieldWithValue from '~/components/ui/FieldWithValue.vue'
 
 @Component({
   components: {
+    FieldWithValue,
     ValidationObserver,
     InputWithValidation
   }
 })
 export default class SetPasswordForm extends Vue {
-  @Prop({ type: Function, required: true }) confirmCredentials: (credentials: LoginCredentials) => void;
-  @Prop({ type: String, required: true }) title: string;
-  @Prop({ type: String, required: true }) buttonText: string;
-  @Prop({ type: String, required: false }) description: string;
-  @Prop({ type: String, required: false }) email: string;
+  @Prop({ type: Function, required: true }) confirmCredentials: (credentials: LoginCredentials) => void
+  @Prop({ type: String, required: false }) email: string
 
   credentials: LoginCredentials = {
     email: this.email,

src/components/modal/SetEmailPasswordModal.vue

@@ -29,10 +29,8 @@
 
       <SetEmailPasswordForm
         v-if="!showLogin"
-        :title="$t('provider.linkPasswordProvider.passwordForm.title')"
-        :description="$t('provider.linkPasswordProvider.passwordForm.description',{email: authUser.email})"
-        :button-text="$t('provider.linkPasswordProvider.passwordForm.submit')"
         :confirm-credentials="handleConfirmCredentials"
+        :email="authUser.email"
       />
     </section>
   </div>
@@ -52,20 +50,16 @@ import { reauthenticateObservable } from '~/service/rx-service'
   components: { TopMessage, LoginForm, SetEmailPasswordForm, SocialLogin }
 })
 export default class SetPasswordModal extends Vue {
-  @Prop({ type: Object, required: true }) authUser: AuthUser
-  @Prop({ type: Array, required: true }) linkedProviders: ProviderConfig[]
-  @Prop({ type: Function, required: true }) confirmCredentials: (
-    credentials: LoginCredentials
-  ) => void
+  @Prop({ type: Object, required: true }) readonly authUser: AuthUser
+  @Prop({ type: Array, required: true }) readonly linkedProviders: ProviderConfig[]
+  @Prop({ type: Function, required: true }) readonly confirmCredentials: (credentials: LoginCredentials) => void
 
   showLogin = true
 
   @StateNamespace.notification.Getter notificationMessage: NotificationMessage
   @StateNamespace.notification.Action clearNotificationMessage: () => void
   @StateNamespace.auth.Getter rememberMe: boolean
-  @StateNamespace.auth.Action reauthenticateWithCredential: (
-    credentials: LoginCredentials
-  ) => void
+  @StateNamespace.auth.Action reauthenticateWithCredential: (credentials: LoginCredentials) => void
 
   created () {
     this.$subscribeTo(reauthenticateObservable.asObservable(), () => {

src/components/profile/module/LinkedAccounts.vue

@@ -58,7 +58,7 @@ export default class LinkedAccounts extends BaseModule {
   }
 
   getProviderLabel (providerType: ProviderType) {
-    return this.$t('provider.label.' + providerType)
+    return this.$t(`provider.label.${providerType}`)
   }
 
   getLinkMethod (providerType: ProviderType) {

src/i18n/en.ts

@@ -223,8 +223,9 @@ const messages = {
         title: 'Social Login'
       },
       passwordForm: {
-        title: 'Set Password',
-        description: 'Set a  password for {email}',
+        title: 'set email/password',
+        description: 'set a password for {email}',
+        descriptionNoEmail: 'set email and password to your account',
         submit: 'Save Password'
       }
     },

src/i18n/tr.ts

@@ -222,9 +222,10 @@ const messages = {
         title: 'Sosyal Medya Giris'
       },
       passwordForm: {
-        title: 'Parola Belirleme',
+        title: 'e-posta/parola belirle',
         description: '{email} icin bir parola belirleyiniz',
-        submit: 'Parolayi Kaydet'
+        descriptionNoEmail: 'hesabininiz icin e-posta ve parola belirleyiniz',
+        submit: 'parolayi kaydet'
       }
     },
     submit: {

src/plugins/firebase-auth-listener.ts

@@ -14,7 +14,12 @@ import {
 } from '~/types'
 import { authenticatedAllowed, authenticatedNotAllowed } from '~/service/global-service'
 import { getAuthUser } from '~/service/firebase/firebase-service'
-import { configureAxiosObservable, configureFcmObservable, loadNotificationObservable } from '~/service/rx-service'
+import {
+  configureAxiosObservable,
+  configureFcmObservable,
+  loadNotificationObservable,
+  reloadUserFromDatabase
+} from '~/service/rx-service'
 
 const logout = (store: Store<any>) => {
   store.dispatch(StoreConfig.auth.logout, true).then(() => {
@@ -113,6 +118,9 @@ const firebaseAuthListenerPlugin: Plugin = ({ store, app, route, redirect }) =>
       return
     }
     updateAuthStore(firebaseUser, store)
+      .then(() => {
+        reloadUserFromDatabase.next()
+      })
 
     firebaseUser.getIdToken()
       .then((token: string) => {