+import { myAuth, setIsoData } from "@utils/app";
+import { isBrowser } from "@utils/browser";
import { Component, linkEvent } from "inferno";
-import { T } from "inferno-i18next-dess";
-import {
- GetCaptchaResponse,
- GetSiteResponse,
- Login as LoginForm,
- LoginResponse,
- PasswordReset,
- Register,
- SiteView,
- UserOperation,
-} from "lemmy-js-client";
-import { Subscription } from "rxjs";
-import { i18n } from "../../i18next";
-import { UserService, WebSocketService } from "../../services";
-import {
- authField,
- isBrowser,
- joinLemmyUrl,
- setIsoData,
- toast,
- validEmail,
- wsClient,
- wsJsonToRes,
- wsSubscribe,
- wsUserOp,
-} from "../../utils";
+import { NavLink } from "inferno-router";
+import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
+import { I18NextService, UserService } from "../../services";
+import { HttpService, RequestState } from "../../services/HttpService";
+import { toast } from "../../toast";
import { HtmlTags } from "../common/html-tags";
-import { Icon, Spinner } from "../common/icon";
+import { Spinner } from "../common/icon";
interface State {
- loginForm: LoginForm;
- registerForm: Register;
- loginLoading: boolean;
- registerLoading: boolean;
- captcha: GetCaptchaResponse;
- captchaPlaying: boolean;
- site_view: SiteView;
+ loginRes: RequestState<LoginResponse>;
+ form: {
+ username_or_email?: string;
+ password?: string;
+ totp_2fa_token?: string;
+ };
+ showTotp: boolean;
+ siteRes: GetSiteResponse;
}
export class Login extends Component<any, State> {
private isoData = setIsoData(this.context);
- private subscription: Subscription;
- private audio: HTMLAudioElement;
- emptyState: State = {
- loginForm: {
- username_or_email: undefined,
- password: undefined,
- },
- registerForm: {
- username: undefined,
- password: undefined,
- password_verify: undefined,
- show_nsfw: false,
- captcha_uuid: undefined,
- captcha_answer: undefined,
- },
- loginLoading: false,
- registerLoading: false,
- captcha: undefined,
- captchaPlaying: false,
- site_view: this.isoData.site_res.site_view,
+ state: State = {
+ loginRes: { state: "empty" },
+ form: {},
+ showTotp: false,
+ siteRes: this.isoData.site_res,
};
constructor(props: any, context: any) {
super(props, context);
-
- this.state = this.emptyState;
-
- this.parseMessage = this.parseMessage.bind(this);
- this.subscription = wsSubscribe(this.parseMessage);
-
- if (isBrowser()) {
- WebSocketService.Instance.send(wsClient.getCaptcha());
- }
}
- componentWillUnmount() {
- if (isBrowser()) {
- this.subscription.unsubscribe();
+ componentDidMount() {
+ // Navigate to home if already logged in
+ if (UserService.Instance.myUserInfo) {
+ this.context.router.history.push("/");
}
}
get documentTitle(): string {
- return `${i18n.t("login")} - ${this.state.site_view.site.name}`;
+ return `${I18NextService.i18n.t("login")} - ${
+ this.state.siteRes.site_view.site.name
+ }`;
}
get isLemmyMl(): boolean {
render() {
return (
- <div class="container">
+ <div className="login container-lg">
<HtmlTags
title={this.documentTitle}
path={this.context.router.route.match.url}
/>
- <div class="row">
- <div class="col-12 col-lg-6 mb-4">{this.loginForm()}</div>
- <div class="col-12 col-lg-6">{this.registerForm()}</div>
+ <div className="row">
+ <div className="col-12 col-lg-6 offset-lg-3">{this.loginForm()}</div>
</div>
</div>
);
return (
<div>
<form onSubmit={linkEvent(this, this.handleLoginSubmit)}>
- <h5>{i18n.t("login")}</h5>
- <div class="form-group row">
+ <h1 className="h4 mb-4">{I18NextService.i18n.t("login")}</h1>
+ <div className="mb-3 row">
<label
- class="col-sm-2 col-form-label"
+ className="col-sm-2 col-form-label"
htmlFor="login-email-or-username"
>
- {i18n.t("email_or_username")}
+ {I18NextService.i18n.t("email_or_username")}
</label>
- <div class="col-sm-10">
+ <div className="col-sm-10">
<input
type="text"
- class="form-control"
+ className="form-control"
id="login-email-or-username"
- value={this.state.loginForm.username_or_email}
+ value={this.state.form.username_or_email}
onInput={linkEvent(this, this.handleLoginUsernameChange)}
autoComplete="email"
required
/>
</div>
</div>
- <div class="form-group row">
- <label class="col-sm-2 col-form-label" htmlFor="login-password">
- {i18n.t("password")}
+ <div className="mb-3 row">
+ <label className="col-sm-2 col-form-label" htmlFor="login-password">
+ {I18NextService.i18n.t("password")}
</label>
- <div class="col-sm-10">
+ <div className="col-sm-10">
<input
type="password"
id="login-password"
- value={this.state.loginForm.password}
+ value={this.state.form.password}
onInput={linkEvent(this, this.handleLoginPasswordChange)}
- class="form-control"
+ className="form-control"
autoComplete="current-password"
required
maxLength={60}
/>
- <button
- type="button"
- onClick={linkEvent(this, this.handlePasswordReset)}
+ <NavLink
className="btn p-0 btn-link d-inline-block float-right text-muted small font-weight-bold pointer-events not-allowed"
- disabled={!validEmail(this.state.loginForm.username_or_email)}
- title={i18n.t("no_password_reset")}
+ to="/login_reset"
>
- {i18n.t("forgot_password")}
- </button>
+ {I18NextService.i18n.t("forgot_password")}
+ </NavLink>
</div>
</div>
- <div class="form-group row">
- <div class="col-sm-10">
- <button type="submit" class="btn btn-secondary">
- {this.state.loginLoading ? <Spinner /> : i18n.t("login")}
- </button>
- </div>
- </div>
- </form>
- </div>
- );
- }
-
- registerForm() {
- return (
- <form onSubmit={linkEvent(this, this.handleRegisterSubmit)}>
- <h5>{i18n.t("sign_up")}</h5>
-
- <div class="form-group row">
- <label class="col-sm-2 col-form-label" htmlFor="register-username">
- {i18n.t("username")}
- </label>
-
- <div class="col-sm-10">
- <input
- type="text"
- id="register-username"
- class="form-control"
- value={this.state.registerForm.username}
- onInput={linkEvent(this, this.handleRegisterUsernameChange)}
- required
- minLength={3}
- pattern="[a-zA-Z0-9_]+"
- />
- </div>
- </div>
-
- <div class="form-group row">
- <label class="col-sm-2 col-form-label" htmlFor="register-email">
- {i18n.t("email")}
- </label>
- <div class="col-sm-10">
- <input
- type="email"
- id="register-email"
- class="form-control"
- placeholder={i18n.t("optional")}
- value={this.state.registerForm.email}
- autoComplete="email"
- onInput={linkEvent(this, this.handleRegisterEmailChange)}
- minLength={3}
- />
- {!validEmail(this.state.registerForm.email) && (
- <div class="mt-2 mb-0 alert alert-light" role="alert">
- <Icon icon="alert-triangle" classes="icon-inline mr-2" />
- {i18n.t("no_password_reset")}
- </div>
- )}
- </div>
- </div>
-
- <div class="form-group row">
- <label class="col-sm-2 col-form-label" htmlFor="register-password">
- {i18n.t("password")}
- </label>
- <div class="col-sm-10">
- <input
- type="password"
- id="register-password"
- value={this.state.registerForm.password}
- autoComplete="new-password"
- onInput={linkEvent(this, this.handleRegisterPasswordChange)}
- maxLength={60}
- class="form-control"
- required
- />
- </div>
- </div>
-
- <div class="form-group row">
- <label
- class="col-sm-2 col-form-label"
- htmlFor="register-verify-password"
- >
- {i18n.t("verify_password")}
- </label>
- <div class="col-sm-10">
- <input
- type="password"
- id="register-verify-password"
- value={this.state.registerForm.password_verify}
- autoComplete="new-password"
- onInput={linkEvent(this, this.handleRegisterPasswordVerifyChange)}
- maxLength={60}
- class="form-control"
- required
- />
- </div>
- </div>
-
- {this.state.captcha && (
- <div class="form-group row">
- <label class="col-sm-2" htmlFor="register-captcha">
- <span class="mr-2">{i18n.t("enter_code")}</span>
- <button
- type="button"
- class="btn btn-secondary"
- onClick={linkEvent(this, this.handleRegenCaptcha)}
- aria-label={i18n.t("captcha")}
+ {this.state.showTotp && (
+ <div className="mb-3 row">
+ <label
+ className="col-sm-6 col-form-label"
+ htmlFor="login-totp-token"
>
- <Icon icon="refresh-cw" classes="icon-refresh-cw" />
- </button>
- </label>
- {this.showCaptcha()}
- <div class="col-sm-6">
- <input
- type="text"
- class="form-control"
- id="register-captcha"
- value={this.state.registerForm.captcha_answer}
- onInput={linkEvent(
- this,
- this.handleRegisterCaptchaAnswerChange
- )}
- required
- />
- </div>
- </div>
- )}
- {this.state.site_view.site.enable_nsfw && (
- <div class="form-group row">
- <div class="col-sm-10">
- <div class="form-check">
+ {I18NextService.i18n.t("two_factor_token")}
+ </label>
+ <div className="col-sm-6">
<input
- class="form-check-input"
- id="register-show-nsfw"
- type="checkbox"
- checked={this.state.registerForm.show_nsfw}
- onChange={linkEvent(this, this.handleRegisterShowNsfwChange)}
+ type="number"
+ inputMode="numeric"
+ className="form-control"
+ id="login-totp-token"
+ pattern="[0-9]*"
+ autoComplete="one-time-code"
+ value={this.state.form.totp_2fa_token}
+ onInput={linkEvent(this, this.handleLoginTotpChange)}
/>
- <label class="form-check-label" htmlFor="register-show-nsfw">
- {i18n.t("show_nsfw")}
- </label>
</div>
</div>
- </div>
- )}
- {this.isLemmyMl && (
- <div class="mt-2 mb-0 alert alert-light" role="alert">
- <T i18nKey="lemmy_ml_registration_message">
- #<a href={joinLemmyUrl}>#</a>
- </T>
- </div>
- )}
- <div class="form-group row">
- <div class="col-sm-10">
- <button type="submit" class="btn btn-secondary">
- {this.state.registerLoading ? <Spinner /> : i18n.t("sign_up")}
- </button>
- </div>
- </div>
- </form>
- );
- }
-
- showCaptcha() {
- return (
- <div class="col-sm-4">
- {this.state.captcha.ok && (
- <>
- <img
- class="rounded-top img-fluid"
- src={this.captchaPngSrc()}
- style="border-bottom-right-radius: 0; border-bottom-left-radius: 0;"
- alt={i18n.t("captcha")}
- />
- {this.state.captcha.ok.wav && (
- <button
- class="rounded-bottom btn btn-sm btn-secondary btn-block"
- style="border-top-right-radius: 0; border-top-left-radius: 0;"
- title={i18n.t("play_captcha_audio")}
- onClick={linkEvent(this, this.handleCaptchaPlay)}
- type="button"
- disabled={this.state.captchaPlaying}
- >
- <Icon icon="play" classes="icon-play" />
+ )}
+ <div className="mb-3 row">
+ <div className="col-sm-10">
+ <button type="submit" className="btn btn-secondary">
+ {this.state.loginRes.state == "loading" ? (
+ <Spinner />
+ ) : (
+ I18NextService.i18n.t("login")
+ )}
</button>
- )}
- </>
- )}
+ </div>
+ </div>
+ </form>
</div>
);
}
- handleLoginSubmit(i: Login, event: any) {
+ async handleLoginSubmit(i: Login, event: any) {
event.preventDefault();
- i.state.loginLoading = true;
- i.setState(i.state);
- WebSocketService.Instance.send(wsClient.login(i.state.loginForm));
- }
-
- handleLoginUsernameChange(i: Login, event: any) {
- i.state.loginForm.username_or_email = event.target.value;
- i.setState(i.state);
- }
+ const { password, totp_2fa_token, username_or_email } = i.state.form;
+
+ if (username_or_email && password) {
+ i.setState({ loginRes: { state: "loading" } });
+
+ const loginRes = await HttpService.client.login({
+ username_or_email,
+ password,
+ totp_2fa_token,
+ });
+ switch (loginRes.state) {
+ case "failed": {
+ if (loginRes.msg === "missing_totp_token") {
+ i.setState({ showTotp: true });
+ toast(I18NextService.i18n.t("enter_two_factor_code"), "info");
+ }
+
+ i.setState({ loginRes: { state: "failed", msg: loginRes.msg } });
+ break;
+ }
- handleLoginPasswordChange(i: Login, event: any) {
- i.state.loginForm.password = event.target.value;
- i.setState(i.state);
- }
+ case "success": {
+ UserService.Instance.login({
+ res: loginRes.data,
+ });
+ const site = await HttpService.client.getSite({
+ auth: myAuth(),
+ });
- handleRegisterSubmit(i: Login, event: any) {
- event.preventDefault();
- i.state.registerLoading = true;
- i.setState(i.state);
- WebSocketService.Instance.send(wsClient.register(i.state.registerForm));
- }
+ if (site.state === "success") {
+ UserService.Instance.myUserInfo = site.data.my_user;
+ }
- handleRegisterUsernameChange(i: Login, event: any) {
- i.state.registerForm.username = event.target.value;
- i.setState(i.state);
- }
+ i.props.history.action === "PUSH"
+ ? i.props.history.back()
+ : i.props.history.replace("/");
- handleRegisterEmailChange(i: Login, event: any) {
- i.state.registerForm.email = event.target.value;
- if (i.state.registerForm.email == "") {
- i.state.registerForm.email = undefined;
+ break;
+ }
+ }
}
- i.setState(i.state);
}
- handleRegisterPasswordChange(i: Login, event: any) {
- i.state.registerForm.password = event.target.value;
- i.setState(i.state);
- }
-
- handleRegisterPasswordVerifyChange(i: Login, event: any) {
- i.state.registerForm.password_verify = event.target.value;
- i.setState(i.state);
- }
-
- handleRegisterShowNsfwChange(i: Login, event: any) {
- i.state.registerForm.show_nsfw = event.target.checked;
- i.setState(i.state);
- }
-
- handleRegisterCaptchaAnswerChange(i: Login, event: any) {
- i.state.registerForm.captcha_answer = event.target.value;
+ handleLoginUsernameChange(i: Login, event: any) {
+ i.state.form.username_or_email = event.target.value.trim();
i.setState(i.state);
}
- handleRegenCaptcha(i: Login) {
- i.audio = null;
- i.state.captchaPlaying = false;
+ handleLoginTotpChange(i: Login, event: any) {
+ i.state.form.totp_2fa_token = event.target.value;
i.setState(i.state);
- WebSocketService.Instance.send(wsClient.getCaptcha());
- }
-
- handlePasswordReset(i: Login, event: any) {
- event.preventDefault();
- let resetForm: PasswordReset = {
- email: i.state.loginForm.username_or_email,
- };
- WebSocketService.Instance.send(wsClient.passwordReset(resetForm));
}
- handleCaptchaPlay(i: Login) {
- // This was a bad bug, it should only build the new audio on a new file.
- // Replays would stop prematurely if this was rebuilt every time.
- if (i.audio == null) {
- let base64 = `data:audio/wav;base64,${i.state.captcha.ok.wav}`;
- i.audio = new Audio(base64);
- }
-
- i.audio.play();
-
- i.state.captchaPlaying = true;
+ handleLoginPasswordChange(i: Login, event: any) {
+ i.state.form.password = event.target.value;
i.setState(i.state);
-
- i.audio.addEventListener("ended", () => {
- i.audio.currentTime = 0;
- i.state.captchaPlaying = false;
- i.setState(i.state);
- });
- }
-
- captchaPngSrc() {
- return `data:image/png;base64,${this.state.captcha.ok.png}`;
- }
-
- parseMessage(msg: any) {
- let op = wsUserOp(msg);
- console.log(msg);
- if (msg.error) {
- toast(i18n.t(msg.error), "danger");
- this.state = this.emptyState;
- this.state.registerForm.captcha_answer = undefined;
- // Refetch another captcha
- WebSocketService.Instance.send(wsClient.getCaptcha());
- this.setState(this.state);
- return;
- } else {
- if (op == UserOperation.Login) {
- let data = wsJsonToRes<LoginResponse>(msg).data;
- this.state = this.emptyState;
- this.setState(this.state);
- UserService.Instance.login(data);
- WebSocketService.Instance.send(
- wsClient.userJoin({
- auth: authField(),
- })
- );
- toast(i18n.t("logged_in"));
- this.props.history.push("/");
- } else if (op == UserOperation.Register) {
- let data = wsJsonToRes<LoginResponse>(msg).data;
- this.state = this.emptyState;
- this.setState(this.state);
- UserService.Instance.login(data);
- WebSocketService.Instance.send(
- wsClient.userJoin({
- auth: authField(),
- })
- );
- this.props.history.push("/communities");
- } else if (op == UserOperation.GetCaptcha) {
- let data = wsJsonToRes<GetCaptchaResponse>(msg).data;
- if (data.ok) {
- this.state.captcha = data;
- this.state.registerForm.captcha_uuid = data.ok.uuid;
- this.setState(this.state);
- }
- } else if (op == UserOperation.PasswordReset) {
- toast(i18n.t("reset_password_mail_sent"));
- } else if (op == UserOperation.GetSite) {
- let data = wsJsonToRes<GetSiteResponse>(msg).data;
- this.state.site_view = data.site_view;
- this.setState(this.state);
- }
- }
}
}
projects / lemmy-ui.git / blobdiff