Merge pull request #921 from activepieces/fix/oauth2-event-source

fix: check event source
activepieces · Mar 29, 2023 · 4e0f06e · 4e0f06e
2 parents f41696a + e061002
commit 4e0f06e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/packages/frontend/src/app/modules/common/service/oauth2.service.ts b/packages/frontend/src/app/modules/common/service/oauth2.service.ts
@@ -51,17 +51,11 @@ export class Oauth2Service {
     this.currentlyOpenPopUp = popup;
     const codeObs$ = new Observable<any>((observer) => {
       window.addEventListener('message', function handler(event) {
-        if (redirect_uri.startsWith(event.origin)) {
-          if (event.data != undefined) {
-            event.data.code = decodeURIComponent(event.data.code);
-            observer.next(event.data);
-            popup?.close();
-            observer.complete();
-          } else {
-            observer.error('No code returned');
-            popup?.close();
-            observer.complete();
-          }
+        if (redirect_uri.startsWith(event.origin) && event.data['code']) {
+          event.data.code = decodeURIComponent(event.data.code);
+          observer.next(event.data);
+          popup?.close();
+          observer.complete();
           window.removeEventListener('message', handler);
         }
       });

diff --git a/packages/frontend/src/app/modules/redirect-url/redirect-url.component.ts b/packages/frontend/src/app/modules/redirect-url/redirect-url.component.ts
@@ -16,10 +16,15 @@ export class RedirectUrlComponent implements OnInit {
       .pipe(
         tap((params) => {
           if (window.opener && params['code'] != undefined) {
-            window.opener.postMessage(params, '*');
+            window.opener.postMessage(
+              {
+                code: params['code'],
+              },
+              '*'
+            );
           }
         })
       )
-      .pipe(map((value) => void 0));
+      .pipe(map(() => void 0));
   }
 }