Esri#295: Test cases added for when ssl property/parameter is not ret…

…urned or present.
skitterm · Sep 20, 2018 · 584b0e5 · 584b0e5
1 parent eb96e2b
commit 584b0e5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 5 deletions.
diff --git a/packages/arcgis-rest-auth/src/fetch-token.ts b/packages/arcgis-rest-auth/src/fetch-token.ts
@@ -12,7 +12,7 @@ interface IFetchTokenRawResponse {
   access_token: string;
   expires_in: number;
   username: string;
-  ssl: boolean;
+  ssl?: boolean;
   refresh_token?: string;
 }
 

diff --git a/packages/arcgis-rest-auth/test/UserSession.test.ts b/packages/arcgis-rest-auth/test/UserSession.test.ts
@@ -728,6 +728,27 @@ describe("UserSession", () => {
       expect(session.ssl).toBe(true);
     });
 
+    it("should return a new user session with ssl as false when callback hash does not have ssl parameter", () => {
+      const MockWindow = {
+        location: {
+          href:
+            "https://example-app.com/redirect-uri#access_token=token&expires_in=1209600&username=c%40sey&persist=true"
+        },
+        get parent() {
+          return this;
+        }
+      };
+
+      const session = UserSession.completeOAuth2(
+        {
+          clientId: "clientId",
+          redirectUri: "https://example-app.com/redirect-uri"
+        },
+        MockWindow
+      );
+      expect(session.ssl).toBe(false);
+    });
+
     it("should callback to create a new user session if finds a valid opener", done => {
       const MockWindow = {
         opener: {
@@ -739,7 +760,7 @@ describe("UserSession", () => {
               const oauthInfo = JSON.parse(oauthInfoString);
               expect(oauthInfo.token).toBe("token");
               expect(oauthInfo.username).toBe("c@sey");
-              expect(oauthInfo.ssl).toBe(false);
+              expect(oauthInfo.ssl).toBe(true);
               expect(new Date(oauthInfo.expires).getTime()).toBeGreaterThan(
                 Date.now()
               );
@@ -751,7 +772,7 @@ describe("UserSession", () => {
         },
         location: {
           href:
-            "https://example-app.com/redirect-uri#access_token=token&expires_in=1209600&username=c%40sey"
+            "https://example-app.com/redirect-uri#access_token=token&expires_in=1209600&username=c%40sey&ssl=true"
         }
       };
 

diff --git a/packages/arcgis-rest-auth/test/fetchToken.test.ts b/packages/arcgis-rest-auth/test/fetchToken.test.ts
@@ -13,7 +13,7 @@ describe("fetchToken()", () => {
     fetchMock.postOnce(TOKEN_URL, {
       access_token: "token",
       expires_in: 1800,
-      ssl: false
+      ssl: true
     });
 
     fetchToken(TOKEN_URL, {
@@ -34,7 +34,7 @@ describe("fetchToken()", () => {
         expect(options.body).toContain("grant_type=client_credentials");
         expect(response.token).toEqual("token");
         expect(response.expires).toBeGreaterThan(Date.now());
-        expect(response.ssl).toEqual(false);
+        expect(response.ssl).toEqual(true);
         done();
       })
       .catch(e => {
@@ -84,4 +84,29 @@ describe("fetchToken()", () => {
         fail(e);
       });
   });
+
+  it("should return ssl: false when there is no ssl property returned from endpoint response", done => {
+    fetchMock.postOnce(TOKEN_URL, {
+      access_token: "token",
+      expires_in: 1800,
+      refresh_token: "refreshToken",
+      username: "Casey"
+    });
+
+    fetchToken(TOKEN_URL, {
+      params: {
+        client_id: "clientId",
+        redirect_uri: "https://example-app.com/redirect-uri",
+        code: "authorizationCode",
+        grant_type: "authorization_code"
+      }
+    })
+      .then(response => {
+        expect(response.ssl).toEqual(false);
+        done();
+      })
+      .catch(e => {
+        fail(e);
+      });
+  });
 });