Resolved review comments

microsoftgraph · Jan 28, 2019 · 93342d2 · 93342d2
1 parent 8ee9df3
commit 93342d2
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 34 deletions.
diff --git a/lib/graph-js-sdk-core.js b/lib/graph-js-sdk-core.js
diff --git a/lib/graph-js-sdk-web.js b/lib/graph-js-sdk-web.js
diff --git a/lib/src/Client.d.ts b/lib/src/Client.d.ts
@@ -37,10 +37,10 @@ export declare class Client {
      * @public
      * @static
      * To create a client instance with the Client Options
-     * @param {ClientOptions} options - The options object for initializing the client
+     * @param {ClientOptions} clientOptions - The options object for initializing the client
      * @returns The Client instance
      */
-    static initWithMiddleware(options: ClientOptions): Client;
+    static initWithMiddleware(clientOptions: ClientOptions): Client;
     /**
      * @public
      * Entry point to make requests

diff --git a/lib/src/Client.js b/lib/src/Client.js
diff --git a/lib/src/Client.js.map b/lib/src/Client.js.map
diff --git a/lib/src/GraphError.d.ts b/lib/src/GraphError.d.ts
@@ -24,17 +24,17 @@ export declare class GraphError {
      * @public
      * A member holding code i.e name of the error
      */
-    code: string;
+    code: string | null;
     /**
      * @public
      * A member holding error message
      */
-    message: string;
+    message: string | null;
     /**
      * @public
      * A member holding request-id i.e identifier of the request
      */
-    requestId: string;
+    requestId: string | null;
     /**
      * @public
      * A member holding processed date and time of the request

diff --git a/lib/src/GraphRequest.js b/lib/src/GraphRequest.js
diff --git a/lib/src/GraphRequest.js.map b/lib/src/GraphRequest.js.map
diff --git a/src/Client.ts b/src/Client.ts
@@ -94,12 +94,12 @@ export class Client {
      * @public
      * @static
      * To create a client instance with the Client Options
-     * @param {ClientOptions} options - The options object for initializing the client
+     * @param {ClientOptions} clientOptions - The options object for initializing the client
      * @returns The Client instance 
      */
-    public static initWithMiddleware(options: ClientOptions): Client {
+    public static initWithMiddleware(clientOptions: ClientOptions): Client {
         try {
-            return new Client(options);
+            return new Client(clientOptions);
         } catch (error) {
             throw error;
         }

diff --git a/src/GraphError.ts b/src/GraphError.ts
@@ -29,19 +29,19 @@ export class GraphError {
      * @public
      * A member holding code i.e name of the error
      */
-    public code: string;
+    public code: string | null;
 
     /**
      * @public
      * A member holding error message
      */
-    public message: string;
+    public message: string | null;
 
     /**
      * @public
      * A member holding request-id i.e identifier of the request
      */
-    public requestId: string;
+    public requestId: string | null;
 
     /**
      * @public

diff --git a/src/GraphRequest.ts b/src/GraphRequest.ts
@@ -130,17 +130,21 @@ export class GraphRequest {
 
             // Find where the host ends
             let endOfHostStrPos = path.indexOf("/");
-            // Parse out the host
-            self.urlComponents.host = "https://" + path.substring(0, endOfHostStrPos);
-            // Strip the host from path
-            path = path.substring(endOfHostStrPos + 1, path.length);
+            if(endOfHostStrPos !== -1) {
+                // Parse out the host
+                self.urlComponents.host = "https://" + path.substring(0, endOfHostStrPos);
+                // Strip the host from path
+                path = path.substring(endOfHostStrPos + 1, path.length);
+            }
 
             // Remove the following version
             let endOfVersionStrPos = path.indexOf("/");
-            // Parse out the version
-            self.urlComponents.version = path.substring(0, endOfVersionStrPos);
-            // Strip version from path
-            path = path.substring(endOfVersionStrPos + 1, path.length);
+            if(endOfVersionStrPos !== -1) {
+                // Parse out the version
+                self.urlComponents.version = path.substring(0, endOfVersionStrPos);
+                // Strip version from path
+                path = path.substring(endOfVersionStrPos + 1, path.length);
+            }
         }
 
         // Strip out any leading "/"