From 593cc2c6e6ef0f06c22abcfd8dc6d2d5bee12033 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Jun 2020 16:06:26 +0200
Subject: [PATCH] core-api: update web message response handling in loginPopup
 to expect RFC format

---
 packages/core-api/src/lib/loginPopup.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/core-api/src/lib/loginPopup.ts b/packages/core-api/src/lib/loginPopup.ts
index b4af94be49..10d6efd7a4 100644
--- a/packages/core-api/src/lib/loginPopup.ts
+++ b/packages/core-api/src/lib/loginPopup.ts
@@ -46,11 +46,11 @@ export type LoginPopupOptions = {
 
 type AuthResult =
   | {
-      type: 'auth-result';
-      payload: any;
+      type: 'authorization_response';
+      response: unknown;
     }
   | {
-      type: 'auth-result';
+      type: 'authorization_response';
       error: {
         name: string;
         message: string;
@@ -58,12 +58,13 @@ type AuthResult =
     };
 
 /**
- * Show a popup pointing to a URL that starts an auth flow.
+ * Show a popup pointing to a URL that starts an auth flow. Implementing the receiving
+ * end of the postMessage mechanism outlined in https://tools.ietf.org/html/draft-sakimura-oauth-wmrm-00
  *
  * The redirect handler of the flow should use postMessage to communicate back
  * to the app window. The message posted to the app must match the AuthResult type.
  *
- * The returned promise resolves to the contents of the message that was posted from the auth popup.
+ * The returned promise resolves to the response of the message that was posted from the auth popup.
  */
 export function showLoginPopup(options: LoginPopupOptions): Promise<any> {
   return new Promise((resolve, reject) => {
@@ -91,7 +92,7 @@ export function showLoginPopup(options: LoginPopupOptions): Promise<any> {
         return;
       }
       const { data } = event;
-      if (data.type !== 'auth-result') {
+      if (data.type !== 'authorization_response') {
         return;
       }
       const authResult = data as AuthResult;
@@ -103,7 +104,7 @@ export function showLoginPopup(options: LoginPopupOptions): Promise<any> {
         // error.extra = authResult.error.extra;
         reject(error);
       } else {
-        resolve(authResult.payload);
+        resolve(authResult.response);
       }
       done();
     };