Procházet zdrojové kódy

fix: ao logar novamente (prestador nao validado) retorna para tela de aprovacao

Gustavo Mantovani před 1 týdnem
rodič
revize
e7d54b82d7
3 změnil soubory, kde provedl 15 přidání a 8 odebrání
  1. 1 1
      src/composables/useAuth.js
  2. 13 6
      src/pages/LoginPage.vue
  3. 1 1
      src/router/index.js

+ 1 - 1
src/composables/useAuth.js

@@ -31,7 +31,7 @@ export const useAuth = () => {
 
     if (
       String(store.user?.type).toUpperCase() === "PROVIDER" &&
-      store.user?.provider?.approval_status !== "accepted"
+      store.user?.provider?.approval_status === "pending"
     ) {
       permissionStore().resetScopes();
 

+ 13 - 6
src/pages/LoginPage.vue

@@ -171,6 +171,12 @@ const phone = ref("");
 const registrationCompleted = ref(false);
 const showSubStep = ref(false);
 
+const isPendingProvider = computed(
+  () =>
+    String(user.user?.type).toUpperCase() === "PROVIDER" &&
+    user.user?.provider?.approval_status === "pending",
+);
+
 const createInitialStepFiveForm = () => ({
   daily_price_2h: null,
   daily_price_4h: null,
@@ -568,6 +574,12 @@ const validateCodeInput = async () => {
     if (isLogin.value === true) {
       await setAuthDataFromPayload(response.data.payload);
 
+      if (isPendingProvider.value) {
+        registrationCompleted.value = true;
+
+        return;
+      }
+
       router.push({ name: "DashboardPage" });
 
       return;
@@ -612,12 +624,7 @@ const validateCurrentStep = async () => {
 };
 
 onMounted(() => {
-  const isPendingProvider =
-    user.accessToken &&
-    String(user.user?.type).toUpperCase() === "PROVIDER" &&
-    user.user?.provider?.approval_status !== "accepted";
-
-  if (isPendingProvider) {
+  if (user.accessToken && isPendingProvider.value) {
     registrationCompleted.value = true;
     clicked.value = true;
 

+ 1 - 1
src/router/index.js

@@ -57,7 +57,7 @@ export default route(function (/* { store, ssrContext } */) {
 
     const isPendingProvider =
       String(user.user?.type).toUpperCase() === "PROVIDER" &&
-      user.user?.provider?.approval_status !== "accepted";
+      user.user?.provider?.approval_status === "pending";
 
     if (user.accessToken && isPendingProvider) {
       if (to.name !== "LoginPage") {