Merge pull request #209 from silinternational/fix-profile-bugs

Fix profile bugs
silinternational · Jan 22, 2025 · e06db7a · e06db7a
2 parents ffb07c5 + 0741977
commit e06db7a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/src/2sv/Intro.vue b/src/2sv/Intro.vue
@@ -52,11 +52,13 @@ export default {
     ProfileWizard,
   },
   async created() {
-    const thisStep = Steps.forPath(this.$route.path) || {}
-    const keyStep = Steps.next(thisStep)
-    const codesStep = Steps.next(keyStep)
-    if (thisStep.skip && keyStep.skip && codesStep.skip) {
-      this.$router.push('/profile/complete')
+    if (this.Steps) {
+      const thisStep = Steps.forPath(this.$route.path) || {}
+      const keyStep = Steps.next(thisStep)
+      const codesStep = Steps.next(keyStep)
+      if (thisStep.skip && keyStep.skip && codesStep.skip) {
+        this.$router.push('/profile/complete')
+      }
     }
   },
 }

diff --git a/src/2sv/key/Confirmed.vue b/src/2sv/key/Confirmed.vue
@@ -1,5 +1,5 @@
 <template>
-  <ProfileWizard ref="wizard">
+  <ProfileWizard>
     <BasePage>
       <template #header>
         {{ $t('2sv.key.confirmed.header') }}
@@ -22,15 +22,16 @@
 
 <script>
 import ProfileWizard from '@/profile/ProfileWizard.vue'
+import steps from '../../profile/steps'
 
 export default {
   name: 'ConfirmedKey',
   components: {
     ProfileWizard,
   },
   async created() {
-    await this.$nextTick() // best option I could figure out to ensure this.$refs.wizard was available
-    this.$refs.wizard.completed()
+    const step = steps.forPath(this.$route.path)
+    step.state = 'complete'
   },
 }
 </script>
diff --git a/src/2sv/smartphone/CodeVerified.vue b/src/2sv/smartphone/CodeVerified.vue
@@ -1,5 +1,5 @@
 <template>
-  <ProfileWizard ref="wizard">
+  <ProfileWizard>
     <BasePage>
       <template #header>
         {{ $t('2sv.smartphone.codeVerified.header') }}
@@ -22,14 +22,15 @@
 
 <script>
 import ProfileWizard from '@/profile/ProfileWizard.vue'
+import steps from '../../profile/steps'
 
 export default {
   components: {
     ProfileWizard,
   },
   async created() {
-    await this.$nextTick() // best option I could figure out to ensure this.$refs.wizard was available
-    this.$refs.wizard.completed()
+    const step = steps.forPath(this.$route.path)
+    step.state = 'complete'
   },
 }
 </script>
diff --git a/src/2sv/smartphone/Intro.vue b/src/2sv/smartphone/Intro.vue
@@ -52,7 +52,7 @@ const hasBackup = (m) => {
 }
 
 const nextUrl = computed(() => {
-  if (!hasKey(mfa)) {
+  if (!hasKey(mfa) || mfa.numVerified < 3) {
     return '/2sv/usb-security-key/intro'
   }
   if (!hasBackup(mfa)) {

diff --git a/src/main.js b/src/main.js
@@ -26,11 +26,13 @@ async function main() {
   app.config.globalProperties.$user = user
 
   app.config.errorHandler = (err) => {
+    console.error('error: ', err)
     eventBus.emit('error', err)
   }
 
   // catches method and async errors
   window.onunhandledrejection = (event) => {
+    console.error('error: ', event.reason)
     eventBus.emit('error', event.reason)
   }
 

diff --git a/src/password/CompleteReset.vue b/src/password/CompleteReset.vue
@@ -1,5 +1,5 @@
 <template>
-  <ProfileWizard ref="wizard">
+  <ProfileWizard>
     <BasePage>
       <template #header>
         {{ $t('password.reset.complete.header') }}
@@ -20,14 +20,15 @@
 
 <script>
 import ProfileWizard from '@/profile/ProfileWizard.vue'
+import steps from '../profile/steps'
 
 export default {
   components: {
     ProfileWizard,
   },
   async created() {
-    await this.$nextTick() // best option I could figure out to ensure this.$refs.wizard was available
-    this.$refs.wizard.completed()
+    const step = steps.forPath(this.$route.path)
+    step.state = 'complete'
   },
 }
 </script>