imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the shared secret registration API directly (#7774)

Browse source 
* Use the shared secret registration API directly

rather than invoking the synapse module to do it. It's probably
a bit simpler, if anything, and allows for synapse to be run in
a separate container (or rather, avoids the javascript having to have
a copy of synapse source & server config).

* Make registration secret required

Update commander (8 major versions!) to get requiredOption

* Wrong options object :/
This commit is contained in:
David Baker 2022-02-11 17:03:22 +00:00 • committed by GitHub
parent 0e3b559671
commit 1c3507bc11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 58 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/end-to-end-tests/start.ts
View file

@ -15,12 +15,14 @@ limitations under the License.
*/
import * as fs from "fs";
import program = require('commander');
import { Command } from "commander";
import { ElementSession } from './src/session';
import { scenario } from './src/scenario';
import { RestSessionCreator } from './src/rest/creator';
const program = new Command();
program
.option('--no-logs', "don't output logs, document html on error", false)
.option('--app-url [url]', "url to test", "http://localhost:5000")
@ -30,6 +32,7 @@ program
.option('--throttle-cpu [factor]', "factor to slow down the cpu with", parseFloat, 1.0)
.option('--no-sandbox', "same as puppeteer arg", false)
.option('--log-directory <dir>', 'a directory to dump html and network logs in when the tests fail')
.requiredOption('--registration-shared-secret <secret>', 'the secret to use for registering users')
.parse(process.argv);
const hsUrl = 'http://localhost:5005';
@ -37,12 +40,12 @@ const hsUrl = 'http://localhost:5005';
async function runTests() {
const sessions = [];
const options = {
slowMo: program.slowMo ? 20 : undefined,
devtools: program.devTools,
headless: !program.windowed,
slowMo: program.opts().slowMo ? 20 : undefined,
devtools: program.opts().devTools,
headless: !program.opts().windowed,
args: [],
};
if (!program.sandbox) {
if (!program.opts().sandbox) {
options.args.push('--no-sandbox', '--disable-setuid-sandbox');
}
if (process.env.CHROME_PATH) {
@ -52,13 +55,14 @@ async function runTests() {
}
const restCreator = new RestSessionCreator(
'../synapse/installations/consent/env/bin',
hsUrl,
__dirname,
program.opts().registrationSharedSecret,
);
async function createSession(username) {
const session = await ElementSession.create(username, options, program.appUrl, hsUrl, program.throttleCpu);
const session = await ElementSession.create(
username, options, program.opts().appUrl, hsUrl, program.opts().throttleCpu,
);
sessions.push(session);
return session;
}
@ -69,8 +73,8 @@ async function runTests() {
} catch (err) {
failure = true;
console.log('failure: ', err);
if (program.logDirectory) {
await writeLogs(sessions, program.logDirectory);
if (program.opts().logDirectory) {
await writeLogs(sessions, program.opts().logDirectory);
}
}