fix: HttpRequestInfo types + add credentials

hapinessjs · May 28, 2018 · 749bf24 · 749bf24
1 parent a2b1c07
commit 749bf24
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/extensions/http-server/lifecycle.ts b/src/extensions/http-server/lifecycle.ts
@@ -17,17 +17,17 @@ export class LifecycleManager {
     static routeLifecycle(server: Server, routes: CoreRoute[]): void {
 
         server.ext(<any>LifecycleEventsEnum.OnPreAuth.toString(),
-            (request: Request, reply: ReplyWithContinue) =>
-                this.instantiateRoute(routes, request, reply)
-                    .subscribe(
-                        _ => reply.continue(),
-                        _ => errorHandler(_)
-                    )
+        (request: Request, reply: ReplyWithContinue) =>
+            this.eventHandler(LifecycleHooksEnum.OnPreAuth, routes, request, reply)
+                .subscribe(
+                    _ => reply.continue(),
+                    _ => errorHandler(_)
+                )
         );
 
         server.ext(<any>LifecycleEventsEnum.OnPostAuth.toString(),
             (request: Request, reply: ReplyWithContinue) =>
-                this.eventHandler(LifecycleHooksEnum.OnPostAuth, routes, request, reply)
+                this.instantiateRoute(routes, request, reply)
                     .subscribe(
                         _ => reply.continue(),
                         _ => errorHandler(_)
@@ -84,7 +84,7 @@ export class LifecycleManager {
             )
             .do(_ => request['_hapinessRoute'] = _.instance)
             .defaultIfEmpty(null)
-            .flatMap(_ => this.eventHandler(LifecycleHooksEnum.OnPreAuth, routes, request, reply))
+            .flatMap(_ => this.eventHandler(LifecycleHooksEnum.OnPostAuth, routes, request, reply))
     }
 
     /**

diff --git a/src/extensions/http-server/route.ts b/src/extensions/http-server/route.ts
@@ -12,7 +12,14 @@ interface InternalType {
     token: Type<any>;
 }
 
-export class HttpRequestInfo {}
+export class HttpRequestInfo {
+    query: {[key: string]: string};
+    params: {[key: string]: string};
+    headers: {[key: string]: string};
+    payload: {[key: string]: string};
+    credentials: {[key: string]: string};
+    id: string;
+}
 
 export class RouteBuilder {
 
@@ -54,6 +61,7 @@ export class RouteBuilder {
                 params: Object.assign({}, request.params),
                 headers: Object.assign({}, request.headers),
                 payload: Object.assign({}, request.payload),
+                credentials: Object.assign({}, request.auth.credentials),
                 id: request.id
             }))
             .map(_ => ({ provide: HttpRequestInfo, useValue: _ }))

diff --git a/test/integration/core.test.ts b/test/integration/core.test.ts
@@ -1,7 +1,7 @@
 import { suite, test } from 'mocha-typescript';
 import { Hapiness, HapinessModule, OnStart, OnRegister, Lib, Injectable, ExtensionShutdownPriority } from '../../src/core';
 import * as unit from 'unit.js';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 @suite('Integration - Core')
 export class ModuleTestSuite {