@sprucelabs/spruce-test-fixtures 52.5.5 → 52.5.7

package/build/esm/tests/fixtures/PermissionFixture.js

@@ -1,11 +1,18 @@
 import { AuthenticatorImpl } from '@sprucelabs/heartwood-view-controllers';
+import { AuthorizerFactory } from '@sprucelabs/spruce-permission-utils';
 import FakeAuthorizer from '../FakeAuthorizer.js';
 export default class PermissionFixture {
+    constructor(mercury) {
+        this.connectToApi = mercury.getConnectFactory();
+        AuthorizerFactory.setConnectToApi(this.connectToApi);
+    }
     static beforeEach() {
         process.env.SHOULD_REGISTER_PERMISSIONS = 'false';
+        AuthorizerFactory.reset();
+        AuthorizerFactory.setClass(FakeAuthorizer);
     }
     getAuthorizer() {
-        return FakeAuthorizer.getInstance();
+        return AuthorizerFactory.getInstance();
     }
     getAuthenticator() {
         return AuthenticatorImpl.getInstance();

package/build/esm/tests/fixtures/ViewFixture.d.ts

@@ -6,9 +6,9 @@ import { ClientProxyDecorator } from '../..';
 import { TokenGenerator } from '../../ClientProxyDecorator';
 import { TestConnectFactory } from '../../types/fixture.types';
 import { ArgsFromSvc } from '../../types/view.types';
-import FakeAuthorizer from '../FakeAuthorizer';
 import TestRouter from '../routers/TestRouter';
 import FixtureFactory from './FixtureFactory';
+import PermissionFixture from './PermissionFixture';
 import PersonFixture from './PersonFixture';
 import SpyScope from './SpyScope';
 type Factory = TestConnectFactory;
@@ -29,6 +29,7 @@ export default class ViewFixture {
     private locations;
     private proxyDecorator;
     private locale;
+    private permissions;
     static lockProxyCacheForPerson(id: any): void;
     static setShouldAutomaticallyResetAuth(shouldReset: false): void;
     constructor(options: {
@@ -40,6 +41,7 @@ export default class ViewFixture {
         controllerMap?: Record<string, any>;
         namespace: string;
         proxyDecorator: ClientProxyDecorator;
+        permissions: PermissionFixture;
     });
     getFactory(): ViewControllerFactory;
     getMaps(): import("../../utilities/SpyMapUtil").SpyMapUtil;
@@ -66,7 +68,7 @@ export default class ViewFixture {
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
-    getAuthorizer(): FakeAuthorizer;
+    getAuthorizer(): import("../FakeAuthorizer").default;
     getProxyTokenGenerator(): TokenGenerator | undefined;
     setProxyTokenGenerator(cb: TokenGenerator): void;
     loginAsDemoPerson(phone?: string): Promise<{

package/build/esm/tests/fixtures/ViewFixture.js

@@ -16,7 +16,6 @@ import SpruceError from '../../errors/SpruceError.js';
 import spyMapUtil from '../../utilities/SpyMapUtil.js';
 import vcDiskUtil from '../../utilities/vcDisk.utility.js';
 import FakeSkillViewController from '../Fake.svc.js';
-import FakeAuthorizer from '../FakeAuthorizer.js';
 import TestRouter from '../routers/TestRouter.js';
 import SpyScope from './SpyScope.js';
 export default class ViewFixture {
@@ -38,6 +37,7 @@ export default class ViewFixture {
         this.orgs = options.fixtureFactory.Fixture('organization', {
             people: this.people,
         });
+        this.permissions = options.permissions;
         this.locale = new LocaleImpl();
         this.locations = options.fixtureFactory.Fixture('location', {
             people: this.people,
@@ -154,7 +154,6 @@ export default class ViewFixture {
                 };
             }
             TestRouter.reset();
-            FakeAuthorizer.reset();
             ViewFixture.resetMaps();
             ActiveRecordCardViewController.setShouldThrowOnResponseError(true);
             process.env.SHOULD_REGISTER_VIEWS = 'false';
@@ -222,6 +221,7 @@ export default class ViewFixture {
             vcFactory: this.getFactory(),
             scope: this.getScope(),
             locale: this.getLocale(),
+            authorizer: this.permissions.getAuthorizer(),
         });
         return TestRouter.getInstance();
     }
@@ -229,13 +229,13 @@ export default class ViewFixture {
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthenticator() {
-        return AuthenticatorImpl.getInstance();
+        return this.permissions.getAuthenticator();
     }
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthorizer() {
-        return FakeAuthorizer.getInstance();
+        return this.permissions.getAuthorizer();
     }
     getProxyTokenGenerator() {
         return this.proxyDecorator.getProxyTokenGenerator();
@@ -246,7 +246,7 @@ export default class ViewFixture {
     loginAsDemoPerson(phone) {
         return __awaiter(this, void 0, void 0, function* () {
             const { person, token, client } = yield this.people.loginAsDemoPerson(phone);
-            this.getAuthenticator().setSessionToken(token, person);
+            this.permissions.getAuthenticator().setSessionToken(token, person);
             this.proxyDecorator.setProxyTokenGenerator(() => __awaiter(this, void 0, void 0, function* () {
                 if (!ViewFixture.loggedInPersonProxyTokens[person.id]) {
                     const proxyToken = client.registerProxyToken();

package/build/esm/tests/routers/TestRouter.d.ts

@@ -1,5 +1,5 @@
 import { Locale } from '@sprucelabs/calendar-utils';
-import { Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
+import { Authorizer, Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
 import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager';
@@ -23,6 +23,8 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
     private scope;
     private locale;
     private readonly themes;
+    private authorizer;
+    private static authorizer;
     static setShouldThrowWhenRedirectingToBadSvc(shouldThrow: boolean): void;
     private constructor();
     static setShouldLoadDestinationVc(shouldLoad: boolean): void;
@@ -32,6 +34,7 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
         vcFactory: ViewControllerFactory;
         scope: Scope;
         locale: Locale;
+        authorizer: Authorizer;
     }): void;
     getPresentVc(): SkillViewController<any> | undefined;
     redirect<Id extends SkillViewControllerId>(id: Id, args?: SkillViewControllerArgs<Id>): Promise<SkillViewControllerMap[Id]>;

package/build/esm/tests/routers/TestRouter.js

@@ -12,7 +12,6 @@ import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { buildEventContract, } from '@sprucelabs/mercury-types';
 import testRouterEmitPayloadSchema from './../../.spruce/schemas/spruceTestFixtures/v2021_07_19/testRouterEmitPayload.schema.js';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager.js';
-import FakeAuthorizer from '../FakeAuthorizer.js';
 const contract = buildEventContract({
     eventSignatures: {
         'did-redirect': {
@@ -30,6 +29,7 @@ export default class TestRouter extends AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     static setShouldLoadDestinationVc(shouldLoad) {
         this.shouldLoadDestinationVc = shouldLoad;
@@ -40,6 +40,7 @@ export default class TestRouter extends AbstractEventEmitter {
                 vcFactory: this.vcFactory,
                 scope: this.scope,
                 locale: this.locale,
+                authorizer: this.authorizer,
             });
             routerTestPatcher.patchRedirectToThrow(this.instance);
         }
@@ -55,6 +56,7 @@ export default class TestRouter extends AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     getPresentVc() {
         return this.presentVc;
@@ -93,7 +95,7 @@ export default class TestRouter extends AbstractEventEmitter {
             authenticator: AuthenticatorImpl.getInstance(),
             args,
             locale: this.locale,
-            authorizer: FakeAuthorizer.getInstance(),
+            authorizer: this.authorizer,
             scope: this.scope,
             themes: this.themes,
         };

package/build/tests/AbstractSpruceFixtureTest.d.ts

@@ -1,7 +1,8 @@
 import { DatabaseFixture } from '@sprucelabs/data-stores';
 import { MercuryClient } from '@sprucelabs/mercury-client';
-import { Location, Organization, Person, Role, Skill } from '@sprucelabs/spruce-core-schemas';
+import { Location, Organization, Person, Role, Skill as ISkill } from '@sprucelabs/spruce-core-schemas';
 import { AbstractSkillTest, SkillFactoryOptions } from '@sprucelabs/spruce-skill-booter';
+import { Skill } from '@sprucelabs/spruce-skill-utils';
 import { FixtureConstructorOptionsMap, FixtureName } from '../types/fixture.types';
 import LocationFixture from './fixtures/LocationFixture';
 import MercuryFixture from './fixtures/MercuryFixture';
@@ -20,39 +21,13 @@ export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTes
     static fakedTeammates: Person[];
     static fakedOwners: Person[];
     static fakedRoles: Role[];
-    static fakedSkills: Skill[];
+    static fakedSkills: ISkill[];
     static fakedManagers: Person[];
     static fakedGuests: Person[];
     static fakedGroupManagers: Person[];
-    static get fakedOrganizations(): Organization[];
-    static set fakedOrganizations(orgs: Organization[]);
-    static get fakedLocations(): Location[];
-    static set fakedLocations(locations: Location[]);
     private static _fakedOrganizations;
     private static _fakedLocations;
     static cwd: string;
-    static get views(): ViewFixture;
-    static set views(fixture: ViewFixture | undefined);
-    static get permissions(): PermissionFixture;
-    static set permissions(fixture: PermissionFixture | undefined);
-    static get roles(): RoleFixture;
-    static set roles(fixture: RoleFixture | undefined);
-    static get locations(): LocationFixture;
-    static set locations(fixture: LocationFixture | undefined);
-    static get organizations(): OrganizationFixture;
-    static set organizations(fixture: OrganizationFixture | undefined);
-    static get people(): PersonFixture;
-    static set people(fixture: PersonFixture | undefined);
-    static get seeder(): SeedFixture;
-    static set seeder(fixture: SeedFixture | undefined);
-    static get skills(): SkillFixture;
-    static set skills(fixture: SkillFixture | undefined);
-    static get mercury(): MercuryFixture;
-    static set mercury(fixture: MercuryFixture | undefined);
-    static get stores(): StoreFixture;
-    static set stores(fixture: StoreFixture | undefined);
-    static get database(): DatabaseFixture;
-    static set database(fixture: DatabaseFixture | undefined);
     private static _views?;
     private static _roles?;
     private static _locations?;
@@ -64,6 +39,7 @@ export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTes
     private static _stores?;
     private static _database?;
     private static _permissions?;
+    private static _fixtures?;
     protected static beforeAll(): Promise<void>;
     protected static beforeEach(): Promise<void>;
     private static clearLocalFixtures;
@@ -74,7 +50,7 @@ export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTes
         name: string;
         slug?: string;
     }): Promise<{
-        skill: import("@sprucelabs/spruce-skill-utils").Skill;
+        skill: Skill;
         client: import("@sprucelabs/mercury-types").MercuryEventEmitter<import("@sprucelabs/mercury-types").SkillEventContract> & {
             disconnect: () => Promise<void>;
             isConnected: () => boolean;
@@ -96,7 +72,34 @@ export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTes
         executionPromise: Promise<void>;
     }>;
     protected static bootAndRegisterSkillFromTestDir(key: string): Promise<{
-        skill: import("@sprucelabs/spruce-skill-utils").Skill;
+        skill: Skill;
         executionPromise: Promise<void>;
     }>;
+    protected static SkillFromTestDir(key: string, options?: SkillFactoryOptions | undefined): Promise<Skill>;
+    static get fakedOrganizations(): Organization[];
+    static set fakedOrganizations(orgs: Organization[]);
+    static get fakedLocations(): Location[];
+    static set fakedLocations(locations: Location[]);
+    static get views(): ViewFixture;
+    static set views(fixture: ViewFixture | undefined);
+    static get permissions(): PermissionFixture;
+    static set permissions(fixture: PermissionFixture | undefined);
+    static get roles(): RoleFixture;
+    static set roles(fixture: RoleFixture | undefined);
+    static get locations(): LocationFixture;
+    static set locations(fixture: LocationFixture | undefined);
+    static get organizations(): OrganizationFixture;
+    static set organizations(fixture: OrganizationFixture | undefined);
+    static get people(): PersonFixture;
+    static set people(fixture: PersonFixture | undefined);
+    static get seeder(): SeedFixture;
+    static set seeder(fixture: SeedFixture | undefined);
+    static get skills(): SkillFixture;
+    static set skills(fixture: SkillFixture | undefined);
+    static get mercury(): MercuryFixture;
+    static set mercury(fixture: MercuryFixture | undefined);
+    static get stores(): StoreFixture;
+    static set stores(fixture: StoreFixture | undefined);
+    static get database(): DatabaseFixture;
+    static set database(fixture: DatabaseFixture | undefined);
 }

package/build/tests/AbstractSpruceFixtureTest.js

@@ -19,6 +19,79 @@ const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const FixtureFactory_1 = __importDefault(require("./fixtures/FixtureFactory"));
 class AbstractSpruceFixtureTest extends spruce_skill_booter_1.AbstractSkillTest {
+    static async beforeAll() {
+        await super.beforeAll();
+        await FixtureFactory_1.default.beforeAll();
+        console.error = spruce_skill_utils_1.testLog.error;
+    }
+    static async beforeEach() {
+        await super.beforeEach();
+        await FixtureFactory_1.default.beforeEach(this.cwd);
+        this._fixtures = undefined;
+        this.clearLocalFixtures();
+    }
+    static clearLocalFixtures() {
+        this.views = undefined;
+        this.roles = undefined;
+        this.locations = undefined;
+        this.organizations = undefined;
+        this.people = undefined;
+        this.seeder = undefined;
+        this.skills = undefined;
+        this.mercury = undefined;
+        this.stores = undefined;
+        this.database = undefined;
+        this.permissions = undefined;
+    }
+    static async afterEach() {
+        await super.afterEach();
+        await FixtureFactory_1.default.afterEach();
+        this.clearLocalFixtures();
+    }
+    static async afterAll() {
+        await super.afterAll();
+        await FixtureFactory_1.default.afterAll();
+    }
+    static Fixture(name, options) {
+        var _a;
+        if (!this._fixtures) {
+            const pkg = spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'package.json');
+            let namespace;
+            if (spruce_skill_utils_1.diskUtil.doesFileExist(pkg)) {
+                const values = JSON.parse(spruce_skill_utils_1.diskUtil.readFile(pkg));
+                namespace = (_a = values === null || values === void 0 ? void 0 : values.skill) === null || _a === void 0 ? void 0 : _a.namespace;
+            }
+            this._fixtures = new FixtureFactory_1.default({
+                cwd: this.cwd,
+                namespace,
+            });
+        }
+        return this._fixtures.Fixture(name, options);
+    }
+    static async bootAndRegisterNewSkill(options) {
+        const { name, slug } = options, skillOptions = __rest(options, ["name", "slug"]);
+        const { skill, client } = await this.skills.loginAsDemoSkill({
+            name,
+            slug,
+        });
+        process.env.SKILL_ID = skill.id;
+        process.env.SKILL_API_KEY = skill.apiKey;
+        const { skill: bootedSkill, executionPromise } = await this.bootSkill(skillOptions);
+        return { skill: bootedSkill, client, executionPromise };
+    }
+    static async bootAndRegisterSkillFromTestDir(key) {
+        const registeredSkill = await this.skills.seedDemoSkill({
+            name: 'my test skill',
+        });
+        process.env.SKILL_ID = registeredSkill.id;
+        process.env.SKILL_API_KEY = registeredSkill.apiKey;
+        return this.bootSkillFromTestDir(key);
+    }
+    static async SkillFromTestDir(key, options) {
+        const skill = await super.SkillFromTestDir(key, options);
+        this._fixtures = undefined;
+        return skill;
+    }
     static get fakedOrganizations() {
         return this._fakedOrganizations;
     }
@@ -132,66 +205,6 @@ class AbstractSpruceFixtureTest extends spruce_skill_booter_1.AbstractSkillTest
     static set database(fixture) {
         this._database = fixture;
     }
-    static async beforeAll() {
-        await super.beforeAll();
-        await FixtureFactory_1.default.beforeAll();
-        console.error = spruce_skill_utils_1.testLog.error;
-    }
-    static async beforeEach() {
-        await super.beforeEach();
-        await FixtureFactory_1.default.beforeEach(this.cwd);
-        this.clearLocalFixtures();
-    }
-    static clearLocalFixtures() {
-        this.views = undefined;
-        this.roles = undefined;
-        this.locations = undefined;
-        this.organizations = undefined;
-        this.people = undefined;
-        this.seeder = undefined;
-        this.skills = undefined;
-        this.mercury = undefined;
-        this.stores = undefined;
-        this.database = undefined;
-    }
-    static async afterEach() {
-        await super.afterEach();
-        await FixtureFactory_1.default.afterEach();
-        this.clearLocalFixtures();
-    }
-    static async afterAll() {
-        await super.afterAll();
-        await FixtureFactory_1.default.afterAll();
-    }
-    static Fixture(name, options) {
-        var _a;
-        const pkg = spruce_skill_utils_1.diskUtil.resolvePath(this.cwd, 'package.json');
-        let namespace;
-        if (spruce_skill_utils_1.diskUtil.doesFileExist(pkg)) {
-            const values = JSON.parse(spruce_skill_utils_1.diskUtil.readFile(pkg));
-            namespace = (_a = values === null || values === void 0 ? void 0 : values.skill) === null || _a === void 0 ? void 0 : _a.namespace;
-        }
-        return new FixtureFactory_1.default({ cwd: this.cwd, namespace }).Fixture(name, options);
-    }
-    static async bootAndRegisterNewSkill(options) {
-        const { name, slug } = options, skillOptions = __rest(options, ["name", "slug"]);
-        const { skill, client } = await this.skills.loginAsDemoSkill({
-            name,
-            slug,
-        });
-        process.env.SKILL_ID = skill.id;
-        process.env.SKILL_API_KEY = skill.apiKey;
-        const { skill: bootedSkill, executionPromise } = await this.bootSkill(skillOptions);
-        return { skill: bootedSkill, client, executionPromise };
-    }
-    static async bootAndRegisterSkillFromTestDir(key) {
-        const registeredSkill = await this.skills.seedDemoSkill({
-            name: 'my test skill',
-        });
-        process.env.SKILL_ID = registeredSkill.id;
-        process.env.SKILL_API_KEY = registeredSkill.apiKey;
-        return this.bootSkillFromTestDir(key);
-    }
 }
 exports.default = AbstractSpruceFixtureTest;
 AbstractSpruceFixtureTest._fakedOrganizations = [];

package/build/tests/FakeAuthorizer.d.ts

@@ -1,10 +1,7 @@
 import { Authorizer, AuthorizerCanOptions } from '@sprucelabs/heartwood-view-controllers';
 import { PermissionContractId, PermissionId } from '@sprucelabs/mercury-types';
 export default class FakeAuthorizer implements Authorizer {
-    private static instance?;
     private fakedContracts;
-    static getInstance(): FakeAuthorizer;
-    static reset(): void;
     fakePermissions<ContractId extends PermissionContractId = PermissionContractId>(options: FakeOptions<ContractId>): void;
     can<ContractId extends PermissionContractId, Ids extends PermissionId<ContractId>>(options: AuthorizerCanOptions<ContractId, Ids>): Promise<Record<Ids, boolean>>;
     private assertValidPermission;

package/build/tests/FakeAuthorizer.js

@@ -6,15 +6,6 @@ class FakeAuthorizer {
     constructor() {
         this.fakedContracts = [];
     }
-    static getInstance() {
-        if (!this.instance) {
-            this.instance = new this();
-        }
-        return this.instance;
-    }
-    static reset() {
-        this.instance = undefined;
-    }
     fakePermissions(options) {
         this.fakedContracts.unshift(options);
     }
@@ -39,7 +30,7 @@ Valid permissions on this contract are:
 ${faked.permissions.map((p) => p.id).join('\n')}`);
     }
     assertValidContractId(faked, contractId) {
-        test_utils_1.assert.isTruthy(faked, `Contract by the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
+        test_utils_1.assert.isTruthy(faked, `Contract with the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
 
 Valid contracts are: 
 

package/build/tests/fixtures/FixtureFactory.d.ts

@@ -8,6 +8,8 @@ export default class FixtureFactory {
         cwd: string;
         namespace?: string;
     });
+    setCwd(cwd: string): void;
+    setNamespace(namespace: string): void;
     Fixture<Name extends FixtureName>(named: Name, options?: Partial<FixtureConstructorOptionsMap[Name]>): FixtureMap[Name];
     private getMercuryFixture;
     static destroy(): Promise<void>;

package/build/tests/fixtures/FixtureFactory.js

@@ -31,6 +31,12 @@ class FixtureFactory {
         }
         this.namespace = options.namespace;
     }
+    setCwd(cwd) {
+        this.cwd = cwd;
+    }
+    setNamespace(namespace) {
+        this.namespace = namespace;
+    }
     Fixture(named, options) {
         var _a, _b, _c, _d, _e;
         const mercuryFixture = this.getMercuryFixture(named);
@@ -101,7 +107,7 @@ class FixtureFactory {
                 });
                 break;
             case 'permission':
-                fixture = new PermissionFixture_1.default();
+                fixture = new PermissionFixture_1.default(mercuryFixture);
                 break;
             case 'view': {
                 if (!this.namespace) {
@@ -109,7 +115,7 @@ class FixtureFactory {
                 }
                 fixture = new ViewFixture_1.default(Object.assign({ 
                     //@ts-ignore
-                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: __1.ClientProxyDecorator.getInstance(), cwd: this.cwd }, options));
+                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: __1.ClientProxyDecorator.getInstance(), cwd: this.cwd, permissions: this.Fixture('permission') }, options));
                 break;
             }
         }

package/build/tests/fixtures/PermissionFixture.d.ts

@@ -1,5 +1,8 @@
 import FakeAuthorizer from '../FakeAuthorizer';
+import MercuryFixture from './MercuryFixture';
 export default class PermissionFixture {
+    private connectToApi;
+    constructor(mercury: MercuryFixture);
     static beforeEach(): void;
     getAuthorizer(): FakeAuthorizer;
     getAuthenticator(): import("@sprucelabs/heartwood-view-controllers").Authenticator;

package/build/tests/fixtures/PermissionFixture.js

@@ -4,13 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
+const spruce_permission_utils_1 = require("@sprucelabs/spruce-permission-utils");
 const FakeAuthorizer_1 = __importDefault(require("../FakeAuthorizer"));
 class PermissionFixture {
+    constructor(mercury) {
+        this.connectToApi = mercury.getConnectFactory();
+        spruce_permission_utils_1.AuthorizerFactory.setConnectToApi(this.connectToApi);
+    }
     static beforeEach() {
         process.env.SHOULD_REGISTER_PERMISSIONS = 'false';
+        spruce_permission_utils_1.AuthorizerFactory.reset();
+        spruce_permission_utils_1.AuthorizerFactory.setClass(FakeAuthorizer_1.default);
     }
     getAuthorizer() {
-        return FakeAuthorizer_1.default.getInstance();
+        return spruce_permission_utils_1.AuthorizerFactory.getInstance();
     }
     getAuthenticator() {
         return heartwood_view_controllers_1.AuthenticatorImpl.getInstance();

package/build/tests/fixtures/ViewFixture.d.ts

@@ -6,9 +6,9 @@ import { ClientProxyDecorator } from '../..';
 import { TokenGenerator } from '../../ClientProxyDecorator';
 import { TestConnectFactory } from '../../types/fixture.types';
 import { ArgsFromSvc } from '../../types/view.types';
-import FakeAuthorizer from '../FakeAuthorizer';
 import TestRouter from '../routers/TestRouter';
 import FixtureFactory from './FixtureFactory';
+import PermissionFixture from './PermissionFixture';
 import PersonFixture from './PersonFixture';
 import SpyScope from './SpyScope';
 type Factory = TestConnectFactory;
@@ -29,6 +29,7 @@ export default class ViewFixture {
     private locations;
     private proxyDecorator;
     private locale;
+    private permissions;
     static lockProxyCacheForPerson(id: any): void;
     static setShouldAutomaticallyResetAuth(shouldReset: false): void;
     constructor(options: {
@@ -40,6 +41,7 @@ export default class ViewFixture {
         controllerMap?: Record<string, any>;
         namespace: string;
         proxyDecorator: ClientProxyDecorator;
+        permissions: PermissionFixture;
     });
     getFactory(): ViewControllerFactory;
     getMaps(): import("../../utilities/SpyMapUtil").SpyMapUtil;
@@ -66,7 +68,7 @@ export default class ViewFixture {
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
-    getAuthorizer(): FakeAuthorizer;
+    getAuthorizer(): import("../FakeAuthorizer").default;
     getProxyTokenGenerator(): TokenGenerator | undefined;
     setProxyTokenGenerator(cb: TokenGenerator): void;
     loginAsDemoPerson(phone?: string): Promise<{

package/build/tests/fixtures/ViewFixture.js

@@ -12,7 +12,6 @@ const SpruceError_1 = __importDefault(require("../../errors/SpruceError"));
 const SpyMapUtil_1 = __importDefault(require("../../utilities/SpyMapUtil"));
 const vcDisk_utility_1 = __importDefault(require("../../utilities/vcDisk.utility"));
 const Fake_svc_1 = __importDefault(require("../Fake.svc"));
-const FakeAuthorizer_1 = __importDefault(require("../FakeAuthorizer"));
 const TestRouter_1 = __importDefault(require("../routers/TestRouter"));
 const SpyScope_1 = __importDefault(require("./SpyScope"));
 class ViewFixture {
@@ -34,6 +33,7 @@ class ViewFixture {
         this.orgs = options.fixtureFactory.Fixture('organization', {
             people: this.people,
         });
+        this.permissions = options.permissions;
         this.locale = new calendar_utils_1.LocaleImpl();
         this.locations = options.fixtureFactory.Fixture('location', {
             people: this.people,
@@ -147,7 +147,6 @@ class ViewFixture {
             };
         }
         TestRouter_1.default.reset();
-        FakeAuthorizer_1.default.reset();
         ViewFixture.resetMaps();
         heartwood_view_controllers_1.ActiveRecordCardViewController.setShouldThrowOnResponseError(true);
         process.env.SHOULD_REGISTER_VIEWS = 'false';
@@ -210,6 +209,7 @@ class ViewFixture {
             vcFactory: this.getFactory(),
             scope: this.getScope(),
             locale: this.getLocale(),
+            authorizer: this.permissions.getAuthorizer(),
         });
         return TestRouter_1.default.getInstance();
     }
@@ -217,13 +217,13 @@ class ViewFixture {
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthenticator() {
-        return heartwood_view_controllers_1.AuthenticatorImpl.getInstance();
+        return this.permissions.getAuthenticator();
     }
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthorizer() {
-        return FakeAuthorizer_1.default.getInstance();
+        return this.permissions.getAuthorizer();
     }
     getProxyTokenGenerator() {
         return this.proxyDecorator.getProxyTokenGenerator();
@@ -233,7 +233,7 @@ class ViewFixture {
     }
     async loginAsDemoPerson(phone) {
         const { person, token, client } = await this.people.loginAsDemoPerson(phone);
-        this.getAuthenticator().setSessionToken(token, person);
+        this.permissions.getAuthenticator().setSessionToken(token, person);
         this.proxyDecorator.setProxyTokenGenerator(async () => {
             if (!ViewFixture.loggedInPersonProxyTokens[person.id]) {
                 const proxyToken = client.registerProxyToken();

package/build/tests/routers/TestRouter.d.ts

@@ -1,5 +1,5 @@
 import { Locale } from '@sprucelabs/calendar-utils';
-import { Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
+import { Authorizer, Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
 import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager';
@@ -23,6 +23,8 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
     private scope;
     private locale;
     private readonly themes;
+    private authorizer;
+    private static authorizer;
     static setShouldThrowWhenRedirectingToBadSvc(shouldThrow: boolean): void;
     private constructor();
     static setShouldLoadDestinationVc(shouldLoad: boolean): void;
@@ -32,6 +34,7 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
         vcFactory: ViewControllerFactory;
         scope: Scope;
         locale: Locale;
+        authorizer: Authorizer;
     }): void;
     getPresentVc(): SkillViewController<any> | undefined;
     redirect<Id extends SkillViewControllerId>(id: Id, args?: SkillViewControllerArgs<Id>): Promise<SkillViewControllerMap[Id]>;