@springmicro/auth 0.3.0 → 0.3.4

package/src/components/forms/PasswordChecker.ts

@@ -1,88 +1,88 @@
-// Copyright 2023 The Casdoor Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import i18next from "i18next";
-
-function isValidOption_AtLeast6(password: string) {
-  if (password.length < 6) {
-    return i18next.t("user:The password must have at least 6 characters");
-  }
-  return "";
-}
-
-function isValidOption_AtLeast8(password: string) {
-  if (password.length < 8) {
-    return i18next.t("user:The password must have at least 8 characters");
-  }
-  return "";
-}
-
-function isValidOption_Aa123(password: string) {
-  const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).+$/;
-  if (!regex.test(password)) {
-    return i18next.t(
-      "user:The password must contain at least one uppercase letter, one lowercase letter and one digit"
-    );
-  }
-  return "";
-}
-
-function isValidOption_SpecialChar(password: string) {
-  const regex = /^(?=.*[!-/:-@[-`{-~]).+$/;
-  if (!regex.test(password)) {
-    return i18next.t(
-      "user:The password must contain at least one special character"
-    );
-  }
-  return "";
-}
-
-function isValidOption_NoRepeat(password: string) {
-  const regex = /(.)\1+/;
-  if (regex.test(password)) {
-    return i18next.t(
-      "user:The password must not contain any repeated characters"
-    );
-  }
-  return "";
-}
-
-export function checkPasswordComplexity(password: string, options: any) {
-  if (password.length === 0) {
-    return i18next.t("login:Please input your password!");
-  }
-
-  if (!options || options.length === 0) {
-    options = ["AtLeast6"];
-  }
-
-  const checkers = {
-    AtLeast6: isValidOption_AtLeast6,
-    AtLeast8: isValidOption_AtLeast8,
-    Aa123: isValidOption_Aa123,
-    SpecialChar: isValidOption_SpecialChar,
-    NoRepeat: isValidOption_NoRepeat,
-  };
-
-  for (const option of options) {
-    const checkerFunc = checkers[option as keyof typeof checkers];
-    if (checkerFunc) {
-      const errorMsg = checkerFunc(password);
-      if (errorMsg !== "") {
-        return errorMsg;
-      }
-    }
-  }
-  return "";
-}
+// Copyright 2023 The Casdoor Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import i18next from "i18next";
+
+function isValidOption_AtLeast6(password: string) {
+  if (password.length < 6) {
+    return i18next.t("user:The password must have at least 6 characters");
+  }
+  return "";
+}
+
+function isValidOption_AtLeast8(password: string) {
+  if (password.length < 8) {
+    return i18next.t("user:The password must have at least 8 characters");
+  }
+  return "";
+}
+
+function isValidOption_Aa123(password: string) {
+  const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9]).+$/;
+  if (!regex.test(password)) {
+    return i18next.t(
+      "user:The password must contain at least one uppercase letter, one lowercase letter and one digit"
+    );
+  }
+  return "";
+}
+
+function isValidOption_SpecialChar(password: string) {
+  const regex = /^(?=.*[!-/:-@[-`{-~]).+$/;
+  if (!regex.test(password)) {
+    return i18next.t(
+      "user:The password must contain at least one special character"
+    );
+  }
+  return "";
+}
+
+function isValidOption_NoRepeat(password: string) {
+  const regex = /(.)\1+/;
+  if (regex.test(password)) {
+    return i18next.t(
+      "user:The password must not contain any repeated characters"
+    );
+  }
+  return "";
+}
+
+export function checkPasswordComplexity(password: string, options: any) {
+  if (password.length === 0) {
+    return i18next.t("login:Please input your password!");
+  }
+
+  if (!options || options.length === 0) {
+    options = ["AtLeast6"];
+  }
+
+  const checkers = {
+    AtLeast6: isValidOption_AtLeast6,
+    AtLeast8: isValidOption_AtLeast8,
+    Aa123: isValidOption_Aa123,
+    SpecialChar: isValidOption_SpecialChar,
+    NoRepeat: isValidOption_NoRepeat,
+  };
+
+  for (const option of options) {
+    const checkerFunc = checkers[option as keyof typeof checkers];
+    if (checkerFunc) {
+      const errorMsg = checkerFunc(password);
+      if (errorMsg !== "") {
+        return errorMsg;
+      }
+    }
+  }
+  return "";
+}

package/src/components/forms/SendCodeInput.tsx

@@ -1,149 +1,149 @@
-// Copyright 2021 The Casdoor Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React from "react";
-import i18next from "i18next";
-import * as UserBackend from "./util/user-api";
-import { CaptchaModal } from "./CaptchaModal";
-import type { Application } from "./util/provider";
-import { useTranslation } from "react-i18next";
-
-type ButtonClickArgsTuple = [
-  dest: any,
-  type: any,
-  applicationId: any,
-  checkUser?: string,
-];
-
-export type SendCodeInputProps = {
-  value?: any;
-  disabled: boolean;
-  textBefore?: string;
-  onChange: Function;
-  onButtonClickArgs: ButtonClickArgsTuple;
-  application: Application;
-  method: string;
-  countryCode: string;
-};
-
-export const SendCodeInput = ({
-  value,
-  disabled,
-  textBefore,
-  onChange,
-  onButtonClickArgs,
-  application,
-  method,
-  countryCode,
-}: SendCodeInputProps) => {
-  const { t } = useTranslation();
-  const [visible, setVisible] = React.useState(false);
-  const [buttonLeftTime, setButtonLeftTime] = React.useState(0);
-  const [buttonLoading, setButtonLoading] = React.useState(false);
-  const dialogRef = React.useRef<HTMLElement | null>(null);
-
-  const handleCountDown = (leftTime = 60) => {
-    let leftTimeSecond = leftTime;
-    setButtonLeftTime(leftTimeSecond);
-    const countDown = () => {
-      leftTimeSecond--;
-      setButtonLeftTime(leftTimeSecond);
-      if (leftTimeSecond === 0) {
-        return;
-      }
-      setTimeout(countDown, 1000);
-    };
-    setTimeout(countDown, 1000);
-  };
-
-  const handleOk = (
-    captchaType: string,
-    captchaToken: string,
-    clientSecret: string
-  ) => {
-    setVisible(false);
-    setButtonLoading(true);
-    UserBackend.sendCode(
-      captchaType,
-      captchaToken,
-      clientSecret,
-      method,
-      countryCode,
-      ...onButtonClickArgs
-    ).then((res: any) => {
-      setButtonLoading(false);
-      if (res) {
-        handleCountDown(60);
-      }
-    });
-  };
-
-  const handleCancel = () => {
-    setVisible(false);
-  };
-
-  React.useEffect(() => {
-    dialogRef.current = document.getElementById("captcha-modal");
-  }, []);
-
-  React.useEffect(() => {
-    if (dialogRef.current) {
-      if (visible) {
-        // @ts-ignore
-        dialogRef.current.showModal();
-      } else {
-        // @ts-ignore
-        dialogRef.current.close();
-      }
-    }
-  }, [visible]);
-
-  return (
-    <React.Fragment>
-      <div className="flex">
-        <input
-          className="input"
-          // addonBefore={textBefore}
-          disabled={disabled}
-          value={value}
-          // prefix={<SafetyOutlined />}
-          placeholder={"Enter your code"}
-          onChange={(e: any) => onChange(e.target.value)}
-          // onBlur={() => setVisible(true)}
-          autoComplete="one-time-code"
-        />
-        <button
-          className="btn"
-          disabled={disabled || buttonLeftTime > 0}
-          // loading={buttonLoading}
-          onClick={() => setVisible(true)}
-        >
-          {buttonLeftTime > 0
-            ? `${buttonLeftTime} s`
-            : buttonLoading
-              ? t("code.sending")
-              : t("code.sendCode")}
-        </button>
-      </div>
-      <CaptchaModal
-        owner={application.owner}
-        name={application.name}
-        visible={visible}
-        onOk={handleOk}
-        onCancel={handleCancel}
-        isCurrentProvider={false}
-      />
-    </React.Fragment>
-  );
-};
+// Copyright 2021 The Casdoor Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from "react";
+import i18next from "i18next";
+import * as UserBackend from "./util/user-api";
+import { CaptchaModal } from "./CaptchaModal";
+import type { Application } from "./util/provider";
+import { useTranslation } from "react-i18next";
+
+type ButtonClickArgsTuple = [
+  dest: any,
+  type: any,
+  applicationId: any,
+  checkUser?: string,
+];
+
+export type SendCodeInputProps = {
+  value?: any;
+  disabled: boolean;
+  textBefore?: string;
+  onChange: Function;
+  onButtonClickArgs: ButtonClickArgsTuple;
+  application: Application;
+  method: string;
+  countryCode: string;
+};
+
+export const SendCodeInput = ({
+  value,
+  disabled,
+  textBefore,
+  onChange,
+  onButtonClickArgs,
+  application,
+  method,
+  countryCode,
+}: SendCodeInputProps) => {
+  const { t } = useTranslation();
+  const [visible, setVisible] = React.useState(false);
+  const [buttonLeftTime, setButtonLeftTime] = React.useState(0);
+  const [buttonLoading, setButtonLoading] = React.useState(false);
+  const dialogRef = React.useRef<HTMLElement | null>(null);
+
+  const handleCountDown = (leftTime = 60) => {
+    let leftTimeSecond = leftTime;
+    setButtonLeftTime(leftTimeSecond);
+    const countDown = () => {
+      leftTimeSecond--;
+      setButtonLeftTime(leftTimeSecond);
+      if (leftTimeSecond === 0) {
+        return;
+      }
+      setTimeout(countDown, 1000);
+    };
+    setTimeout(countDown, 1000);
+  };
+
+  const handleOk = (
+    captchaType: string,
+    captchaToken: string,
+    clientSecret: string
+  ) => {
+    setVisible(false);
+    setButtonLoading(true);
+    UserBackend.sendCode(
+      captchaType,
+      captchaToken,
+      clientSecret,
+      method,
+      countryCode,
+      ...onButtonClickArgs
+    ).then((res: any) => {
+      setButtonLoading(false);
+      if (res) {
+        handleCountDown(60);
+      }
+    });
+  };
+
+  const handleCancel = () => {
+    setVisible(false);
+  };
+
+  React.useEffect(() => {
+    dialogRef.current = document.getElementById("captcha-modal");
+  }, []);
+
+  React.useEffect(() => {
+    if (dialogRef.current) {
+      if (visible) {
+        // @ts-ignore
+        dialogRef.current.showModal();
+      } else {
+        // @ts-ignore
+        dialogRef.current.close();
+      }
+    }
+  }, [visible]);
+
+  return (
+    <React.Fragment>
+      <div className="flex">
+        <input
+          className="input"
+          // addonBefore={textBefore}
+          disabled={disabled}
+          value={value}
+          // prefix={<SafetyOutlined />}
+          placeholder={"Enter your code"}
+          onChange={(e: any) => onChange(e.target.value)}
+          // onBlur={() => setVisible(true)}
+          autoComplete="one-time-code"
+        />
+        <button
+          className="btn"
+          disabled={disabled || buttonLeftTime > 0}
+          // loading={buttonLoading}
+          onClick={() => setVisible(true)}
+        >
+          {buttonLeftTime > 0
+            ? `${buttonLeftTime} s`
+            : buttonLoading
+              ? t("code.sending")
+              : t("code.sendCode")}
+        </button>
+      </div>
+      <CaptchaModal
+        owner={application.owner}
+        name={application.name}
+        visible={visible}
+        onOk={handleOk}
+        onCancel={handleCancel}
+        isCurrentProvider={false}
+      />
+    </React.Fragment>
+  );
+};