Improved error handling for performAuthorizationRequest

Resolves: openid#94

built/authorization_request_handler.d.ts

@@ -52,8 +52,9 @@ export declare abstract class AuthorizationRequestHandler {
     setAuthorizationNotifier(notifier: AuthorizationNotifier): AuthorizationRequestHandler;
     /**
      * Makes an authorization request.
+     * Returns a `Promise<null>`, when the request was sent succesfully.
      */
-    abstract performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): void;
+    abstract performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): Promise<null>;
     /**
      * Checks if an authorization flow can be completed, and completes it.
      * The handler returns a `Promise<AuthorizationRequestResponse>` if ready, or a `Promise<null>`

built/node_support/node_request_handler.d.ts

@@ -7,6 +7,6 @@ export declare class NodeBasedHandler extends AuthorizationRequestHandler {
     httpServerPort: number;
     authorizationPromise: Promise<AuthorizationRequestResponse | null> | null;
     constructor(httpServerPort?: number, utils?: QueryStringUtils, crypto?: Crypto);
-    performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): void;
+    performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): Promise<null>;
     protected completeAuthorizationRequest(): Promise<AuthorizationRequestResponse | null>;
 }

built/redirect_based_handler.d.ts

@@ -13,7 +13,7 @@ export declare class RedirectRequestHandler extends AuthorizationRequestHandler
     storageBackend: StorageBackend;
     locationLike: LocationLike;
     constructor(storageBackend?: StorageBackend, utils?: BasicQueryStringUtils, locationLike?: LocationLike, crypto?: Crypto);
-    performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): void;
+    performAuthorizationRequest(configuration: AuthorizationServiceConfiguration, request: AuthorizationRequest): Promise<null>;
     /**
      * Attempts to introspect the contents of storage backend and completes the
      * request.

src/app/index.ts

@@ -113,7 +113,11 @@ export class App {
     });
 
     if (this.configuration) {
-      this.authorizationHandler.performAuthorizationRequest(this.configuration, request);
+      this.authorizationHandler.performAuthorizationRequest(this.configuration, request)
+        .catch(error => {
+          log('Something bad happened', error);
+          this.showMessage(`Something bad happened ${error}`)
+        });
     } else {
       this.showMessage(
           'Fetch Authorization Service configuration, before you make the authorization request.');

src/authorization_request_handler.ts

@@ -143,10 +143,11 @@ export abstract class AuthorizationRequestHandler {
 
   /**
    * Makes an authorization request.
+   * Returns a `Promise<null>`, when the request was sent succesfully.
    */
   abstract performAuthorizationRequest(
       configuration: AuthorizationServiceConfiguration,
-      request: AuthorizationRequest): void;
+      request: AuthorizationRequest): Promise<null>;
 
   /**
    * Checks if an authorization flow can be completed, and completes it.

src/node_app/index.ts

@@ -86,7 +86,10 @@ export class App {
     }, new NodeCrypto());
 
     log('Making authorization request ', configuration, request);
-    this.authorizationHandler.performAuthorizationRequest(configuration, request);
+    this.authorizationHandler.performAuthorizationRequest(configuration, request)
+      .catch(error => {
+        log('Something bad happened ', error);
+      });
   }
 
   makeRefreshTokenRequest(

src/node_support/node_request_handler.ts

@@ -15,6 +15,7 @@
 import * as EventEmitter from 'events';
 import * as Http from 'http';
 import * as Url from 'url';
+import {AppAuthError} from '../errors';
 import {AuthorizationRequest} from '../authorization_request';
 import {AuthorizationRequestHandler, AuthorizationRequestResponse} from '../authorization_request_handler';
 import {AuthorizationError, AuthorizationResponse} from '../authorization_response';
@@ -29,6 +30,7 @@ import {NodeCrypto} from './crypto_utils';
 import opener = require('opener');
 
 class ServerEventsEmitter extends EventEmitter {
+  static ON_START = 'start';
   static ON_UNABLE_TO_START = 'unable_to_start';
   static ON_AUTHORIZATION_RESPONSE = 'authorization_response';
 }
@@ -91,10 +93,8 @@ export class NodeBasedHandler extends AuthorizationRequestHandler {
       response.end('Close your browser to continue');
     };
 
-    this.authorizationPromise = new Promise<AuthorizationRequestResponse>((resolve, reject) => {
-      emitter.once(ServerEventsEmitter.ON_UNABLE_TO_START, () => {
-        reject(`Unable to create HTTP server at port ${this.httpServerPort}`);
-      });
+    this.authorizationPromise = new Promise<AuthorizationRequestResponse|null>((resolve) => {
+      emitter.once(ServerEventsEmitter.ON_UNABLE_TO_START, () => resolve(null));
       emitter.once(ServerEventsEmitter.ON_AUTHORIZATION_RESPONSE, (result: any) => {
         server.close();
         // resolve pending promise
@@ -112,11 +112,23 @@ export class NodeBasedHandler extends AuthorizationRequestHandler {
           const url = this.buildRequestUrl(configuration, request);
           log('Making a request to ', request, url);
           opener(url);
+          emitter.emit(ServerEventsEmitter.ON_START);
         })
         .catch((error) => {
           log('Something bad happened ', error);
-          emitter.emit(ServerEventsEmitter.ON_UNABLE_TO_START);
+          emitter.emit(ServerEventsEmitter.ON_UNABLE_TO_START, error);
         });
+
+    return new Promise<null>((resolve, reject) => {
+      emitter.once(ServerEventsEmitter.ON_UNABLE_TO_START, (error) => {
+        reject(new AppAuthError(
+          `Unable to create HTTP server at port ${this.httpServerPort}`,
+          {origError: error}
+        ));
+      });
+
+      emitter.once(ServerEventsEmitter.ON_START, () => resolve(null));
+    });
   }
 
   protected completeAuthorizationRequest(): Promise<AuthorizationRequestResponse|null> {

src/redirect_based_handler.ts

@@ -57,24 +57,29 @@ export class RedirectRequestHandler extends AuthorizationRequestHandler {
   performAuthorizationRequest(
       configuration: AuthorizationServiceConfiguration,
       request: AuthorizationRequest) {
-    const handle = this.crypto.generateRandom(10);
+    return new Promise<null>((resolve, reject) => {
+      const handle = this.crypto.generateRandom(10);
 
-    // before you make request, persist all request related data in local storage.
-    const persisted = Promise.all([
-      this.storageBackend.setItem(AUTHORIZATION_REQUEST_HANDLE_KEY, handle),
-      // Calling toJson() adds in the code & challenge when possible
-      request.toJson().then(
-          result =>
-              this.storageBackend.setItem(authorizationRequestKey(handle), JSON.stringify(result))),
-      this.storageBackend.setItem(
-          authorizationServiceConfigurationKey(handle), JSON.stringify(configuration.toJson())),
-    ]);
+      // before you make request, persist all request related data in local storage.
+      const persisted = Promise.all([
+        this.storageBackend.setItem(AUTHORIZATION_REQUEST_HANDLE_KEY, handle),
+        // Calling toJson() adds in the code & challenge when possible
+        request.toJson().then(
+            result => this.storageBackend.setItem(
+                authorizationRequestKey(handle), JSON.stringify(result))),
+        this.storageBackend.setItem(
+            authorizationServiceConfigurationKey(handle), JSON.stringify(configuration.toJson())),
+      ]);
 
-    persisted.then(() => {
-      // make the redirect request
-      let url = this.buildRequestUrl(configuration, request);
-      log('Making a request to ', request, url);
-      this.locationLike.assign(url);
+      persisted
+          .then(() => {
+            // make the redirect request
+            let url = this.buildRequestUrl(configuration, request);
+            log('Making a request to ', request, url);
+            this.locationLike.assign(url);
+            resolve(null);
+          })
+          .catch(error => reject(error));
     });
   }