Merge pull request #155 from s0lvang/hotfix/displayname

Pop a prompt asking for display name if not set
s0lvang · Mar 19, 2020 · 14ab5f0 · 14ab5f0
2 parents f9a8963 + c08c289
commit 14ab5f0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/components/LoginArea.vue b/src/components/LoginArea.vue
@@ -80,7 +80,18 @@ export default {
           let email = window.localStorage.getItem("emailForSignIn");
           if (!email) {
             // If the user opens the link on another device
-            email = window.prompt("Skriv inn epostadressen din");
+            email = this.$dialog.prompt(
+              {
+                title: "Epostadresse",
+                body: "Skriv inn epostadressen din",
+                promptHelp: `Skriv din epostadresse i boksen under og trykk "[+:okText]"`
+              },
+              {
+                okText: "Fortsett",
+                cancelText: "Lukk",
+                customClass: "phone-prompt"
+              }
+            ).then(dialog => dialog.data);
           }
           await fb
             .signInWithEmailLink(email, url)

diff --git a/src/helpers/auth.js b/src/helpers/auth.js
@@ -1,8 +1,29 @@
 import firebase from "firebase";
 import fb from "@/firebaseConfig.js";
 
-export const handleSignedIn = (context, user) => {
-  fb.additionalUserInfoCollection
+export const handleSignedIn = async(context, user) => {
+  if (!user.displayName) {
+    await context.$dialog
+      .prompt(
+        {
+          title: "Navn",
+          body: "Skriv inn navnet ditt",
+          promptHelp: `Skriv ditt navn i boksen under og trykk "[+:okText]"`
+        },
+        {
+          okText: "Fortsett",
+          cancelText: "Lukk",
+          customClass: "phone-prompt"
+        }
+      )
+      .then(dialog => {
+        if (!dialog.data) {
+          throw new Error("Venligst skriv inn et navn");
+        }
+        user.updateProfile({ displayName: user.data });
+      });
+  }
+  await fb.additionalUserInfoCollection
     .doc(user.uid)
     .get()
     .then(userInfo => {