X-Git-Url: http://these/git/?a=blobdiff_plain;f=src%2Fshared%2Fcomponents%2Fperson%2Fpassword-change.tsx;h=565f55e6ce2853d0be7c6e53bf294d2a163a0632;hb=c3ab9e74f8775f4b811866d2675b00f9702bde3d;hp=42a287e6d591c43facf3d780fe48ee5c52d5bdbf;hpb=6320357d21bab63f6c4af285ff879b6c601ed48f;p=lemmy-ui.git

diff --git a/src/shared/components/person/password-change.tsx b/src/shared/components/person/password-change.tsx
index 42a287e..565f55e 100644
--- a/src/shared/components/person/password-change.tsx
+++ b/src/shared/components/person/password-change.tsx
@@ -1,81 +1,55 @@
-import { None } from "@sniptt/monads";
+import { myAuth, setIsoData } from "@utils/app";
+import { capitalizeFirstLetter } from "@utils/helpers";
 import { Component, linkEvent } from "inferno";
-import {
-  GetSiteResponse,
-  LoginResponse,
-  PasswordChange as PasswordChangeForm,
-  UserOperation,
-  wsJsonToRes,
-  wsUserOp,
-} from "lemmy-js-client";
-import { Subscription } from "rxjs";
-import { i18n } from "../../i18next";
-import { UserService, WebSocketService } from "../../services";
-import {
-  capitalizeFirstLetter,
-  isBrowser,
-  setIsoData,
-  toast,
-  wsClient,
-  wsSubscribe,
-} from "../../utils";
+import { GetSiteResponse, LoginResponse } from "lemmy-js-client";
+import { HttpService, I18NextService, UserService } from "../../services";
+import { RequestState } from "../../services/HttpService";
 import { HtmlTags } from "../common/html-tags";
 import { Spinner } from "../common/icon";
 
 interface State {
-  passwordChangeForm: PasswordChangeForm;
-  loading: boolean;
+  passwordChangeRes: RequestState<LoginResponse>;
+  form: {
+    token: string;
+    password?: string;
+    password_verify?: string;
+  };
   siteRes: GetSiteResponse;
 }
 
 export class PasswordChange extends Component<any, State> {
   private isoData = setIsoData(this.context);
-  private subscription: Subscription;
 
-  emptyState: State = {
-    passwordChangeForm: new PasswordChangeForm({
-      token: this.props.match.params.token,
-      password: undefined,
-      password_verify: undefined,
-    }),
-    loading: false,
+  state: State = {
+    passwordChangeRes: { state: "empty" },
     siteRes: this.isoData.site_res,
+    form: {
+      token: this.props.match.params.token,
+    },
   };
 
   constructor(props: any, context: any) {
     super(props, context);
-
-    this.state = this.emptyState;
-
-    this.parseMessage = this.parseMessage.bind(this);
-    this.subscription = wsSubscribe(this.parseMessage);
-  }
-
-  componentWillUnmount() {
-    if (isBrowser()) {
-      this.subscription.unsubscribe();
-    }
   }
 
   get documentTitle(): string {
-    return this.state.siteRes.site_view.match({
-      some: siteView => `${i18n.t("password_change")} - ${siteView.site.name}`,
-      none: "",
-    });
+    return `${I18NextService.i18n.t("password_change")} - ${
+      this.state.siteRes.site_view.site.name
+    }`;
   }
 
   render() {
     return (
-      <div className="container">
+      <div className="password-change container-lg">
         <HtmlTags
           title={this.documentTitle}
           path={this.context.router.route.match.url}
-          description={None}
-          image={None}
         />
         <div className="row">
           <div className="col-12 col-lg-6 offset-lg-3 mb-4">
-            <h5>{i18n.t("password_change")}</h5>
+            <h1 className="h4 mb-4">
+              {I18NextService.i18n.t("password_change")}
+            </h1>
             {this.passwordChangeForm()}
           </div>
         </div>
@@ -86,15 +60,15 @@ export class PasswordChange extends Component<any, State> {
   passwordChangeForm() {
     return (
       <form onSubmit={linkEvent(this, this.handlePasswordChangeSubmit)}>
-        <div className="form-group row">
+        <div className="mb-3 row">
           <label className="col-sm-2 col-form-label" htmlFor="new-password">
-            {i18n.t("new_password")}
+            {I18NextService.i18n.t("new_password")}
           </label>
           <div className="col-sm-10">
             <input
               id="new-password"
               type="password"
-              value={this.state.passwordChangeForm.password}
+              value={this.state.form.password}
               onInput={linkEvent(this, this.handlePasswordChange)}
               className="form-control"
               required
@@ -102,15 +76,15 @@ export class PasswordChange extends Component<any, State> {
             />
           </div>
         </div>
-        <div className="form-group row">
+        <div className="mb-3 row">
           <label className="col-sm-2 col-form-label" htmlFor="verify-password">
-            {i18n.t("verify_password")}
+            {I18NextService.i18n.t("verify_password")}
           </label>
           <div className="col-sm-10">
             <input
               id="verify-password"
               type="password"
-              value={this.state.passwordChangeForm.password_verify}
+              value={this.state.form.password_verify}
               onInput={linkEvent(this, this.handleVerifyPasswordChange)}
               className="form-control"
               required
@@ -118,13 +92,13 @@ export class PasswordChange extends Component<any, State> {
             />
           </div>
         </div>
-        <div className="form-group row">
+        <div className="mb-3 row">
           <div className="col-sm-10">
             <button type="submit" className="btn btn-secondary">
-              {this.state.loading ? (
+              {this.state.passwordChangeRes.state == "loading" ? (
                 <Spinner />
               ) : (
-                capitalizeFirstLetter(i18n.t("save"))
+                capitalizeFirstLetter(I18NextService.i18n.t("save"))
               )}
             </button>
           </div>
@@ -134,36 +108,44 @@ export class PasswordChange extends Component<any, State> {
   }
 
   handlePasswordChange(i: PasswordChange, event: any) {
-    i.state.passwordChangeForm.password = event.target.value;
+    i.state.form.password = event.target.value;
     i.setState(i.state);
   }
 
   handleVerifyPasswordChange(i: PasswordChange, event: any) {
-    i.state.passwordChangeForm.password_verify = event.target.value;
+    i.state.form.password_verify = event.target.value;
     i.setState(i.state);
   }
 
-  handlePasswordChangeSubmit(i: PasswordChange, event: any) {
+  async handlePasswordChangeSubmit(i: PasswordChange, event: any) {
     event.preventDefault();
-    i.setState({ loading: true });
+    i.setState({ passwordChangeRes: { state: "loading" } });
 
-    WebSocketService.Instance.send(
-      wsClient.passwordChange(i.state.passwordChangeForm)
-    );
-  }
+    const password = i.state.form.password;
+    const password_verify = i.state.form.password_verify;
+
+    if (password && password_verify) {
+      i.setState({
+        passwordChangeRes: await HttpService.client.passwordChangeAfterReset({
+          token: i.state.form.token,
+          password,
+          password_verify,
+        }),
+      });
+
+      if (i.state.passwordChangeRes.state === "success") {
+        const data = i.state.passwordChangeRes.data;
+        UserService.Instance.login({
+          res: data,
+        });
+
+        const site = await HttpService.client.getSite({ auth: myAuth() });
+        if (site.state === "success") {
+          UserService.Instance.myUserInfo = site.data.my_user;
+        }
 
-  parseMessage(msg: any) {
-    let op = wsUserOp(msg);
-    console.log(msg);
-    if (msg.error) {
-      toast(i18n.t(msg.error), "danger");
-      this.setState({ loading: false });
-      return;
-    } else if (op == UserOperation.PasswordChange) {
-      let data = wsJsonToRes<LoginResponse>(msg, LoginResponse);
-      this.setState(this.emptyState);
-      UserService.Instance.login(data);
-      this.props.history.push("/");
+        i.props.history.replace("/");
+      }
     }
   }
 }