feat: introduce sub-directories utils and navigators

package.json

@@ -40,7 +40,7 @@
   "jest": {
     "clearMocks": true,
     "testMatch": [
-      "**/test/unit/*.test.ts"
+      "**/test/unit/**/*.test.ts"
     ]
   },
   "engines": {

src/AccessTokenEvents.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
-import { Timer } from './Timer';
+import { Log, Timer } from './utils';
 import { User } from './User';
 
 const DefaultAccessTokenExpiringNotificationTime = 60; // seconds

src/CheckSessionIFrame.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 const DefaultInterval = 2000;
 

src/ErrorResponse.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 export class ErrorResponse extends Error {
     public readonly name: string;

src/InMemoryWebStorage.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 export class InMemoryWebStorage implements Storage {
     private _data: Record<string, any>;

src/JsonService.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 export class JsonService {
     private _contentTypes: string[];

src/MetadataService.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 import { JsonService } from './JsonService';
 import { OidcClientSettingsStore } from './OidcClientSettings';
 import { OidcMetadata } from './OidcMetadata';

src/OidcClient.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 import { OidcClientSettings, OidcClientSettingsStore } from './OidcClientSettings';
 import { ErrorResponse } from './ErrorResponse';
 import { SigninRequest } from './SigninRequest';

src/OidcClientSettings.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 import { ClockService } from './ClockService';
 import { WebStorageStateStore } from './WebStorageStateStore';
 import { ResponseValidator } from './ResponseValidator';

src/ResponseValidator.ts

@@ -1,12 +1,11 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log, JoseUtil } from './utils';
 import { MetadataService } from './MetadataService';
 import { UserInfoService } from './UserInfoService';
 import { TokenClient } from './TokenClient';
 import { ErrorResponse } from './ErrorResponse';
-import { JoseUtil } from './JoseUtil';
 import { OidcClientSettingsStore } from './OidcClientSettings';
 import { SigninState } from './SigninState';
 import { SigninResponse } from './SigninResponse';

src/SessionMonitor.ts

@@ -1,10 +1,9 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log, g_timer, IntervalTimer } from './utils';
 import { CheckSessionIFrame } from './CheckSessionIFrame';
 import { UserManager } from './UserManager';
-import { g_timer, IntervalTimer } from './Timer';
 
 export class SessionMonitor {
     private _userManager: UserManager;

src/SigninRequest.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
-import { UrlUtility } from './UrlUtility';
+import { Log, UrlUtility } from './utils';
 import { SigninState } from './SigninState';
 
 export class SigninRequest {

src/SigninResponse.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { UrlUtility } from './UrlUtility';
+import { UrlUtility } from './utils';
 
 const OidcScope = "openid";
 

src/SigninState.ts

@@ -1,10 +1,8 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log, JoseUtil, random } from './utils';
 import { State } from './State';
-import { JoseUtil } from './JoseUtil';
-import random from './random';
 
 export class SigninState extends State {
     private _nonce: any;

src/SignoutRequest.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
-import { UrlUtility } from './UrlUtility';
+import { Log, UrlUtility } from './utils';
 import { State } from './State';
 
 export class SignoutRequest {

src/SignoutResponse.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { UrlUtility } from './UrlUtility';
+import { UrlUtility } from './utils';
 
 export class SignoutResponse {
     public error?: string;

src/SilentRenewService.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 import { UserManager } from './UserManager';
 
 export class SilentRenewService {

src/State.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
-import random from './random';
+import { Log, random } from './utils';
 import { StateStore } from './StateStore';
 
 export class State {

src/TokenClient.ts

@@ -3,7 +3,7 @@
 
 import { JsonService } from './JsonService';
 import { MetadataService } from './MetadataService';
-import { Log } from './Log';
+import { Log } from './utils';
 import { OidcClientSettingsStore } from './OidcClientSettings';
 
 export class TokenClient {

src/TokenRevocationClient.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 import { MetadataService } from './MetadataService';
 import { OidcClientSettingsStore } from './OidcClientSettings';
 

src/User.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 export class User {
     public id_token: string;

src/UserInfoService.ts

@@ -1,10 +1,9 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+import { Log, JoseUtil } from './utils';
 import { JsonService } from './JsonService';
 import { MetadataService } from './MetadataService';
-import { Log } from './Log';
-import { JoseUtil } from './JoseUtil';
 import { OidcClientSettingsStore } from './OidcClientSettings';
 
 export class UserInfoService {

src/UserManager.ts

@@ -1,7 +1,8 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log, JoseUtil } from './utils';
+import { INavigator, IFrameNavigator, PopupNavigator } from './navigators';
 import { OidcClient } from './OidcClient';
 import { UserManagerSettings, UserManagerSettingsStore } from './UserManagerSettings';
 import { User } from './User';
@@ -11,10 +12,6 @@ import { SessionMonitor } from './SessionMonitor';
 import { SigninRequest } from "./SigninRequest";
 import { TokenRevocationClient } from './TokenRevocationClient';
 import { TokenClient } from './TokenClient';
-import { JoseUtil } from './JoseUtil';
-import { INavigator } from './INavigator';
-import { IFrameNavigator } from './IFrameNavigator';
-import { PopupNavigator } from './PopupNavigator';
 import { SessionStatus } from './SessionStatus'
 import { SignoutResponse } from './SignoutResponse';
 

src/UserManagerEvents.ts

@@ -1,10 +1,9 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log, Event } from './utils';
 import { AccessTokenEvents } from './AccessTokenEvents';
 import { UserManagerSettingsStore } from './UserManagerSettings';
-import { Event } from './Event';
 import { User } from './User';
 
 export type UserLoadedCallback = (user: User) => void;

src/UserManagerSettings.ts

@@ -2,9 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
 import { OidcClientSettings, OidcClientSettingsStore } from './OidcClientSettings';
-import { RedirectNavigator } from './RedirectNavigator';
-import { PopupNavigator } from './PopupNavigator';
-import { IFrameNavigator } from './IFrameNavigator';
+import { RedirectNavigator, PopupNavigator, IFrameNavigator } from './navigators';
 import { WebStorageStateStore } from './WebStorageStateStore';
 import { SigninRequest } from './SigninRequest';
 

src/WebStorageStateStore.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
 
 export class WebStorageStateStore {
     private _store: Storage

src/index.ts

@@ -1,7 +1,9 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from './utils';
+import { CordovaPopupNavigator, CordovaIFrameNavigator } from './navigators';
+
 import { OidcClient } from './OidcClient';
 import { OidcClientSettings } from './OidcClientSettings';
 import { WebStorageStateStore } from './WebStorageStateStore';
@@ -10,14 +12,11 @@ import { UserManager } from './UserManager';
 import { UserManagerSettings } from './UserManagerSettings';
 import { AccessTokenEvents } from './AccessTokenEvents';
 import { MetadataService } from './MetadataService';
-import { CordovaPopupNavigator } from './CordovaPopupNavigator';
-import { CordovaIFrameNavigator } from './CordovaIFrameNavigator';
 import { CheckSessionIFrame } from './CheckSessionIFrame';
 import { TokenRevocationClient } from './TokenRevocationClient';
 import { SessionMonitor } from './SessionMonitor';
 import { SessionStatus } from './SessionStatus';
 import { User } from './User';
-
 import { Version } from './Version';
 
 export type {

src/CordovaPopupWindow.ts → src/navigators/CordovaPopupWindow.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from '../utils';
 import { IWindow } from './IWindow';
 
 const DefaultPopupFeatures = 'location=no,toolbar=no,zoom=no';

src/IFrameNavigator.ts → src/navigators/IFrameNavigator.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from '../utils';
 import { IFrameWindow } from './IFrameWindow';
 import { INavigator } from './INavigator';
 

src/IFrameWindow.ts → src/navigators/IFrameWindow.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from '../utils';
 import { IWindow } from './IWindow';
 
 const DefaultTimeout = 10000;

src/PopupNavigator.ts → src/navigators/PopupNavigator.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from '../utils';
 import { PopupWindow } from './PopupWindow';
 import { INavigator } from './INavigator';
 

src/PopupWindow.ts → src/navigators/PopupWindow.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
-import { UrlUtility } from './UrlUtility';
+import { Log, UrlUtility } from '../utils';
 import { IWindow } from './IWindow';
 
 const CheckForPopupClosedInterval = 500;

src/RedirectNavigator.ts → src/navigators/RedirectNavigator.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from './Log';
+import { Log } from '../utils';
 import { INavigator } from './INavigator';
 import { IWindow } from './IWindow';
 

src/navigators/index.ts

@@ -0,0 +1,10 @@
+export * from './CordovaIFrameNavigator';
+export * from './CordovaPopupNavigator';
+export * from './CordovaPopupWindow';
+export * from './IFrameNavigator';
+export * from './IFrameWindow';
+export * from './INavigator';
+export * from './IWindow';
+export * from './PopupNavigator';
+export * from './PopupWindow';
+export * from './RedirectNavigator';

src/utils/index.ts

@@ -0,0 +1,6 @@
+export * from './Event';
+export * from './JoseUtil';
+export * from './Log';
+export * from './random';
+export * from './Timer';
+export * from './UrlUtility';

src/random.ts → src/utils/random.ts

@@ -19,7 +19,7 @@ function _uuidv4() {
     )
 }
 
-export default function random(): string {
+export function random(): string {
     const hasRandomValues = crypto && crypto.hasOwnProperty("getRandomValues");
     var uuid = hasRandomValues ? _cryptoUuidv4 : _uuidv4;
     return uuid().replace(/-/g, '');

test/unit/AccessTokenEvents.test.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
+import { Timer } from '../../src/utils';
 import { AccessTokenEvents } from '../../src/AccessTokenEvents';
-import { Timer } from '../../src/Timer';
 import { User } from '../../src/User';
 
 describe("AccessTokenEvents", () => {

test/unit/JsonService.test.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-import { Log } from '../../src/Log';
+import { Log } from '../../src/utils';
 import { JsonService } from '../../src/JsonService';
 
 class XMLHttpRequestMock {