mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Remove redundant makeRegistrationUrl
prop (#25953)
This commit is contained in:
parent
6bce017823
commit
017fbb3793
2 changed files with 0 additions and 30 deletions
|
@ -34,7 +34,6 @@ import { createClient } from "matrix-js-sdk/src/matrix";
|
||||||
import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
|
import { SnakedObject } from "matrix-react-sdk/src/utils/SnakedObject";
|
||||||
import MatrixChat from "matrix-react-sdk/src/components/structures/MatrixChat";
|
import MatrixChat from "matrix-react-sdk/src/components/structures/MatrixChat";
|
||||||
import { ValidatedServerConfig } from "matrix-react-sdk/src/utils/ValidatedServerConfig";
|
import { ValidatedServerConfig } from "matrix-react-sdk/src/utils/ValidatedServerConfig";
|
||||||
import { QueryDict, encodeParams } from "matrix-js-sdk/src/utils";
|
|
||||||
|
|
||||||
import { parseQs } from "./url_utils";
|
import { parseQs } from "./url_utils";
|
||||||
import VectorBasePlatform from "./platform/VectorBasePlatform";
|
import VectorBasePlatform from "./platform/VectorBasePlatform";
|
||||||
|
@ -48,31 +47,6 @@ logger.log(`Application is running in ${process.env.NODE_ENV} mode`);
|
||||||
|
|
||||||
window.matrixLogger = logger;
|
window.matrixLogger = logger;
|
||||||
|
|
||||||
// We use this to work out what URL the SDK should
|
|
||||||
// pass through when registering to allow the user to
|
|
||||||
// click back to the client having registered.
|
|
||||||
// It's up to us to recognise if we're loaded with
|
|
||||||
// this URL and tell MatrixClient to resume registration.
|
|
||||||
//
|
|
||||||
// If we're in electron, we should never pass through a file:// URL otherwise
|
|
||||||
// the identity server will try to 302 the browser to it, which breaks horribly.
|
|
||||||
// so in that instance, hardcode to use app.element.io for now instead.
|
|
||||||
function makeRegistrationUrl(params: QueryDict): string {
|
|
||||||
let url: string;
|
|
||||||
if (window.location.protocol === "vector:") {
|
|
||||||
url = "https://app.element.io/#/register";
|
|
||||||
} else {
|
|
||||||
url = window.location.protocol + "//" + window.location.host + window.location.pathname + "#/register";
|
|
||||||
}
|
|
||||||
|
|
||||||
const encodedParams = encodeParams(params);
|
|
||||||
if (encodedParams) {
|
|
||||||
url += "?" + encodedParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
return url;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onTokenLoginCompleted(): void {
|
function onTokenLoginCompleted(): void {
|
||||||
// if we did a token login, we're now left with the token, hs and is
|
// if we did a token login, we're now left with the token, hs and is
|
||||||
// url as query params in the url;
|
// url as query params in the url;
|
||||||
|
@ -138,7 +112,6 @@ export async function loadApp(fragParams: {}): Promise<ReactElement> {
|
||||||
return (
|
return (
|
||||||
<MatrixChat
|
<MatrixChat
|
||||||
onNewScreen={onNewScreen}
|
onNewScreen={onNewScreen}
|
||||||
makeRegistrationUrl={makeRegistrationUrl}
|
|
||||||
config={config}
|
config={config}
|
||||||
realQueryParams={params}
|
realQueryParams={params}
|
||||||
startingFragmentQueryParams={fragParams}
|
startingFragmentQueryParams={fragParams}
|
||||||
|
|
|
@ -143,9 +143,6 @@ describe("loading:", function () {
|
||||||
enableGuest={true}
|
enableGuest={true}
|
||||||
onTokenLoginCompleted={resolve}
|
onTokenLoginCompleted={resolve}
|
||||||
initialScreenAfterLogin={getScreenFromLocation(windowLocation!)}
|
initialScreenAfterLogin={getScreenFromLocation(windowLocation!)}
|
||||||
makeRegistrationUrl={(): string => {
|
|
||||||
throw new Error("Not implemented");
|
|
||||||
}}
|
|
||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue