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

Merge pull request #3178 from matrix-org/dbkr/delint_scalar_auth_client

Browse source 
De-lint ScalarAuthClient
This commit is contained in:
David Baker 2019-07-04 13:07:13 +01:00 committed by GitHub
commit 2b5d9961c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.eslintignore.errorfiles
View file

@ -66,7 +66,6 @@ src/rageshake/submit-rageshake.js
src/ratelimitedfunc.js
src/Roles.js
src/Rooms.js
src/ScalarAuthClient.js
src/UiEffects.js
src/Unread.js
src/utils/DecryptFile.js

18
src/ScalarAuthClient.js
View file

@ -96,24 +96,24 @@ class ScalarAuthClient {
registerForToken() {
// Get openid bearer token from the HS as the first part of our dance
return MatrixClientPeg.get().getOpenIdToken().then((token_object) => {
return MatrixClientPeg.get().getOpenIdToken().then((tokenObject) => {
// Now we can send that to scalar and exchange it for a scalar token
return this.exchangeForScalarToken(token_object);
}).then((token_object) => {
window.localStorage.setItem("mx_scalar_token", token_object);
return token_object;
return this.exchangeForScalarToken(tokenObject);
}).then((tokenObject) => {
window.localStorage.setItem("mx_scalar_token", tokenObject);
return tokenObject;
});
}
exchangeForScalarToken(openid_token_object) {
const scalar_rest_url = SdkConfig.get().integrations_rest_url;
exchangeForScalarToken(openidTokenObject) {
const scalarRestUrl = SdkConfig.get().integrations_rest_url;
return new Promise(function(resolve, reject) {
request({
method: 'POST',
uri: scalar_rest_url+'/register',
uri: scalarRestUrl + '/register',
qs: {v: imApiVersion},
body: openid_token_object,
body: openidTokenObject,
json: true,
}, (err, response, body) => {
if (err) {