Merge pull request #99 from Esri/oauth-no-popup

fix(oauth): check for window parent correctly in oauth without popup
Esri · Jan 12, 2018 · 94edc2a · 94edc2a
2 parents ae59cd9 + a27bb7d
commit 94edc2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/packages/arcgis-rest-auth/src/UserSession.ts b/packages/arcgis-rest-auth/src/UserSession.ts
@@ -338,7 +338,7 @@ export class UserSession implements IAuthenticationManager {
         return undefined;
       }
 
-      if (win.parent) {
+      if (win !== win.parent) {
         win.parent[`__ESRI_REST_AUTH_HANDLER_${clientId}`](error, oauthInfo);
         win.close();
         return undefined;

diff --git a/packages/arcgis-rest-auth/test/UserSession.test.ts b/packages/arcgis-rest-auth/test/UserSession.test.ts
@@ -483,6 +483,9 @@ describe("UserSession", () => {
         location: {
           href:
             "https://example-app.com/redirect-uri#access_token=token&expires_in=1209600&username=casey"
+        },
+        get parent() {
+          return this;
         }
       };
 
@@ -566,6 +569,9 @@ describe("UserSession", () => {
         location: {
           href:
             "https://example-app.com/redirect-uri#error=Invalid_Signin&error_description=Invalid_Signin"
+        },
+        get parent() {
+          return this;
         }
       };