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

PR feedback 

Reintroduce replaceClient so we're not calling replaceUsingAccessToken without access tokens which is a bit silly.
Fix bug from previous commit (pass isGuest through)
pull/21833/head
David Baker 2016-07-25 16:28:28 +01:00
parent 587a86441f
commit cbf10bfff6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MatrixClientPeg.js
View File

@ -55,7 +55,7 @@ class MatrixClientPeg {
* Home Server / Identity Server URLs but no credentials * Home Server / Identity Server URLs but no credentials
*/ */
replaceUsingUrls(hs_url, is_url) { replaceUsingUrls(hs_url, is_url) {
this.replaceUsingAccessToken(hs_url, is_url); this._replaceClient(hs_url, is_url);
} }
/** /**
@ -63,6 +63,10 @@ class MatrixClientPeg {
* Home Server / Identity Server URLs and active credentials * Home Server / Identity Server URLs and active credentials
*/ */
replaceUsingAccessToken(hs_url, is_url, user_id, access_token, isGuest) { replaceUsingAccessToken(hs_url, is_url, user_id, access_token, isGuest) {
this._replaceClient(hs_url, is_url, user_id, access_token, isGuest);
}
_replaceClient(hs_url, is_url, user_id, access_token, isGuest) {
if (localStorage) { if (localStorage) {
try { try {
localStorage.clear(); localStorage.clear();
@ -70,7 +74,7 @@ class MatrixClientPeg {
console.warn("Error clearing local storage", e); console.warn("Error clearing local storage", e);
} }
} }
this._createClient(hs_url, is_url, user_id, access_token); this._createClient(hs_url, is_url, user_id, access_token, isGuest);
if (localStorage) { if (localStorage) {
try { try {
@ -126,7 +130,7 @@ class MatrixClientPeg {
} }
} }
_createClient(hs_url, is_url, user_id, access_token) { _createClient(hs_url, is_url, user_id, access_token, isGuest) {
var opts = { var opts = {
baseUrl: hs_url, baseUrl: hs_url,
idBaseUrl: is_url, idBaseUrl: is_url,