Merge pull request #44 from Azure/az/fixes-12-4

Fixed handling of YAML files in Swagger UI, and the absence of spec.

src/routes/Main/ApiDetail/Options.tsx

@@ -32,6 +32,10 @@ const Options: FC<{ api: Api; version?: string; definition?: string, environment
 
         const downloadUrl = await apiService.getSpecificationLink(api.name, version, definition);
 
+        if (!downloadUrl) {
+            return;
+        }
+
         setSchemaUrl(downloadUrl);
     };
 

src/routes/Main/Swagger/index.tsx

@@ -27,9 +27,10 @@ const Swagger = () => {
         if (!version || !definition) return;
 
         const downloadUrl = await apiService.getSpecificationLink(name, version, definition);
-        const apiSpecification = await fetch(downloadUrl).then((r) => r.json());
+        const downloadResult = await fetch(downloadUrl);
+        const content: any = await downloadResult.text();
 
-        setSpecification(apiSpecification);
+        setSpecification(content);
         setIsLoading(false);
     };
 

src/services/httpClient.ts

@@ -23,16 +23,23 @@ export class HttpClient implements IHttpClient {
 
         const response = await fetch(requestUrl, { method, headers });
 
-        if (accessToken && (response.status === 401 || response.status == 403)) {
-            localStorage.setItem("MS_APIC_DEVPORTAL_isRestricted", "true");
-            return;
-        } else if (!response.ok) {
-            alert("Something went wrong");
-            return;
+        switch (response.status) {
+            case 401:
+            case 403:
+                if (accessToken) {
+                    localStorage.setItem("MS_APIC_DEVPORTAL_isRestricted", "true");
+                    return null;
+                }
+                break;
+
+            case 404:
+                return null;
+
+            default:
+                break;
         }
 
         const dataJson = await response.json();
-
         return dataJson;
     }
 }

src/util/useApiService.ts

@@ -34,7 +34,7 @@ export class ApiService {
             `apis/${apiName}/versions/${versionName}/definitions/${definitionName}:exportSpecification`,
             Method.POST
         );
-        return response.value;
+        return response?.value;
     }
 
     public async getEnvironment(environmentId: string) {