Allow fixed homeserver (#142)
This commit is contained in:
@@ -82,6 +82,7 @@ const LoginPage = ({ theme }) => {
|
||||
const setLocale = useSetLocale();
|
||||
const translate = useTranslate();
|
||||
const base_url = localStorage.getItem("base_url");
|
||||
const cfg_base_url = process.env.REACT_APP_SERVER;
|
||||
|
||||
const renderInput = ({
|
||||
meta: { touched, error } = {},
|
||||
@@ -149,7 +150,7 @@ const LoginPage = ({ theme }) => {
|
||||
const [serverVersion, setServerVersion] = useState("");
|
||||
|
||||
const handleUsernameChange = _ => {
|
||||
if (formData.base_url) return;
|
||||
if (formData.base_url || cfg_base_url) return;
|
||||
// check if username is a full qualified userId then set base_url accordially
|
||||
const home_server = extractHomeServer(formData.username);
|
||||
const wellKnownUrl = `https://${home_server}/.well-known/matrix/client`;
|
||||
@@ -201,6 +202,7 @@ const LoginPage = ({ theme }) => {
|
||||
label={translate("ra.auth.username")}
|
||||
disabled={loading}
|
||||
onBlur={handleUsernameChange}
|
||||
resettable
|
||||
fullWidth
|
||||
/>
|
||||
</div>
|
||||
@@ -211,6 +213,7 @@ const LoginPage = ({ theme }) => {
|
||||
label={translate("ra.auth.password")}
|
||||
type="password"
|
||||
disabled={loading}
|
||||
resettable
|
||||
fullWidth
|
||||
/>
|
||||
</div>
|
||||
@@ -219,7 +222,8 @@ const LoginPage = ({ theme }) => {
|
||||
name="base_url"
|
||||
component={renderInput}
|
||||
label={translate("synapseadmin.auth.base_url")}
|
||||
disabled={loading}
|
||||
disabled={cfg_base_url || loading}
|
||||
resettable
|
||||
fullWidth
|
||||
/>
|
||||
</div>
|
||||
@@ -230,7 +234,7 @@ const LoginPage = ({ theme }) => {
|
||||
|
||||
return (
|
||||
<Form
|
||||
initialValues={{ base_url: base_url }}
|
||||
initialValues={{ base_url: cfg_base_url || base_url }}
|
||||
onSubmit={handleSubmit}
|
||||
validate={validate}
|
||||
render={({ handleSubmit }) => (
|
||||
|
@@ -3,6 +3,9 @@ import { fetchUtils } from "react-admin";
|
||||
const authProvider = {
|
||||
// called when the user attempts to log in
|
||||
login: ({ base_url, username, password }) => {
|
||||
// force homeserver for protection in case the form is manipulated
|
||||
base_url = process.env.REACT_APP_SERVER || base_url;
|
||||
|
||||
console.log("login ");
|
||||
const options = {
|
||||
method: "POST",
|
||||
|
Reference in New Issue
Block a user