Browse Source

refactor: add fallback for new request auth state

nivedin 1 year ago
parent
commit
7c3a84246d

+ 8 - 4
packages/hoppscotch-common/src/components/http/Authorization.vue

@@ -152,12 +152,16 @@
         <div v-if="auth.authType === 'basic'">
           <HttpAuthorizationBasic v-model="auth" />
         </div>
-        <div v-if="auth.authType === 'inherit'">
-          <div class="p-4">
+        <div v-if="auth.authType === 'inherit'" class="p-4">
+          <span v-if="inheritedProperties?.auth">
             Inherited
-            {{ getAuthName(inheritedProperties?.auth?.authType) }} from Parent
+            {{ getAuthName(inheritedProperties.auth.authType) }} from Parent
             Collection {{ inheritedProperties?.parentName }}
-          </div>
+          </span>
+          <span v-else>
+            Please save this request in any collection to inherit the
+            authorization
+          </span>
         </div>
         <div v-if="auth.authType === 'bearer'">
           <div class="flex flex-1 border-b border-dividerLight">

+ 2 - 2
packages/hoppscotch-common/src/helpers/utils/EffectiveURL.ts

@@ -55,7 +55,7 @@ export const getComputedAuthHeaders = (
 
   if (!request) return []
 
-  if (!request.auth.authActive) return []
+  if (!request.auth || !request.auth.authActive) return []
 
   const headers: HoppRESTHeader[] = []
 
@@ -165,7 +165,7 @@ export const getComputedParams = (
 ): ComputedParam[] => {
   // When this gets complex, its best to split this function off (like with getComputedHeaders)
   // API-key auth can be added to query params
-  if (!req.auth.authActive) return []
+  if (!req.auth || !req.auth.authActive) return []
   if (req.auth.authType !== "api-key") return []
   if (req.auth.addTo !== "Query params") return []