change names of consts for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
84d81ff09b
commit
096045a037
3 changed files with 14 additions and 14 deletions
|
@ -25,8 +25,8 @@ import {CheckUpdatesPayload} from "./dispatcher/payloads/CheckUpdatesPayload";
|
||||||
import {Action} from "./dispatcher/actions";
|
import {Action} from "./dispatcher/actions";
|
||||||
import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
|
import {hideToast as hideUpdateToast} from "./toasts/UpdateToast";
|
||||||
|
|
||||||
export const HS_URL_LS_KEY = "mx_hs_url";
|
export const HOMESERVER_URL_KEY = "mx_hs_url";
|
||||||
export const IS_URL_LS_KEY = "mx_is_url";
|
export const ID_SERVER_URL_KEY = "mx_is_url";
|
||||||
|
|
||||||
export enum UpdateCheckStatus {
|
export enum UpdateCheckStatus {
|
||||||
Checking = "CHECKING",
|
Checking = "CHECKING",
|
||||||
|
@ -235,9 +235,9 @@ export default abstract class BasePlatform {
|
||||||
*/
|
*/
|
||||||
startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
|
startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
|
||||||
// persist hs url and is url for when the user is returned to the app with the login token
|
// persist hs url and is url for when the user is returned to the app with the login token
|
||||||
localStorage.setItem(HS_URL_LS_KEY, mxClient.getHomeserverUrl());
|
localStorage.setItem(HOMESERVER_URL_KEY, mxClient.getHomeserverUrl());
|
||||||
if (mxClient.getIdentityServerUrl()) {
|
if (mxClient.getIdentityServerUrl()) {
|
||||||
localStorage.setItem(IS_URL_LS_KEY, mxClient.getIdentityServerUrl());
|
localStorage.setItem(ID_SERVER_URL_KEY, mxClient.getIdentityServerUrl());
|
||||||
}
|
}
|
||||||
const callbackUrl = this.getSSOCallbackUrl(fragmentAfterLogin);
|
const callbackUrl = this.getSSOCallbackUrl(fragmentAfterLogin);
|
||||||
window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
|
window.location.href = mxClient.getSsoLoginUrl(callbackUrl.toString(), loginType); // redirect to SSO
|
||||||
|
|
|
@ -41,7 +41,7 @@ import {IntegrationManagers} from "./integrations/IntegrationManagers";
|
||||||
import {Mjolnir} from "./mjolnir/Mjolnir";
|
import {Mjolnir} from "./mjolnir/Mjolnir";
|
||||||
import DeviceListener from "./DeviceListener";
|
import DeviceListener from "./DeviceListener";
|
||||||
import {Jitsi} from "./widgets/Jitsi";
|
import {Jitsi} from "./widgets/Jitsi";
|
||||||
import {HS_URL_LS_KEY, IS_URL_LS_KEY} from "./BasePlatform";
|
import {HOMESERVER_URL_KEY, ID_SERVER_URL_KEY} from "./BasePlatform";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called at startup, to attempt to build a logged-in Matrix session. It tries
|
* Called at startup, to attempt to build a logged-in Matrix session. It tries
|
||||||
|
@ -164,8 +164,8 @@ export function attemptTokenLogin(queryParams, defaultDeviceDisplayName) {
|
||||||
return Promise.resolve(false);
|
return Promise.resolve(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
const homeserver = localStorage.getItem(HS_URL_LS_KEY);
|
const homeserver = localStorage.getItem(HOMESERVER_URL_KEY);
|
||||||
const identityServer = localStorage.getItem(IS_URL_LS_KEY);
|
const identityServer = localStorage.getItem(ID_SERVER_URL_KEY);
|
||||||
if (!homeserver) {
|
if (!homeserver) {
|
||||||
console.warn("Cannot log in with token: can't determine HS URL to use");
|
console.warn("Cannot log in with token: can't determine HS URL to use");
|
||||||
return Promise.resolve(false);
|
return Promise.resolve(false);
|
||||||
|
@ -259,8 +259,8 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
|
||||||
* @returns {Object} Information about the session - see implementation for variables.
|
* @returns {Object} Information about the session - see implementation for variables.
|
||||||
*/
|
*/
|
||||||
export function getLocalStorageSessionVars() {
|
export function getLocalStorageSessionVars() {
|
||||||
const hsUrl = localStorage.getItem(HS_URL_LS_KEY);
|
const hsUrl = localStorage.getItem(HOMESERVER_URL_KEY);
|
||||||
const isUrl = localStorage.getItem(IS_URL_LS_KEY);
|
const isUrl = localStorage.getItem(ID_SERVER_URL_KEY);
|
||||||
const accessToken = localStorage.getItem("mx_access_token");
|
const accessToken = localStorage.getItem("mx_access_token");
|
||||||
const userId = localStorage.getItem("mx_user_id");
|
const userId = localStorage.getItem("mx_user_id");
|
||||||
const deviceId = localStorage.getItem("mx_device_id");
|
const deviceId = localStorage.getItem("mx_device_id");
|
||||||
|
@ -489,9 +489,9 @@ function _showStorageEvictedDialog() {
|
||||||
class AbortLoginAndRebuildStorage extends Error { }
|
class AbortLoginAndRebuildStorage extends Error { }
|
||||||
|
|
||||||
function _persistCredentialsToLocalStorage(credentials) {
|
function _persistCredentialsToLocalStorage(credentials) {
|
||||||
localStorage.setItem(HS_URL_LS_KEY, credentials.homeserverUrl);
|
localStorage.setItem(HOMESERVER_URL_KEY, credentials.homeserverUrl);
|
||||||
if (credentials.identityServerUrl) {
|
if (credentials.identityServerUrl) {
|
||||||
localStorage.setItem(IS_URL_LS_KEY, credentials.identityServerUrl);
|
localStorage.setItem(ID_SERVER_URL_KEY, credentials.identityServerUrl);
|
||||||
}
|
}
|
||||||
localStorage.setItem("mx_user_id", credentials.userId);
|
localStorage.setItem("mx_user_id", credentials.userId);
|
||||||
localStorage.setItem("mx_access_token", credentials.accessToken);
|
localStorage.setItem("mx_access_token", credentials.accessToken);
|
||||||
|
|
|
@ -25,7 +25,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
|
||||||
import {sendLoginRequest} from "../../../Login";
|
import {sendLoginRequest} from "../../../Login";
|
||||||
import AuthPage from "../../views/auth/AuthPage";
|
import AuthPage from "../../views/auth/AuthPage";
|
||||||
import SSOButton from "../../views/elements/SSOButton";
|
import SSOButton from "../../views/elements/SSOButton";
|
||||||
import {HS_URL_LS_KEY, IS_URL_LS_KEY} from "../../../BasePlatform";
|
import {HOMESERVER_URL_KEY, ID_SERVER_URL_KEY} from "../../../BasePlatform";
|
||||||
|
|
||||||
const LOGIN_VIEW = {
|
const LOGIN_VIEW = {
|
||||||
LOADING: 1,
|
LOADING: 1,
|
||||||
|
@ -158,8 +158,8 @@ export default class SoftLogout extends React.Component {
|
||||||
async trySsoLogin() {
|
async trySsoLogin() {
|
||||||
this.setState({busy: true});
|
this.setState({busy: true});
|
||||||
|
|
||||||
const hsUrl = localStorage.getItem(HS_URL_LS_KEY);
|
const hsUrl = localStorage.getItem(HOMESERVER_URL_KEY);
|
||||||
const isUrl = localStorage.getItem(IS_URL_LS_KEY) || MatrixClientPeg.get().getIdentityServerUrl();
|
const isUrl = localStorage.getItem(ID_SERVER_URL_KEY) || MatrixClientPeg.get().getIdentityServerUrl();
|
||||||
const loginType = "m.login.token";
|
const loginType = "m.login.token";
|
||||||
const loginParams = {
|
const loginParams = {
|
||||||
token: this.props.realQueryParams['loginToken'],
|
token: this.props.realQueryParams['loginToken'],
|
||||||
|
|
Loading…
Reference in a new issue