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

Merge pull request #2782 from matrix-org/jaywink/use-versioned-scalar-api

Browse source 
Add versioning to integration manager API /register and /account calls
This commit is contained in:
Jason Robinson 2019-03-13 12:50:27 +02:00 committed by GitHub
commit 1f1d966033
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ScalarAuthClient.js
View file

@ -21,6 +21,9 @@ const request = require('browser-request');
const SdkConfig = require('./SdkConfig'); const SdkConfig = require('./SdkConfig');
const MatrixClientPeg = require('./MatrixClientPeg'); const MatrixClientPeg = require('./MatrixClientPeg');
// The version of the integration manager API we're intending to work with
const imApiVersion = "1.1";
class ScalarAuthClient { class ScalarAuthClient {
constructor() { constructor() {
this.scalarToken = null; this.scalarToken = null;
@ -66,7 +69,7 @@ class ScalarAuthClient {
request({ request({
method: "GET", method: "GET",
uri: url, uri: url,
qs: {scalar_token: token}, qs: {scalar_token: token, v: imApiVersion},
json: true, json: true,
}, (err, response, body) => { }, (err, response, body) => {
if (err) { if (err) {
@ -100,6 +103,7 @@ class ScalarAuthClient {
request({ request({
method: 'POST', method: 'POST',
uri: scalar_rest_url+'/register', uri: scalar_rest_url+'/register',
qs: {v: imApiVersion},
body: openid_token_object, body: openid_token_object,
json: true, json: true,
}, (err, response, body) => { }, (err, response, body) => {