PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix Identity Server terms accepting not working as expected (#12109)

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-01-08 10:27:03 +00:00 committed by GitHub
parent 578ae36470
commit 35e99d69d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/IdentityAuthClient.tsx
View file

@ -57,8 +57,13 @@ export default class IdentityAuthClient {
} }
} }
// This client must not be used for general operations as it may not have a baseUrl or be running (tempClient).
private get identityClient(): MatrixClient {
return this.tempClient ?? this.matrixClient;
}
private get matrixClient(): MatrixClient { private get matrixClient(): MatrixClient {
return this.tempClient ? this.tempClient : MatrixClientPeg.safeGet(); return MatrixClientPeg.safeGet();
} }
private writeToken(): void { private writeToken(): void {
@ -117,10 +122,10 @@ export default class IdentityAuthClient {
} }
private async checkToken(token: string): Promise<void> { private async checkToken(token: string): Promise<void> {
const identityServerUrl = this.matrixClient.getIdentityServerUrl()!; const identityServerUrl = this.identityClient.getIdentityServerUrl()!;
try { try {
await this.matrixClient.getIdentityAccount(token); await this.identityClient.getIdentityAccount(token);
} catch (e) { } catch (e) {
if (e instanceof MatrixError && e.errcode === "M_TERMS_NOT_SIGNED") { if (e instanceof MatrixError && e.errcode === "M_TERMS_NOT_SIGNED") {
logger.log("Identity server requires new terms to be agreed to"); logger.log("Identity server requires new terms to be agreed to");
@ -171,7 +176,8 @@ export default class IdentityAuthClient {
public async registerForToken(check = true): Promise<string> { public async registerForToken(check = true): Promise<string> {
const hsOpenIdToken = await MatrixClientPeg.safeGet().getOpenIdToken(); const hsOpenIdToken = await MatrixClientPeg.safeGet().getOpenIdToken();
// XXX: The spec is `token`, but we used `access_token` for a Sydent release. // XXX: The spec is `token`, but we used `access_token` for a Sydent release.
const { access_token: accessToken, token } = await this.matrixClient.registerWithIdentityServer(hsOpenIdToken); const { access_token: accessToken, token } =
await this.identityClient.registerWithIdentityServer(hsOpenIdToken);
const identityAccessToken = token ? token : accessToken; const identityAccessToken = token ? token : accessToken;
if (check) await this.checkToken(identityAccessToken); if (check) await this.checkToken(identityAccessToken);
return identityAccessToken; return identityAccessToken;