Skip to content

feat: integrate Element with Synapse REST auth provider #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liviaUeno wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: integrate Element with Synapse REST auth provider #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions apps/web/src/Login.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,29 +140,30 @@ export default class Login {
phoneNumber: string | undefined,
password: string,
): Promise<IMatrixClientCreds> {
const isEmail = !!username && username.indexOf("@") > 0;
// Nosso backend aceita apenas autenticação via m.id.user = email (workaround)
// const isEmail = !!username && username.indexOf("@") > 0;

let identifier;
if (phoneCountry && phoneNumber) {
identifier = {
type: "m.id.phone",
country: phoneCountry,
phone: phoneNumber,
// XXX: Synapse historically wanted `number` and not `phone`
number: phoneNumber,
};
} else if (isEmail) {
identifier = {
type: "m.id.thirdparty",
medium: "email",
address: username,
};
} else {
identifier = {
// let identifier;
// if (phoneCountry && phoneNumber) {
// identifier = {
// type: "m.id.phone",
// country: phoneCountry,
// phone: phoneNumber,
// // XXX: Synapse historically wanted `number` and not `phone`
// number: phoneNumber,
// }
// } else if (isEmail) {
// identifier = {
// type: "m.id.thirdparty",
// medium: "email",
// address: username,
// };
// } else {
const identifier = {
type: "m.id.user",
user: username,
};
}
// }

const loginParams = {
password,
Expand Down
38 changes: 28 additions & 10 deletions apps/web/src/components/views/auth/PasswordLogin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,23 +295,41 @@ export default class PasswordLogin extends React.PureComponent<IProps, IState> {
case LoginField.MatrixId:
classes.error = this.props.loginIncorrect && !this.props.username;
return (
<Field
id="mx_LoginForm_username"
// <Field
// id="mx_LoginForm_username"
// className={classNames(classes)}
// name="username" // make it a little easier for browser's remember-password
// autoComplete="username"
// key="username_input"
// type="text"
// label={_t("common|username")}
// placeholder={_t("common|username")}
// value={this.props.username}
// onChange={this.onUsernameChanged}
// onBlur={this.onUsernameBlur}
// disabled={this.props.busy}
// autoFocus={autoFocus}
// onValidate={this.onUsernameValidate}
// ref={(field): void => {
// this[LoginField.MatrixId] = field;
// }}
// />
<EmailField
id="mx_LoginForm_email"
className={classNames(classes)}
name="username" // make it a little easier for browser's remember-password
autoComplete="username"
key="username_input"
type="text"
label={_t("common|username")}
placeholder={_t("common|username")}
autoComplete="email"
type="email"
key="email_input"
placeholder="joe@example.com"
value={this.props.username}
onChange={this.onUsernameChanged}
onBlur={this.onUsernameBlur}
disabled={this.props.busy}
autoFocus={autoFocus}
onValidate={this.onUsernameValidate}
ref={(field): void => {
this[LoginField.MatrixId] = field;
onValidate={this.onEmailValidate}
fieldRef={(field): void => {
this[LoginField.Email] = field;
}}
/>
);
Expand Down