mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 11:35:04 +01:00
Code Issues Projects Releases Wiki Activity

Check correct login method early

Browse Source 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-08-17 20:54:24 +05:30
parent 83f4095d88
commit 13cb8979ac
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/domain/login/CompleteSSOLoginViewModel.js
View File

@ -41,15 +41,18 @@ export class CompleteSSOLoginViewModel extends ViewModel {
} }
const homeserver = await this.platform.settingsStorage.getString("sso_ongoing_login_homeserver"); const homeserver = await this.platform.settingsStorage.getString("sso_ongoing_login_homeserver");
const loginOptions = await this._sessionContainer.queryLogin(homeserver); const loginOptions = await this._sessionContainer.queryLogin(homeserver);
if (!loginOptions.token) {
const path = this.navigation.pathFrom([this.navigation.segment("session")]);
this.navigation.applyPath(path);
return;
}
this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription); this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription);
if (this._loadViewModel) { if (this._loadViewModel) {
this._loadViewModel = this.disposeTracked(this._loadViewModel); this._loadViewModel = this.disposeTracked(this._loadViewModel);
} }
this._loadViewModel = this.track(new SessionLoadViewModel(this.childOptions({ this._loadViewModel = this.track(new SessionLoadViewModel(this.childOptions({
createAndStartSessionContainer: async () => { createAndStartSessionContainer: async () => {
if (loginOptions.sso) { this._sessionContainer.startWithLogin(loginOptions.token(this._loginToken));
this._sessionContainer.startWithLogin(loginOptions.token(this._loginToken));
}
return this._sessionContainer; return this._sessionContainer;
}, },
ready: this._ready, ready: this._ready,

9
src/domain/login/PasswordLoginViewModel.js
View File

@ -49,15 +49,18 @@ export class PasswordLoginViewModel extends ViewModel {
} }
async login(username, password, homeserver) { async login(username, password, homeserver) {
if (!this._loginOptions.password) {
const path = this.navigation.pathFrom([this.navigation.segment("session")]);
this.navigation.applyPath(path);
return;
}
this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription); this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription);
if (this._loadViewModel) { if (this._loadViewModel) {
this._loadViewModel = this.disposeTracked(this._loadViewModel); this._loadViewModel = this.disposeTracked(this._loadViewModel);
} }
this._loadViewModel = this.track(new SessionLoadViewModel(this.childOptions({ this._loadViewModel = this.track(new SessionLoadViewModel(this.childOptions({
createAndStartSessionContainer: async () => { createAndStartSessionContainer: async () => {
if (this._loginOptions.password) { this._sessionContainer.startWithLogin(this._loginOptions.password(username, password));
this._sessionContainer.startWithLogin(this._loginOptions.password(username, password));
}
return this._sessionContainer; return this._sessionContainer;
}, },
ready: this._ready, ready: this._ready,