mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2024-12-23 03:25:12 +01:00
Use homeserver from login method
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
parent
94ba93acb5
commit
0e6139d5e3
@ -95,8 +95,7 @@ export class LoginViewModel extends ViewModel {
|
|||||||
this._passwordLoginViewModel = this.track(new PasswordLoginViewModel(
|
this._passwordLoginViewModel = this.track(new PasswordLoginViewModel(
|
||||||
this.childOptions({
|
this.childOptions({
|
||||||
loginOptions: this._loginOptions,
|
loginOptions: this._loginOptions,
|
||||||
homeserver: this._homeserver,
|
attemptLogin: loginMethod => this.attemptLogin(loginMethod)
|
||||||
attemptLogin: loginMethod => this.attemptLogin(loginMethod),
|
|
||||||
})));
|
})));
|
||||||
this.emitChange("passwordLoginViewModel");
|
this.emitChange("passwordLoginViewModel");
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,9 @@ import {LoginFailure} from "../../matrix/SessionContainer.js";
|
|||||||
export class PasswordLoginViewModel extends ViewModel {
|
export class PasswordLoginViewModel extends ViewModel {
|
||||||
constructor(options) {
|
constructor(options) {
|
||||||
super(options);
|
super(options);
|
||||||
const {loginOptions, homeserver, attemptLogin} = options;
|
const {loginOptions, attemptLogin} = options;
|
||||||
this._loginOptions = loginOptions;
|
this._loginOptions = loginOptions;
|
||||||
this._attemptLogin = attemptLogin;
|
this._attemptLogin = attemptLogin;
|
||||||
this._homeserver = homeserver;
|
|
||||||
this._isBusy = false;
|
this._isBusy = false;
|
||||||
this._errorMessage = "";
|
this._errorMessage = "";
|
||||||
}
|
}
|
||||||
@ -43,14 +42,15 @@ export class PasswordLoginViewModel extends ViewModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async login(username, password) {
|
async login(username, password) {
|
||||||
const status = await this._attemptLogin(this._loginOptions.password(username, password));
|
const loginMethod = this._loginOptions.password(username, password);
|
||||||
|
const status = await this._attemptLogin(loginMethod);
|
||||||
let error = "";
|
let error = "";
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case LoginFailure.Credentials:
|
case LoginFailure.Credentials:
|
||||||
error = this.i18n`Your username and/or password don't seem to be correct.`;
|
error = this.i18n`Your username and/or password don't seem to be correct.`;
|
||||||
break;
|
break;
|
||||||
case LoginFailure.Connection:
|
case LoginFailure.Connection:
|
||||||
error = this.i18n`Can't connect to ${this._homeserver}.`;
|
error = this.i18n`Can't connect to ${loginMethod.homeServer}.`;
|
||||||
break;
|
break;
|
||||||
case LoginFailure.Unknown:
|
case LoginFailure.Unknown:
|
||||||
error = this.i18n`Something went wrong while checking your login and password.`;
|
error = this.i18n`Something went wrong while checking your login and password.`;
|
||||||
|
Loading…
Reference in New Issue
Block a user