6392759bec
* Changed call sites from customisations/security to ModuleRunner.extensions * Updated depenndecy and added tests * Fixed style and formatting with prettier * Fix according to Element PR comments * Fixing issues raised in PR review * Removed commented code. Improved encapsulation. Removed noisy logging * Improved language of comment about calling the factory * Refactor to get better encapsulation * Find a better name. Provide explicit reset function. Provide more TSDoc * Simplify mock for cryptoSetup, and add assertion for exception message. * Remove unused className property. Adjust TSDoc comments * Fix linting and code style issues * Added test to ensure we canregister anduse experimental extensions * Fix linting and code-style issues * Added test to ensure only on registration of experimental extensions * Added test toensure call to getDehydratedDeviceCallback() * Test what happens when there is no implementation * Iterating cryptoSetup tests * Lint/prettier fix * Assert both branches when checking for dehydrationkey callback * Update src/modules/ModuleRunner.ts Language and formatting Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update src/modules/ModuleRunner.ts Reset by setting a fresh ExtensionsManager Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update src/modules/ModuleRunner.ts Use regular comment instead of TSDoc style comment Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update test/MatrixClientPeg-test.ts No need to extend the base class Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update src/modules/ModuleRunner.ts Fix spelling Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update src/modules/ModuleRunner.ts Fix spelling Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Update src/modules/ModuleRunner.ts Fix TSDoc formatting Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Simplify mock setup * Simplified mock and cleaned up a bit * Keeping track of extensions is an implementation detail internal to ExtensionsManager. Language and punctuation * Addressed issues and comments from PR review * Update src/modules/ModuleRunner.ts Keep the flags to track implementations as direct properties Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> * Fix flattening of implementation map * Update src/modules/ModuleRunner.ts Fix whitespace Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> --------- Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
138 lines
4.5 KiB
TypeScript
138 lines
4.5 KiB
TypeScript
/*
|
|
Copyright 2022 The Matrix.org Foundation C.I.C.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
import { RuntimeModule } from "@matrix-org/react-sdk-module-api/lib/RuntimeModule";
|
|
import { ModuleApi } from "@matrix-org/react-sdk-module-api/lib/ModuleApi";
|
|
import { AllExtensions } from "@matrix-org/react-sdk-module-api/lib/types/extensions";
|
|
import { ProvideCryptoSetupExtensions } from "@matrix-org/react-sdk-module-api/lib/lifecycles/CryptoSetupExtensions";
|
|
import { ProvideExperimentalExtensions } from "@matrix-org/react-sdk-module-api/lib/lifecycles/ExperimentalExtensions";
|
|
|
|
import { ModuleRunner } from "../../src/modules/ModuleRunner";
|
|
|
|
export class MockModule extends RuntimeModule {
|
|
public get apiInstance(): ModuleApi {
|
|
return this.moduleApi;
|
|
}
|
|
|
|
public constructor(moduleApi: ModuleApi) {
|
|
super(moduleApi);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Register a mock module
|
|
*
|
|
* @returns The registered module.
|
|
*/
|
|
export function registerMockModule(): MockModule {
|
|
let module: MockModule | undefined;
|
|
ModuleRunner.instance.registerModule((api) => {
|
|
if (module) {
|
|
throw new Error("State machine error: ModuleRunner created the module twice");
|
|
}
|
|
module = new MockModule(api);
|
|
return module;
|
|
});
|
|
if (!module) {
|
|
throw new Error("State machine error: ModuleRunner did not create module");
|
|
}
|
|
return module;
|
|
}
|
|
|
|
class MockModuleWithCryptoSetupExtension extends RuntimeModule {
|
|
public get apiInstance(): ModuleApi {
|
|
return this.moduleApi;
|
|
}
|
|
|
|
moduleName: string = MockModuleWithCryptoSetupExtension.name;
|
|
|
|
extensions: AllExtensions = {
|
|
cryptoSetup: {
|
|
SHOW_ENCRYPTION_SETUP_UI: true,
|
|
examineLoginResponse: jest.fn(),
|
|
persistCredentials: jest.fn(),
|
|
getSecretStorageKey: jest.fn().mockReturnValue(Uint8Array.from([0x11, 0x22, 0x99])),
|
|
createSecretStorageKey: jest.fn(),
|
|
catchAccessSecretStorageError: jest.fn(),
|
|
setupEncryptionNeeded: jest.fn(),
|
|
getDehydrationKeyCallback: jest.fn(),
|
|
} as ProvideCryptoSetupExtensions,
|
|
};
|
|
|
|
public constructor(moduleApi: ModuleApi) {
|
|
super(moduleApi);
|
|
}
|
|
}
|
|
|
|
class MockModuleWithExperimentalExtension extends RuntimeModule {
|
|
public get apiInstance(): ModuleApi {
|
|
return this.moduleApi;
|
|
}
|
|
|
|
moduleName: string = MockModuleWithExperimentalExtension.name;
|
|
|
|
extensions: AllExtensions = {
|
|
experimental: {
|
|
experimentalMethod: jest.fn().mockReturnValue(Uint8Array.from([0x22, 0x44, 0x88])),
|
|
} as ProvideExperimentalExtensions,
|
|
};
|
|
|
|
public constructor(moduleApi: ModuleApi) {
|
|
super(moduleApi);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Register a mock module which implements the cryptoSetup extension.
|
|
*
|
|
* @returns The registered module.
|
|
*/
|
|
export function registerMockModuleWithCryptoSetupExtension(): MockModuleWithCryptoSetupExtension {
|
|
let module: MockModuleWithCryptoSetupExtension | undefined;
|
|
|
|
ModuleRunner.instance.registerModule((api) => {
|
|
if (module) {
|
|
throw new Error("State machine error: ModuleRunner created the module twice");
|
|
}
|
|
module = new MockModuleWithCryptoSetupExtension(api);
|
|
return module;
|
|
});
|
|
if (!module) {
|
|
throw new Error("State machine error: ModuleRunner did not create module");
|
|
}
|
|
return module;
|
|
}
|
|
|
|
/**
|
|
* Register a mock module which implements the experimental extension.
|
|
*
|
|
* @returns The registered module.
|
|
*/
|
|
export function registerMockModuleWithExperimentalExtension(): MockModuleWithExperimentalExtension {
|
|
let module: MockModuleWithExperimentalExtension | undefined;
|
|
|
|
ModuleRunner.instance.registerModule((api) => {
|
|
if (module) {
|
|
throw new Error("State machine error: ModuleRunner created the module twice");
|
|
}
|
|
module = new MockModuleWithExperimentalExtension(api);
|
|
return module;
|
|
});
|
|
if (!module) {
|
|
throw new Error("State machine error: ModuleRunner did not create module");
|
|
}
|
|
return module;
|
|
}
|