diff --git a/ui/proxy.conf.json b/ui/proxy.conf.json index fea704271..89fcfdf90 100644 --- a/ui/proxy.conf.json +++ b/ui/proxy.conf.json @@ -15,7 +15,7 @@ "^/shibui": "" } }, - "/shibui/login": { + "/login": { "target": "http://localhost:8080", "secure": false, "logLevel": "debug", @@ -23,7 +23,7 @@ "^/shibui": "" } }, - "/shibui/logout": { + "/logout": { "target": "http://localhost:8080", "secure": false, "logLevel": "debug", diff --git a/ui/src/app/metadata/configuration/service/history.service.spec.ts b/ui/src/app/metadata/configuration/service/history.service.spec.ts index e4fa72dac..8edb179a3 100644 --- a/ui/src/app/metadata/configuration/service/history.service.spec.ts +++ b/ui/src/app/metadata/configuration/service/history.service.spec.ts @@ -47,7 +47,7 @@ describe(`Attributes Service`, () => { const type = 'resource'; service.getVersion(resourceId, type).subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === `/${service.base}/${PATHS[type]}/${resourceId}` + return req.url === `${service.base}/${PATHS[type]}/${resourceId}` && req.method === 'GET'; }, `GET schema by path`); } @@ -59,7 +59,7 @@ describe(`Attributes Service`, () => { const versionId = '1'; service.getVersion(resourceId, type, versionId).subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === `/${service.base}/${PATHS[type]}/${resourceId}/${service.path}/${versionId}` + return req.url === `${service.base}/${PATHS[type]}/${resourceId}/${service.path}/${versionId}` && req.method === 'GET'; }, `GET schema by path`); } @@ -74,7 +74,7 @@ describe(`Attributes Service`, () => { const versionId = '1'; service.updateVersion(resourceId, type, {} as Metadata).subscribe(); backend.expectOne((req: HttpRequest) => { - return req.url === `/${service.base}/${PATHS[type]}/${resourceId}` + return req.url === `${service.base}/${PATHS[type]}/${resourceId}` && req.method === 'PUT'; }, `PUT schema by path`); } diff --git a/ui/src/app/metadata/configuration/service/history.service.ts b/ui/src/app/metadata/configuration/service/history.service.ts index 1027f82e2..9e6a3d3f3 100644 --- a/ui/src/app/metadata/configuration/service/history.service.ts +++ b/ui/src/app/metadata/configuration/service/history.service.ts @@ -20,7 +20,7 @@ export class MetadataHistoryService { ) { } query(resourceId: string, type: string): Observable { - return this.http.get(`/${this.base}/${PATHS[type]}/${resourceId}/${this.path}`).pipe( + return this.http.get(`${this.base}/${PATHS[type]}/${resourceId}/${this.path}`).pipe( map(resp => ({ versions: resp })) @@ -42,6 +42,6 @@ export class MetadataHistoryService { } updateVersion(resourceId: string, type: string, model: Metadata): Observable { - return this.http.put(`/${this.base}/${PATHS[type]}/${resourceId}`, model); + return this.http.put(`${this.base}/${PATHS[type]}/${resourceId}`, model); } }