Merge pull request #32 from microsoftgraph/odata-no-dollar-support

Support OData params without $ prefix and test cases

Author: dan-silver

lib/graph-js-sdk-web.js

@@ -364,9 +364,10 @@ exports.ResponseHandler = ResponseHandler;
 
 },{}],4:[function(require,module,exports){
 "use strict";
-exports.oDataQueryNames = ["$select", "$expand", "$orderby", "$filter", "$top", "$skip", "$skipToken", "$count"];
+exports.oDataQueryNames = ["select", "expand", "orderby", "filter", "top", "skip", "skipToken", "count"];
 exports.DEFAULT_VERSION = "v1.0";
 exports.GRAPH_BASE_URL = "https://graph.microsoft.com/";
+exports.oDataQueryNames = exports.oDataQueryNames.concat(exports.oDataQueryNames.map((s) => "$" + s));
 
 },{}],5:[function(require,module,exports){
 "use strict";

lib/src/common.d.ts

@@ -1,4 +1,4 @@
-export declare const oDataQueryNames: string[];
+export declare let oDataQueryNames: string[];
 export declare const DEFAULT_VERSION = "v1.0";
 export declare const GRAPH_BASE_URL = "https://graph.microsoft.com/";
 export interface AuthProviderCallback {

lib/src/common.js

@@ -1,7 +1,10 @@
-export const oDataQueryNames = ["$select", "$expand", "$orderby", "$filter", "$top", "$skip", "$skipToken", "$count"];
+export let oDataQueryNames = ["select", "expand", "orderby", "filter", "top", "skip", "skipToken", "count"]
 export const DEFAULT_VERSION = "v1.0";
 export const GRAPH_BASE_URL = "https://graph.microsoft.com/";
 
+// support oData params with and without $ prefix
+oDataQueryNames = oDataQueryNames.concat(oDataQueryNames.map((s) => "$"+s));
+
 export interface AuthProviderCallback {
     (error: any, accessToken: string): void
 }

lib/src/common.js.map

@@ -17,6 +17,11 @@ let testCases = {
     "/me?a=b": "https://graph.microsoft.com/v1.0/me?a=b",
     "/me?$filter=b&c=d": "https://graph.microsoft.com/v1.0/me?$filter=b&c=d",
     "me?$filter=b&c=d": "https://graph.microsoft.com/v1.0/me?$filter=b&c=d",
+
+    // oData params should work with and without $
+    "me?$select=displayName": "https://graph.microsoft.com/v1.0/me?$select=displayName",
+    "me?select=displayName": "https://graph.microsoft.com/v1.0/me?select=displayName",
+    "https://graph.microsoft.com/beta/me?select=displayName": "https://graph.microsoft.com/beta/me?select=displayName"
 }
 
 describe('#parsePath()', function() {