bugfix options ; await for interceptor

ansibleguy76 · Jan 8, 2025 · 1b5a36b · 1b5a36b
1 parent 298d8c1
commit 1b5a36b
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 105 deletions.
diff --git a/client/src/lib/TokenStorage.js b/client/src/lib/TokenStorage.js
@@ -31,7 +31,7 @@ var TokenStorage = {
       // console.log(JSON.parse(jsonPayload))
       return JSON.parse(jsonPayload)
     }catch(err){
-      console.log("Error in getPayload: " + err)
+      // console.log("Error in getPayload: " + err)
       return {}
     }
   },

diff --git a/client/src/main.js b/client/src/main.js
@@ -28,66 +28,62 @@ import "./../public/assets/main.scss"
 axios.interceptors.response.use( (response) => {
   // Return a successful response back to the calling service
   return response;
-}, (error) => {
+}, async (error) => {
   // Return any error which is not due to authentication back to the calling service
   if (error.response?.status !== 401) {
-    return new Promise((resolve, reject) => {
-      reject(error);
-    });
+    throw error;
   }else{
-    // Logout user if token refresh didn't work or user is disabled
-    if (error.config.url == `${process.env.BASE_URL}api/v1/token` || error.response.message == 'Account is disabled.') {
-      // temp vue to have toast
+    console.log("Unauthorized detected")
+    console.log("Error : " + error)
+
+    var originConfig = error?.config || {};
+    const originUrl = error?.config?.url || "";
+    const originResponseMessage = error?.response?.message || "";
+    const originResponseErrorMessage = error?.response?.data?.error || "";
+
+    try{
+      if(!originConfig || !originUrl){
+        throw new Error("Unauthorized detected, redirecting to login (no origin config or url)")
+      }
+
+      console.log("Origin url : " + originUrl)
+      console.log("Origin response message : " + originResponseMessage)
+      console.log("Origin response error message : " + originResponseErrorMessage)
+
+      // Logout user if token refresh didn't work or user is disabled or there was no access to the resource, not token related
+      if (originUrl == `/api/v1/token` || originResponseMessage == 'Account is disabled.' || originResponseMessage.includes('No Access')) {
+
+        // clear our tokens from browser and push to login
+        TokenStorage.clear();
+        router.push({ name: 'Login', query: {from: this?.$route?.fullPath || ""} }).catch(err => {});        
+        throw new Error("Unauthorized detected, redirecting to login (no access)")
+      }
+
+      // Try request again with new token
+      console.log("Trying to refresh tokens")
+      const newToken = await TokenStorage.getNewToken();
+
+      console.log("Retrying previous call with new tokens")
+      // New request with new token
+      originConfig.headers['Authorization'] = `Bearer ${newToken}`;
+      const retryResponse = await axios.request(originConfig);
+      if(retryResponse.error){
+        throw retryResponse.error;
+      }else{
+        return retryResponse;
+      }
+
+    }catch(e){
+
       const vm = new Vue({})
       var message = "Unauthorized.  Access denied."
-      if(error.response.data && error.response.data.message){
-        message += "\r\n" + error.response.data.message
+      if(originResponseMessage){
+        message = [message,originResponseMessage,originResponseErrorMessage,e.message].join("\r\n")
       }
       vm.$toast.warning(message)
-      // clear our tokens from browser and push to login
-      TokenStorage.clear();
-      router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {});
-
-      return new Promise((resolve, reject) => {
-        reject(message);
-      });
-    }
 
-    // Try request again with new token
-    //console.log("Trying to refresh tokens")
-    try{
-      return TokenStorage.getNewToken()
-        .then((token) => {
-          // console.log("Refresh done")
-            //console.log("Retrying previous call with new tokens")
-            // New request with new token
-            const config = error.config;
-            config.headers['Authorization'] = `Bearer ${token}`;
+      throw e
 
-            return new Promise((resolve, reject) => {
-              axios.request(config).then(response => {
-                if(response.error){
-                  Promise.reject(error);
-                  reject(error);
-                  router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {});
-                }else{
-                  resolve(response);
-                }
-              }).catch((error) => {
-                Promise.reject(error);
-                reject(error);
-                router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {});
-              })
-            });
-        })
-        .catch((from) => {
-          // token refresh error -> let's login, unless we are already there
-          if(!from.includes("/login")){
-            router.push({ name: 'Login', query:{from:from}}).catch(err => {});
-          }
-        });
-    }catch(err){
-      console.log(err)
     }
   }
 });

diff --git a/client/src/views/Awx.vue b/client/src/views/Awx.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="id-card" /> Awx</h1>
       <div class="columns">
@@ -48,7 +48,8 @@
     name: "AfAwx",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaCheckbox,BulmaTextArea,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/AzureAd.vue b/client/src/views/AzureAd.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="address-card" /> MS Entra ID</h1>
       <div class="columns">
@@ -58,7 +58,8 @@
     name: "AfAzureAd",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaCheckbox,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Credentials.vue b/client/src/views/Credentials.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <BulmaModal v-if="showDelete && credential.name" title="Delete" action="Delete" @click="deleteCredential();showDelete=false" @close="showDelete=false" @cancel="showDelete=false">Are you sure you want to delete Credential '{{ credential.name}}'</BulmaModal>
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="lock" /> Credentials</h1>
@@ -70,7 +70,8 @@
     name:"AfCredentials",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaModal,BulmaAdminTable,BulmaCheckbox,BulmaSelect,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Designer.vue b/client/src/views/Designer.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin && loaded" class="section">
+  <section v-if="(profile?.options?.showDesigner ?? isAdmin) && loaded" class="section">
     <BulmaQuickView class="quickview" v-if="warnings && showWarnings" title="Form warnings" footer="" @close="showWarnings=false">
         <p v-for="w,i in warnings" :key="'warning'+i" class="mb-3" v-html="w"></p>
     </BulmaQuickView>
@@ -297,7 +297,8 @@
     name: "Designer",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{VueCodeEditor,BulmaModal,BulmaQuickView,BulmaAdvancedSelect,BulmaCheckRadio},
     data(){
@@ -652,7 +653,11 @@
       },
       save(close=false) {
        var ref= this;
-       this.$refs.saveButton.focus()
+       try{
+        this.$refs.saveButton.focus()
+       }catch{ 
+        // do nothing
+       }
        this.$nextTick(()=>{
          if(ref.warnings.length==0 && ref.formConfig && ref.formDirty){
            axios.post(`${process.env.BASE_URL}api/v1/config/`,{forms:ref.formConfig},TokenStorage.getAuthentication())

diff --git a/client/src/views/Groups.vue b/client/src/views/Groups.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <BulmaModal v-if="showDelete && group.name" title="Delete" action="Delete" @click="deleteGroup();showDelete=false" @close="showDelete=false" @cancel="showDelete=false">Are you sure you want to delete Group '{{ group.name}}'</BulmaModal>
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="users" /> Groups</h1>
@@ -75,7 +75,8 @@
     name:"Groups",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaModal,BulmaAdminTable,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/KnownHosts.vue b/client/src/views/KnownHosts.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <BulmaModal v-if="showDelete" title="Delete" action="Delete" @click="removeHost();showDelete=false" @close="showDelete=false" @cancel="showDelete=false">Are you sure you want to delete knownhostssitory '{{ knownhostsItem}}'</BulmaModal>
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon :icon="['fab','git-square']" /> Known Hosts</h1>
@@ -57,7 +57,8 @@
     name: "AfKnownHosts",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaModal,BulmaAdminTable,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Ldap.vue b/client/src/views/Ldap.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="id-card" /> Ldap</h1>
       <div class="columns">
@@ -58,7 +58,8 @@
     name: "AfLdap",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaCheckbox,BulmaTextArea,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Logs.vue b/client/src/views/Logs.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showDesigner ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="file-lines" /> Logs</h1>
       <nav class="level">
@@ -49,9 +49,7 @@
   </section>
 </template>
 <script>
-  import Vue from 'vue'
   import axios from 'axios'
-  import Copy from 'copy-to-clipboard'
   import LogViewer from '@femessage/log-viewer'
   import BulmaCheckRadio from './../components/BulmaCheckRadio.vue'
   import TokenStorage from './../lib/TokenStorage'
@@ -61,7 +59,8 @@
     name: "AfLogs",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{LogViewer,BulmaCheckRadio},
     data(){

diff --git a/client/src/views/MailSettings.vue b/client/src/views/MailSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="cogs" /> Settings</h1>
       <div class="columns">
@@ -54,7 +54,8 @@
     name: "AfMailSettings",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaCheckbox,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/OIDC.vue b/client/src/views/OIDC.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="address-card" /> Open ID Connect</h1>
       <div class="columns">
@@ -48,7 +48,8 @@
     name: "AfOidc",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaCheckbox,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Repos.vue b/client/src/views/Repos.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <BulmaQuickView class="quickview" v-if="showOutput" title="Last execution result" footer="" @close="showOutput=false">
         <p class="is-family-code" v-html="output.split('\n').join('<br>')"></p>
     </BulmaQuickView>        
@@ -84,7 +84,8 @@
     name:"AfRepositories",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,BulmaModal,BulmaQuickView,BulmaAdminTable,BulmaCheckbox,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Settings.vue b/client/src/views/Settings.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="cogs" /> Settings</h1>
       <div class="columns">
@@ -92,7 +92,8 @@
     name: "AfSettings",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaInput,VueCodeEditor,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Sshkey.vue b/client/src/views/Sshkey.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="key" /> SSH Key</h1>
       <div class="columns">
@@ -38,7 +38,8 @@
     name: "AfSshkey",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaTextArea,BulmaSettingsMenu},
     setup(){

diff --git a/client/src/views/Users.vue b/client/src/views/Users.vue
@@ -1,5 +1,5 @@
 <template>
-  <section v-if="isAdmin" class="section">
+  <section v-if="profile?.options?.showSettings ?? isAdmin" class="section">
     <BulmaModal v-if="showDelete && user.username" title="Delete" action="Delete" @click="deleteUser();showDelete=false" @close="showDelete=false" @cancel="showDelete=false">Are you sure you want to delete User '{{ user.username}}'</BulmaModal>
     <div class="container">
       <h1 class="title has-text-info"><font-awesome-icon icon="user" /> Users</h1>
@@ -81,7 +81,8 @@
     name: "AfUsers",
     props:{
       authenticated:{type:Boolean},
-      isAdmin:{type:Boolean}
+      isAdmin:{type:Boolean},
+      profile:{type:Object}
     },
     components:{BulmaButton,BulmaSelect,BulmaInput,BulmaModal,BulmaAdminTable,BulmaSettingsMenu},
     setup(){