@sprucelabs/heartwood-view-controllers 112.1.8 → 112.2.1

package/build/auth/Authenticator.d.ts

@@ -1,11 +1,13 @@
-import { SpruceSchemas } from '@sprucelabs/mercury-types';
-import { Authenticator } from '../types/heartwood.types';
+import EventEmitter from 'events';
+import { Person } from '@sprucelabs/spruce-core-schemas';
+import { Authenticator, AuthenticatorEventName, AuthenticatorEventPayloads, Storage } from '../types/heartwood.types';
 export default class AuthenticatorImpl implements Authenticator {
+    static Class?: new (storage: Storage) => Authenticator;
     private static instance;
     private static storage;
-    private eventEmitter;
-    private storage;
-    private constructor();
+    protected eventEmitter: EventEmitter;
+    protected storage: Storage;
+    protected constructor(storage: Storage);
     static getInstance(): Authenticator;
     static reset(): void;
     static setStorage(storage: Storage | null): void;
@@ -14,23 +16,5 @@ export default class AuthenticatorImpl implements Authenticator {
     getPerson(): any;
     isLoggedIn(): boolean;
     clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout'>(name: N, cb: Payloads[N]): void;
+    addEventListener<N extends AuthenticatorEventName>(name: N, cb: AuthenticatorEventPayloads[N]): void;
 }
-type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
-type DidLoginPayload = (payload: {
-    token: string;
-    person: Person;
-}) => void;
-type DidLogoutPayload = (payload: {
-    person: Person;
-}) => void;
-export interface Storage {
-    removeItem(key: string): void;
-    setItem(key: string, value: string): void;
-    getItem(key: string): string | null;
-}
-interface Payloads {
-    'did-login': DidLoginPayload;
-    'did-logout': DidLogoutPayload;
-}
-export {};

package/build/auth/Authenticator.js

@@ -15,7 +15,7 @@ class AuthenticatorImpl {
             throw new SpruceError_1.default({ code: 'MISSING_STORAGE' });
         }
         if (!this.instance) {
-            this.instance = new this(this.storage);
+            this.instance = new (this.Class ?? this)(this.storage);
         }
         return this.instance;
     }
@@ -43,6 +43,7 @@ class AuthenticatorImpl {
     }
     clearSession() {
         const person = JSON.parse(this.storage.getItem('person') ?? '{}');
+        this.eventEmitter.emit('will-logout', { person });
         this.storage.removeItem('sessionToken');
         this.storage.removeItem('person');
         this.eventEmitter.emit('did-logout', { person });

package/build/esm/auth/Authenticator.d.ts

@@ -1,11 +1,13 @@
-import { SpruceSchemas } from '@sprucelabs/mercury-types';
-import { Authenticator } from '../types/heartwood.types';
+import EventEmitter from 'events';
+import { Person } from '@sprucelabs/spruce-core-schemas';
+import { Authenticator, AuthenticatorEventName, AuthenticatorEventPayloads, Storage } from '../types/heartwood.types';
 export default class AuthenticatorImpl implements Authenticator {
+    static Class?: new (storage: Storage) => Authenticator;
     private static instance;
     private static storage;
-    private eventEmitter;
-    private storage;
-    private constructor();
+    protected eventEmitter: EventEmitter;
+    protected storage: Storage;
+    protected constructor(storage: Storage);
     static getInstance(): Authenticator;
     static reset(): void;
     static setStorage(storage: Storage | null): void;
@@ -14,23 +16,5 @@ export default class AuthenticatorImpl implements Authenticator {
     getPerson(): any;
     isLoggedIn(): boolean;
     clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout'>(name: N, cb: Payloads[N]): void;
+    addEventListener<N extends AuthenticatorEventName>(name: N, cb: AuthenticatorEventPayloads[N]): void;
 }
-type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
-type DidLoginPayload = (payload: {
-    token: string;
-    person: Person;
-}) => void;
-type DidLogoutPayload = (payload: {
-    person: Person;
-}) => void;
-export interface Storage {
-    removeItem(key: string): void;
-    setItem(key: string, value: string): void;
-    getItem(key: string): string | null;
-}
-interface Payloads {
-    'did-login': DidLoginPayload;
-    'did-logout': DidLogoutPayload;
-}
-export {};

package/build/esm/auth/Authenticator.js

@@ -6,11 +6,12 @@ export default class AuthenticatorImpl {
         this.storage = storage;
     }
     static getInstance() {
+        var _a;
         if (!this.storage) {
             throw new SpruceError({ code: 'MISSING_STORAGE' });
         }
         if (!this.instance) {
-            this.instance = new this(this.storage);
+            this.instance = new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(this.storage);
         }
         return this.instance;
     }
@@ -40,6 +41,7 @@ export default class AuthenticatorImpl {
     clearSession() {
         var _a;
         const person = JSON.parse((_a = this.storage.getItem('person')) !== null && _a !== void 0 ? _a : '{}');
+        this.eventEmitter.emit('will-logout', { person });
         this.storage.removeItem('sessionToken');
         this.storage.removeItem('person');
         this.eventEmitter.emit('did-logout', { person });

package/build/esm/tests/StubStorage.d.ts

@@ -1,4 +1,4 @@
-import { Storage } from '../auth/Authenticator';
+import { Storage } from '../types/heartwood.types';
 export default class StubStorage implements Storage {
     private items;
     removeItem(key: string): void;

package/build/esm/types/heartwood.types.d.ts

@@ -51,17 +51,24 @@ type DidLoginPayload = (payload: {
 type DidLogoutPayload = (payload: {
     person: Person;
 }) => void;
-interface Payloads {
+export interface AuthenticatorEventPayloads {
     'did-login': DidLoginPayload;
+    'will-logout': DidLoginPayload;
     'did-logout': DidLogoutPayload;
 }
+export type AuthenticatorEventName = keyof AuthenticatorEventPayloads;
+export interface Storage {
+    removeItem(key: string): void;
+    setItem(key: string, value: string): void;
+    getItem(key: string): string | null;
+}
 export interface Authenticator {
     getPerson(): Person | null;
     setSessionToken(token: string, person: Person): void;
     getSessionToken(): string | null;
     isLoggedIn(): boolean;
     clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout'>(name: N, cb: Payloads[N]): void;
+    addEventListener<N extends 'did-login' | 'did-logout' | 'will-logout'>(name: N, cb: AuthenticatorEventPayloads[N]): void;
 }
 export interface AuthenticatorStatic {
     getInstance(): Authenticator;

package/build/tests/StubStorage.d.ts

@@ -1,4 +1,4 @@
-import { Storage } from '../auth/Authenticator';
+import { Storage } from '../types/heartwood.types';
 export default class StubStorage implements Storage {
     private items;
     removeItem(key: string): void;

package/build/types/heartwood.types.d.ts

@@ -51,17 +51,24 @@ type DidLoginPayload = (payload: {
 type DidLogoutPayload = (payload: {
     person: Person;
 }) => void;
-interface Payloads {
+export interface AuthenticatorEventPayloads {
     'did-login': DidLoginPayload;
+    'will-logout': DidLoginPayload;
     'did-logout': DidLogoutPayload;
 }
+export type AuthenticatorEventName = keyof AuthenticatorEventPayloads;
+export interface Storage {
+    removeItem(key: string): void;
+    setItem(key: string, value: string): void;
+    getItem(key: string): string | null;
+}
 export interface Authenticator {
     getPerson(): Person | null;
     setSessionToken(token: string, person: Person): void;
     getSessionToken(): string | null;
     isLoggedIn(): boolean;
     clearSession(): void;
-    addEventListener<N extends 'did-login' | 'did-logout'>(name: N, cb: Payloads[N]): void;
+    addEventListener<N extends 'did-login' | 'did-logout' | 'will-logout'>(name: N, cb: AuthenticatorEventPayloads[N]): void;
 }
 export interface AuthenticatorStatic {
     getInstance(): Authenticator;

package/package.json

@@ -13,7 +13,7 @@
   "sideEffects": false,
   "license": "MIT",
   "description": "All the power of Heartwood in one, convenient package.",
-  "version": "112.1.8",
+  "version": "112.2.1",
   "skill": {
     "namespace": "HeartwoodViewControllers",
     "commandOverrides": {