improves the code based on PR comments

src/am-client.spec.ts → src/amclient/am-client.spec.ts

@@ -1,4 +1,4 @@
-import mockAxios from './testing/mock-axios';
+import mockAxios from '../testing/mock-axios';
 import { AmClient } from './am-client';
 
 describe('AmClient', () => {

src/am-client.ts → src/amclient/am-client.ts

@@ -3,23 +3,9 @@ import { OutgoingHttpHeaders } from 'http';
 import * as shortid from 'shortid';
 import * as url from 'url';
 
-export interface AmServerInfo {
-  cookieName: string;
-  domains: string[];
-}
-
-export interface AmPolicyDecisionRequest {
-  resources: string[];
-  application: string;
-  subject: { ssoToken: string };
-}
-
-export interface AmPolicyDecision {
-  resource: string;
-  actions: { [ action: string ]: boolean; };
-  attributes: { [ attribute: string ]: string[]; };
-  advices: any;
-}
+import { AmPolicyDecision } from './am-policy-decision';
+import { AmPolicyDecisionRequest } from './am-policy-decision-request';
+import { AmServerInfo } from './am-server-info';
 
 /**
  * ForgeRock OpenAM / Access Management client
@@ -47,7 +33,7 @@ export class AmClient {
   getServerInfo(): Promise<AmServerInfo> {
     return Axios
       .get(
-        this.serverAddress + '/json/serverinfo/*',
+        `${this.serverAddress}/json/serverinfo/*`,
         { headers: { host: this.hostname } })
       .then(res => res.data);
   }
@@ -75,7 +61,7 @@ export class AmClient {
     }
 
     return Axios
-      .post(this.serverAddress + '/json/authenticate', null, {
+      .post(`${this.serverAddress}/json/authenticate`, null, {
         headers: {
           host: this.hostname,
           'X-OpenAM-Username': username,
@@ -102,7 +88,7 @@ export class AmClient {
     };
 
     return Axios
-      .post(this.serverAddress + '/json/sessions', null, {
+      .post(`${this.serverAddress}/json/sessions`, null, {
         headers,
         params: { realm, _action: 'logout' }
       })
@@ -118,7 +104,7 @@ export class AmClient {
     }
 
     return Axios
-      .post(this.serverAddress + '/json/sessions/' + sessionId, null, {
+      .post(`${this.serverAddress}/json/sessions/${sessionId}`, null, {
         params: { _action: 'validate' },
         headers: {
           'host': this.hostname,
@@ -170,7 +156,7 @@ export class AmClient {
                     cookieName: string,
                     realm = '/'): Promise<AmPolicyDecision[]> {
     return Axios
-      .post(this.serverAddress + '/json/policies', data, {
+      .post(`${this.serverAddress}/json/policies`, data, {
         headers: {
           [ cookieName ]: sessionId,
           host: this.hostname
@@ -191,7 +177,7 @@ export class AmClient {
    */
   sessionServiceRequest(requestSet: string): Promise<any> {
     return Axios
-      .post(this.serverAddress + '/sessionservice', requestSet, {
+      .post(`${this.serverAddress}/sessionservice`, requestSet, {
         headers: {
           host: this.hostname,
           'Content-Type': 'text/xml'
@@ -208,9 +194,8 @@ export class AmClient {
    * @return {Promise} Token info response
    */
   validateAccessToken(accessToken: string, realm = '/'): Promise<any> {
-    //noinspection JSValidateTypes
     return Axios
-      .get(this.serverAddress + '/oauth2/tokeninfo', {
+      .get(`${this.serverAddress}/oauth2/tokeninfo`, {
         headers: {
           host: this.hostname
         },
@@ -228,7 +213,7 @@ export class AmClient {
   getProfile(userId: string, realm: string, sessionId: string, cookieName: string): Promise<any> {
     //noinspection JSValidateTypes
     return Axios
-      .get(this.serverAddress + '/json/users/' + userId, {
+      .get(`${this.serverAddress}/json/users/${userId}`, {
         headers: {
           host: this.hostname,
           cookie: `${cookieName}=${sessionId}`

src/amclient/am-policy-decision-request.ts

@@ -0,0 +1,5 @@
+export interface AmPolicyDecisionRequest {
+  resources: string[];
+  application: string;
+  subject: { ssoToken: string };
+}

src/amclient/am-policy-decision.ts

@@ -0,0 +1,6 @@
+export interface AmPolicyDecision {
+  resource: string;
+  actions: { [ action: string ]: boolean; };
+  attributes: { [ attribute: string ]: string[]; };
+  advices: any;
+}

src/amclient/am-server-info.ts

@@ -0,0 +1,4 @@
+export interface AmServerInfo {
+  cookieName: string;
+  domains: string[];
+}

src/index.ts

@@ -1,16 +1,20 @@
-export * from './am-client';
+export * from './amclient/am-client';
+export * from './amclient/am-policy-decision';
+export * from './amclient/am-policy-decision-request';
+export * from './amclient/am-server-info';
 export * from './cache/cache';
 export * from './cache/in-memory-cache';
 export * from './error/invalid-session-error';
 export * from './error/shield-evaluation-error';
-export * from './policy-agent';
-export * from './policy-agent-options';
+export * from './policyagent/policy-agent';
+export * from './policyagent/policy-agent-options';
 export * from './shield/basic-auth-shield';
 export * from './shield/cookie-shield';
 export * from './shield/oauth2-shield';
 export * from './shield/policy-shield';
 export * from './shield/session-data';
 export * from './shield/shield';
+export * from './utils/deferred';
 export * from './utils/http-utils';
 export * from './utils/logger';
 export * from './utils/xml-utils';

src/policy-agent-options.ts → src/policyagent/policy-agent-options.ts

@@ -1,6 +1,6 @@
 import { LoggerInstance } from 'winston';
-import { AmClient } from './am-client';
-import { Cache } from './cache/cache';
+import { AmClient } from '../amclient/am-client';
+import { Cache } from '../cache/cache';
 
 export interface EvaluationErrorDetails {
   status: number;

src/policy-agent.spec.ts → src/policyagent/policy-agent.spec.ts

@@ -1,9 +1,9 @@
-import { Shield } from './shield/shield';
-import mockAxios from './testing/mock-axios';
+import { Shield } from '../shield/shield';
+import mockAxios from '../testing/mock-axios';
 
 import { PolicyAgent } from './policy-agent';
 import { PolicyAgentOptions } from './policy-agent-options';
-import { getFixture } from './testing/utils';
+import { getFixture } from '../testing/utils';
 
 describe('PolicyAgent', () => {
   let agent: PolicyAgent;

src/policy-agent.ts → src/policyagent/policy-agent.ts

@@ -6,21 +6,25 @@ import { NextFunction } from 'express-serve-static-core';
 import * as fs from 'fs';
 import * as Handlebars from 'handlebars';
 import { IncomingMessage, ServerResponse } from 'http';
+import { resolve } from 'path';
 import * as ShortId from 'shortid';
 import { LoggerInstance } from 'winston';
 import * as XMLBuilder from 'xmlbuilder';
 
-import { AmClient, AmPolicyDecision, AmPolicyDecisionRequest, AmServerInfo } from './am-client';
-import { Cache } from './cache/cache';
-import { InMemoryCache } from './cache/in-memory-cache';
-import { InvalidSessionError } from './error/invalid-session-error';
+import { AmClient } from '../amclient/am-client';
+import { AmPolicyDecision } from '../amclient/am-policy-decision';
+import { AmPolicyDecisionRequest } from '../amclient/am-policy-decision-request';
+import { AmServerInfo } from '../amclient/am-server-info';
+import { Cache } from '../cache/cache';
+import { InMemoryCache } from '../cache/in-memory-cache';
+import { InvalidSessionError } from '../error/invalid-session-error';
+import { Shield } from '../shield/shield';
+import { baseUrl, sendResponse } from '../utils/http-utils';
+import { Logger } from '../utils/logger';
+import { parseXml } from '../utils/xml-utils';
 import { EvaluationErrorDetails, PolicyAgentOptions } from './policy-agent-options';
-import { Shield } from './shield/shield';
-import { baseUrl, sendResponse } from './utils/http-utils';
-import { Logger } from './utils/logger';
-import { parseXml } from './utils/xml-utils';
 
-const pkg = require('../package.json');
+const pkg = require('../../package.json');
 
 export const SESSION_EVENT = 'session';
 export const CDSSO_PATH = '/agent/cdsso';
@@ -539,6 +543,6 @@ export class PolicyAgent extends EventEmitter {
    * Compiles the default error page with Handlebars.js
    */
   protected getDefaultErrorTemplate() {
-    return Handlebars.compile(fs.readFileSync(__dirname + '/templates/error.handlebars').toString());
+    return Handlebars.compile(fs.readFileSync(resolve(__dirname, '../templates/error.handlebars')).toString());
   }
 }

src/shield/basic-auth-shield.ts

@@ -2,7 +2,7 @@ import * as basicAuth from 'basic-auth';
 import { IncomingMessage, ServerResponse } from 'http';
 
 import { ShieldEvaluationError } from '../error/shield-evaluation-error';
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { Deferred } from '../utils/deferred';
 import { sendResponse } from '../utils/http-utils';
 import { SessionData } from './session-data';

src/shield/cookie-shield.spec.ts

@@ -1,4 +1,4 @@
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { CookieShield } from './cookie-shield';
 import { ServerResponse, IncomingMessage } from 'http';
 

src/shield/cookie-shield.ts

@@ -1,7 +1,7 @@
 import { IncomingMessage, ServerResponse } from 'http';
 
 import { ShieldEvaluationError } from '../error/shield-evaluation-error';
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { Deferred } from '../utils/deferred';
 import { redirect } from '../utils/http-utils';
 import { SessionData } from './session-data';

src/shield/oauth2-shield.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import { ShieldEvaluationError } from '..';
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { SessionData } from './session-data';
 import { Shield } from './shield';
 
@@ -42,7 +42,7 @@ export class Oauth2Shield implements Shield {
 
       try {
         message = JSON.parse(err.response.body).error_description;
-      } catch (e) {
+      } catch {
         // body is not json
       }
 

src/shield/policy-shield.ts

@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import * as url from 'url';
 import { AmPolicyDecision, AmPolicyDecisionRequest, ShieldEvaluationError } from '..';
 
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { SessionData } from './session-data';
 import { Shield } from './shield';
 

src/shield/shield.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage, ServerResponse } from 'http';
 
-import { PolicyAgent } from '../policy-agent';
+import { PolicyAgent } from '../policyagent/policy-agent';
 import { SessionData } from './session-data';
 
 export interface Shield {

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "declaration": true,
     "noImplicitAny": false,
-    "removeComments": true,
+    "removeComments": false,
     "noLib": false,
     "module": "commonjs",
     "moduleResolution": "node",