feat: allow unverified users (configurable)

Adds an env variable VITE_ALLOW_UNVERIFIED_USERS. If true, unverified users may access projects and contribute.
mapswipe · Apr 25, 2024 · 89e8757 · 89e8757
1 parent 7426b27
commit 89e8757
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,7 @@ VITE_PRIVACY_POLICY_URL='https://mapswipe.org/{locale}/privacy/'
 VITE_IMPRINT_URL=
 VITE_APP_LOGO='./img/mapswipe-white.svg'
 VITE_PROJECTS_FALLBACK_IMAGE="./img/map-pin-600x400.jpg"
+VITE_ALLOW_UNVERIFIED_USERS=true
 
 # Locales
 VITE_DEFAULT_LOCALE=en

diff --git a/src/components/AppBanner.vue b/src/components/AppBanner.vue
@@ -16,12 +16,16 @@ export default defineComponent({
     isVerified() {
       return this.currentUserStore.currentUser?.emailVerified
     },
+    allowUnverifiedUsers() {
+      const allow = import.meta.env.VITE_ALLOW_UNVERIFIED_USERS
+      return allow
+    },
   },
 })
 </script>
 
 <template>
-  <v-banner v-if="user && !isVerified" bg-color="accent" density="compact">
+  <v-banner v-if="user && !isVerified && !allowUnverifiedUsers" bg-color="accent" density="compact">
     <v-banner-text>
       <h4>{{ $t('appBanner.title') }}</h4>
       <p>{{ $t('appBanner.message') }}</p>

diff --git a/src/components/SignIn.vue b/src/components/SignIn.vue
@@ -35,6 +35,10 @@ export default defineComponent({
     currentLocale() {
       return this.$i18n.locale
     },
+    allowUnverifiedUsers() {
+      const allow = import.meta.env.VITE_ALLOW_UNVERIFIED_USERS
+      return allow
+    },
   },
   methods: {
     i18nRoute,
@@ -45,7 +49,7 @@ export default defineComponent({
         signInWithEmailAndPassword(auth, this.email, this.password)
           .then((userCredential) => {
             const user = userCredential.user
-            if (user.emailVerified) {
+            if (user.emailVerified || this.allowUnverifiedUsers) {
               routerPush(i18nRoute({ name: 'projects' }))
             } else {
               routerPush(

diff --git a/src/components/SignUp.vue b/src/components/SignUp.vue
@@ -56,12 +56,17 @@ export default defineComponent({
       const locale = this.$i18n.locale
       return url.replace('{locale}', locale)
     },
+    allowUnverifiedUsers() {
+      const allow = import.meta.env.VITE_ALLOW_UNVERIFIED_USERS
+      return allow
+    },
   },
   methods: {
     signup() {
       if (this.isFormValid && this.consent) {
         const auth = getAuth()
         const db = getDatabase()
+        const routerPush = this.$router.push
 
         createUserWithEmailAndPassword(auth, this.email, this.password)
           .then((userCredential) => {
@@ -89,9 +94,16 @@ export default defineComponent({
           })
           .then(() => {
             logAnalyticsEvent('account_created')
-            this.$router.push(
-              i18nRoute({ name: 'authentication', params: { authTab: 'recover-account' } }),
-            )
+            if (this.allowUnverifiedUsers) {
+              routerPush(i18nRoute({ name: 'projects' }))
+            } else {
+              routerPush(
+                i18nRoute({
+                  name: 'authentication',
+                  params: { authTab: 'recover-account' },
+                }),
+              )
+            }
             this.showSnackbar(this.$t('authView.followInstructionOnYourEmail'), 'info')
           })
           .catch((error) => {

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -4,10 +4,11 @@ import { getCurrentUser } from 'vuefire'
 import { default as Tr, i18nRoute } from '@/i18n/translation'
 
 const appName = import.meta.env.VITE_APP_NAME
+const allowUnverifiedUsers = import.meta.env.VITE_ALLOW_UNVERIFIED_USERS
 
 const denyUnauthorized = async (to, from, next) => {
   const currentUser = await getCurrentUser()
-  if (currentUser?.emailVerified) {
+  if (currentUser?.emailVerified || (currentUser && allowUnverifiedUsers)) {
     next()
   } else if (currentUser) {
     next(i18nRoute({ name: 'home', params: { authTab: 'recover-account' } }))