fix: prepend origin if missing in http request uri (#44)

* fix: prepend origin if missing in http request uri

Signed-off-by: Deyan Valkanov <dvaklanov@vmware.com>
Signed-off-by: Deyan Valkanov <dvalkanov@vmware.com>

* Update changelog and version

Signed-off-by: Deyan Valkanov <dvalkanov@vmware.com>

* Add unit tests

Signed-off-by: Deyan Valkanov <dvalkanov@vmware.com>

build/npm/transport.json

@@ -21,6 +21,15 @@
     "license": "BSD-2-Clause",
     "changelogHistory": [
         {
+            "date": "5/14/21",
+            "version": "1.2.9",
+            "notes": [
+                {
+                    "description": "Fix missing protocol and host in httpclient uri",
+                    "review_uri": "https://github.com/vmware/transport-typescript/pull/44"
+                }
+            ]
+        },{
             "date": "5/10/21",
             "version": "1.2.8",
             "notes": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vmw/transport",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "private": false,
   "license": "BSD-2-Clause",
   "repository": "git@github.com:vmware/transport-typescript.git",

src/bus.api.ts

@@ -18,7 +18,7 @@ import { FabricApi } from './fabric.api';
 import { BrokerConnector } from './bridge';
 
 // current version
-const version = '1.2.8';
+const version = '1.2.9';
 
 export type ChannelName = string;
 export type SentFrom = string;

src/core/services/rest/rest.service.spec.ts

@@ -396,6 +396,55 @@ describe('Fake Service [services/rest/rest.service.spec]', () => {
         }
     );
 
+    it('Should simulate an autogenerated API call when no base url is provided',
+        () => {
+            let channel = bus.api.getResponseChannel(FakeChannel.request);
+            const id = GeneralUtil.genUUIDShort();
+            const packet: any = {};
+            Object.assign(packet, restPayloadGet);
+
+            expect(channel)
+                .not
+                .toBeUndefined();
+            channel.subscribe(
+                (message: Message) => {
+                    const responseObject = message.payload as FakeRestRelayResponseObject;
+                    const payload = responseObject.payload as string;
+                    expect(payload).toBe('GET called');
+                }
+            );
+
+            packet['op'] = 'GET';
+            packet['uri'] = '/foo';
+            const requestObject = new FakeRestRelayRequestObject(FakeChannel.request, packet);
+            bus.sendRequestMessageWithId(FakeChannel.request, requestObject, id);
+        }
+    );
+
+    it('Should fail on a bad url passed to the Rest service (negative test).',
+        () => {
+            let channel = bus.api.getResponseChannel(FakeChannel.request);
+            const id = GeneralUtil.genUUIDShort();
+            const packet: any = {};
+            Object.assign(packet, restPayloadGet);
+
+            expect(channel)
+                .not
+                .toBeUndefined();
+            channel.subscribe(
+                (message: Message) => {
+                    expect(message.id).toEqual(id);
+                    expect(message.isError()).toBeTruthy();
+                }
+            );
+
+            packet['op'] = 'GET';
+            packet['uri'] = 'https://';
+            const requestObject = new FakeRestRelayRequestObject(FakeChannel.request, packet);
+            bus.sendRequestMessageWithId(FakeChannel.request, requestObject, id);
+        }
+    );
+
     it('Should update headers.',
         () => {
             let channel = bus.api.getResponseChannel(FakeChannel.request);

src/core/services/rest/rest.service.ts

@@ -189,28 +189,41 @@ export class RestService extends AbstractCore implements EventBusEnabled, Fabric
         const requestHeadersObject = new Headers(requestHeaders);
         const requestInit: RequestInit = this.generateRequestInitObject(restObject, requestHeadersObject);
 
-        const uri: string = this.globalBaseUri + restObject.uri;
-        this.log.debug(`Rest Service: Preparing Fetch Request for URI: ${uri}`, this.getName());
+        let httpRequest;
+
+        // try to create fetch request.
+        try {
+            const uri: string = this.globalBaseUri + restObject.uri;
+            this.log.debug(`Rest Service: Preparing Fetch Request for URI: ${uri}`, this.getName());
+            httpRequest = new Request(uri);
+        } catch (e) {
+            this.log.error(`Rest Service: Cannot create request: ${e}`, this.getName());
+            this.handleError(
+                new RestError('Invalid HTTP request.', RestErrorType.UnknownMethod, restObject.uri),
+                restObject,
+                args);
+            return;
+        }
 
         switch (restObject.request) {
             case HttpRequest.Get:
-                this.httpClient.get(uri, requestInit, successHandler, errorHandler);
+                this.httpClient.get(httpRequest.url, requestInit, successHandler, errorHandler);
                 break;
 
             case HttpRequest.Post:
-                this.httpClient.post(uri, requestInit, successHandler, errorHandler);
+                this.httpClient.post(httpRequest.url, requestInit, successHandler, errorHandler);
                 break;
 
             case HttpRequest.Patch:
-                this.httpClient.patch(uri, requestInit, successHandler, errorHandler);
+                this.httpClient.patch(httpRequest.url, requestInit, successHandler, errorHandler);
                 break;
 
             case HttpRequest.Put:
-                this.httpClient.put(uri, requestInit, successHandler, errorHandler);
+                this.httpClient.put(httpRequest.url, requestInit, successHandler, errorHandler);
                 break;
 
             case HttpRequest.Delete:
-                this.httpClient.delete(uri, requestInit, successHandler, errorHandler);
+                this.httpClient.delete(httpRequest.url, requestInit, successHandler, errorHandler);
                 break;
 
             default: