OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3602 from matrix-org/travis/fix-identity-register 

Match identity server registration to the IS r0.3.0 spec
pull/21833/head
Travis Ralston 2019-11-08 08:08:47 -07:00 committed by GitHub
parent 3645e4a822 f0e02f59b4
commit 59dccb86ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/IdentityAuthClient.js
View File

@ -183,8 +183,10 @@ export default class IdentityAuthClient {
async registerForToken(check=true) { async registerForToken(check=true) {
try { try {
const hsOpenIdToken = await MatrixClientPeg.get().getOpenIdToken(); const hsOpenIdToken = await MatrixClientPeg.get().getOpenIdToken();
const { access_token: identityAccessToken } = // XXX: The spec is `token`, but we used `access_token` for a Sydent release.
const { access_token: accessToken, token } =
await this._matrixClient.registerWithIdentityServer(hsOpenIdToken); await this._matrixClient.registerWithIdentityServer(hsOpenIdToken);
const identityAccessToken = token ? token : accessToken;
if (check) await this._checkToken(identityAccessToken); if (check) await this._checkToken(identityAccessToken);
return identityAccessToken; return identityAccessToken;
} catch (e) { } catch (e) {