mirror of
https://github.com/matrix-org/mjolnir.git
synced 2024-07-01 00:51:36 +00:00
Ensure tests support E2EE
This commit is contained in:
parent
75047fda95
commit
83df9deb6a
|
@ -1,7 +1,7 @@
|
|||
import axios from "axios";
|
||||
import { HmacSHA1 } from "crypto-js";
|
||||
import e from "express";
|
||||
import { LogService, MatrixClient, MemoryStorageProvider, PantalaimonClient } from "matrix-bot-sdk";
|
||||
import { LogService, MatrixClient, MemoryStorageProvider, PantalaimonClient, RustSdkCryptoStorageProvider } from "matrix-bot-sdk";
|
||||
import config from "../../src/config";
|
||||
|
||||
const REGISTRATION_ATTEMPTS = 10;
|
||||
|
@ -82,8 +82,13 @@ export async function registerNewTestUser(isAdmin: boolean, label: string = "")
|
|||
*/
|
||||
export async function newTestUser(isAdmin: boolean = false, label: string = ""): Promise<MatrixClient> {
|
||||
const username = await registerNewTestUser(isAdmin, label);
|
||||
const pantalaimon = new PantalaimonClient(config.homeserverUrl, new MemoryStorageProvider());
|
||||
return await pantalaimon.createClientWithCredentials(username, username);
|
||||
if (config.pantalaimon) {
|
||||
const pantalaimon = new PantalaimonClient(config.homeserverUrl, new MemoryStorageProvider());
|
||||
return await pantalaimon.createClientWithCredentials(username, username);
|
||||
} else {
|
||||
const client = new MatrixClient(config.homeserverUrl, config.accessToken, new MemoryStorageProvider(), new RustSdkCryptoStorageProvider(config.dataPath));
|
||||
client.crypto.prepare(await client.getJoinedRooms());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -19,7 +19,8 @@ import {
|
|||
MemoryStorageProvider,
|
||||
LogService,
|
||||
LogLevel,
|
||||
RichConsoleLogger
|
||||
RichConsoleLogger,
|
||||
RustSdkCryptoStorageProvider
|
||||
} from "matrix-bot-sdk";
|
||||
import { Mjolnir} from '../../src/Mjolnir';
|
||||
import config from "../../src/config";
|
||||
|
@ -80,8 +81,14 @@ export async function makeMjolnir(): Promise<Mjolnir> {
|
|||
LogService.setLogger(new RichConsoleLogger());
|
||||
LogService.setLevel(LogLevel.fromString(config.logLevel, LogLevel.DEBUG));
|
||||
LogService.info("test/mjolnirSetupUtils", "Starting bot...");
|
||||
const pantalaimon = new PantalaimonClient(config.homeserverUrl, new MemoryStorageProvider());
|
||||
const client = await pantalaimon.createClientWithCredentials(config.pantalaimon.username, config.pantalaimon.password);
|
||||
let client: MatrixClient;
|
||||
if (config.pantalaimon) {
|
||||
const pantalaimon = new PantalaimonClient(config.homeserverUrl, new MemoryStorageProvider());
|
||||
client = await pantalaimon.createClientWithCredentials(config.pantalaimon.username, config.pantalaimon.password);
|
||||
} else {
|
||||
client = new MatrixClient(config.homeserverUrl, config.accessToken, new MemoryStorageProvider(), new RustSdkCryptoStorageProvider(config.dataPath));
|
||||
client.crypto.prepare(await client.getJoinedRooms());
|
||||
}
|
||||
patchMatrixClient();
|
||||
await ensureAliasedRoomExists(client, config.managementRoom);
|
||||
let mjolnir = await Mjolnir.setupMjolnirFromConfig(client);
|
||||
|
|
Loading…
Reference in New Issue
Block a user