Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move normalizeHomeserver into session container

Browse source 
Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
This commit is contained in:
RMidhunSuresh 2021-08-17 17:31:14 +05:30
parent c4e7dc3b5a
commit 7b9ec5516a
4 changed files with 15 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/domain/login/LoginViewModel.js
View file

@ -17,7 +17,6 @@ limitations under the License.
import {ViewModel} from "../ViewModel.js";
import {PasswordLoginViewModel} from "./PasswordLoginViewModel.js";
import {StartSSOLoginViewModel} from "./StartSSOLoginViewModel.js";
import {normalizeHomeserver} from "./common.js";
import {CompleteSSOLoginViewModel} from "./CompleteSSOLoginViewModel.js";
export class LoginViewModel extends ViewModel {
@ -46,10 +45,9 @@ export class LoginViewModel extends ViewModel {
this.emitChange("completeSSOLoginViewModel");
}
else {
const defaultHomeServer = normalizeHomeserver(this._defaultHomeServer);
await this.queryLogin(defaultHomeServer);
await this.queryLogin(this._defaultHomeServer);
this._showPasswordLogin();
this._showSSOLogin(defaultHomeServer);
this._showSSOLogin(this._defaultHomeServer);
}
}
@ -80,9 +78,8 @@ export class LoginViewModel extends ViewModel {
}
async _onHomeServerChange(homeserver) {
const normalizedHS = normalizeHomeserver(homeserver);
await this.queryLogin(normalizedHS);
this._showSSOLogin(normalizedHS);
await this.queryLogin(homeserver);
this._showSSOLogin(homeserver);
}
childOptions(options) {

2
src/domain/login/PasswordLoginViewModel.js
View file

@ -17,7 +17,6 @@ limitations under the License.
import {ViewModel} from "../ViewModel.js";
import {SessionLoadViewModel} from "../SessionLoadViewModel.js";
import {ObservableValue} from "../../observable/ObservableValue.js";
import {normalizeHomeserver} from "./common.js";
export class PasswordLoginViewModel extends ViewModel {
constructor(options) {
@ -50,7 +49,6 @@ export class PasswordLoginViewModel extends ViewModel {
}
async login(username, password, homeserver) {
homeserver = normalizeHomeserver(homeserver);
this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription);
if (this._loadViewModel) {
this._loadViewModel = this.disposeTracked(this._loadViewModel);

23
src/domain/login/common.js
View file

@ -1,23 +0,0 @@
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
export function normalizeHomeserver(homeServer) {
try {
return new URL(homeServer).origin;
} catch (err) {
return new URL(`https://${homeServer}`).origin;
}
}

13
src/matrix/SessionContainer.js
View file

@ -27,6 +27,14 @@ import {PasswordLoginMethod} from "./login/PasswordLoginMethod.js";
import {TokenLoginMethod} from "./login/TokenLoginMethod.js";
import {SSOLoginHelper} from "./login/SSOLoginHelper.js";
function normalizeHomeserver(homeServer) {
try {
return new URL(homeServer).origin;
} catch (err) {
return new URL(`https://${homeServer}`).origin;
}
}
export const LoadStatus = createEnum(
"NotLoading",
"Login",
@ -114,9 +122,10 @@ export class SessionContainer {
}
async queryLogin(homeServer) {
const hsApi = new HomeServerApi({homeServer, request: this._platform.request});
const normalizedHS = normalizeHomeserver(homeServer);
const hsApi = new HomeServerApi({homeServer: normalizedHS, request: this._platform.request});
const response = await hsApi.queryLogin().response();
return this.parseLoginOptions(response, homeServer);
return this.parseLoginOptions(response, normalizedHS);
}
async startWithLogin(loginMethod) {