matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-05 00:42:10 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/12

Browse Source 
 Conflicts:
	src/client.ts
	src/interactive-auth.ts
	src/models/search-result.ts
This commit is contained in:
Michael Telatynski
2021-07-23 23:46:15 +01:00
parent e775bcac3c dc154a00a8
commit c2b5b14d26
66 changed files with 4485 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interactive-auth.ts
View File

@@ -264,9 +264,7 @@ export class InteractiveAuth {
client_secret: this.clientSecret,
};
if (await this.matrixClient.doesServerRequireIdServerParam()) {
const idServerParsedUrl = url.parse(
this.matrixClient.getIdentityServerUrl(),
);
const idServerParsedUrl = new URL(this.matrixClient.getIdentityServerUrl());
creds.id_server = idServerParsedUrl.host;
}
authDict = {
@@ -294,7 +292,7 @@ export class InteractiveAuth {
/**
* get the client secret used for validation sessions
* with the ID server.
* with the identity server.
*
* @return {string} client secret
*/