fix: use v2/ instead of catalog for testing registries

leonardochaia · Oct 31, 2018 · 5b9c80b · 5b9c80b
1 parent e3c24d7
commit 5b9c80b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/app/registry/registry-auth.service.ts b/src/app/registry/registry-auth.service.ts
@@ -31,13 +31,17 @@ export class RegistryAuthService {
         Authorization: `Basic ${basic}`
       };
     }
+    const params: any = {
+      service: service,
+      clientId: clientId,
+    };
+    if (scope) {
+      params.scope = scope;
+    }
+
     return this.httpClient.get<{ token: string }>(url,
       {
-        params: {
-          service: service,
-          scope: scope,
-          clientId: clientId,
-        },
+        params: params,
         headers: headers
       }).pipe(map(r => {
         return r.token;

diff --git a/src/app/registry/registry.service.ts b/src/app/registry/registry.service.ts
@@ -30,7 +30,7 @@ export class RegistryService {
   }
 
   public testRegistrySettings(settings: DockerRegistrySettings) {
-    return this.get<void>(settings, `v2/_catalog`, { n: '1' });
+    return this.get<void>(settings, `v2/`);
   }
 
   protected get<T>(registrySettings: DockerRegistrySettings,