@springmicro/auth 0.7.0 → 0.7.1

package/src/components/forms/CaptchaWidget.jsx

@@ -1,146 +1,146 @@
-// Copyright 2022 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, { useEffect } from "react";
-
-export const CaptchaWidget = (props) => {
-  const {
-    captchaType,
-    subType,
-    siteKey,
-    clientSecret,
-    clientId2,
-    clientSecret2,
-    onChange,
-  } = props;
-
-  const loadScript = (src) => {
-    const tag = document.createElement("script");
-    tag.async = false;
-    tag.src = src;
-    const body = document.getElementsByTagName("body")[0];
-    body.appendChild(tag);
-  };
-
-  useEffect(() => {
-    switch (captchaType) {
-      case "reCAPTCHA": {
-        const reTimer = setInterval(() => {
-          if (!window.grecaptcha) {
-            loadScript("https://recaptcha.net/recaptcha/api.js");
-          }
-          if (window.grecaptcha && window.grecaptcha.render) {
-            window.grecaptcha.render("captcha", {
-              sitekey: siteKey,
-              callback: onChange,
-            });
-            clearInterval(reTimer);
-          }
-        }, 300);
-        break;
-      }
-      case "hCaptcha": {
-        const hTimer = setInterval(() => {
-          if (!window.hcaptcha) {
-            loadScript("https://js.hcaptcha.com/1/api.js");
-          }
-          if (window.hcaptcha && window.hcaptcha.render) {
-            window.hcaptcha.render("captcha", {
-              sitekey: siteKey,
-              callback: onChange,
-            });
-            clearInterval(hTimer);
-          }
-        }, 300);
-        break;
-      }
-      case "Aliyun Captcha": {
-        const AWSCTimer = setInterval(() => {
-          if (!window.AWSC) {
-            loadScript("https://g.alicdn.com/AWSC/AWSC/awsc.js");
-          }
-
-          if (window.AWSC) {
-            if (clientSecret2 && clientSecret2 !== "***") {
-              window.AWSC.use(subType, function (state, module) {
-                module.init({
-                  appkey: clientSecret2,
-                  scene: clientId2,
-                  renderTo: "captcha",
-                  success: function (data) {
-                    onChange(
-                      `SessionId=${data.sessionId}&AccessKeyId=${siteKey}&Scene=${clientId2}&AppKey=${clientSecret2}&Token=${data.token}&Sig=${data.sig}&RemoteIp=192.168.0.1`
-                    );
-                  },
-                });
-              });
-            }
-            clearInterval(AWSCTimer);
-          }
-        }, 300);
-        break;
-      }
-      case "GEETEST": {
-        let getLock = false;
-        const gTimer = setInterval(() => {
-          if (!window.initGeetest4) {
-            loadScript("https://static.geetest.com/v4/gt4.js");
-          }
-          if (window.initGeetest4 && siteKey && !getLock) {
-            const captchaId = String(siteKey);
-            window.initGeetest4(
-              {
-                captchaId,
-                product: "float",
-              },
-              function (captchaObj) {
-                if (!getLock) {
-                  captchaObj.appendTo("#captcha");
-                  getLock = true;
-                }
-                captchaObj.onSuccess(function () {
-                  const result = captchaObj.getValidate();
-                  onChange(
-                    `lot_number=${result.lot_number}&captcha_output=${result.captcha_output}&pass_token=${result.pass_token}&gen_time=${result.gen_time}&captcha_id=${siteKey}`
-                  );
-                });
-              }
-            );
-            clearInterval(gTimer);
-          }
-        }, 500);
-        break;
-      }
-      case "Cloudflare Turnstile": {
-        const tTimer = setInterval(() => {
-          if (!window.turnstile) {
-            loadScript("https://challenges.cloudflare.com/turnstile/v0/api.js");
-          }
-          if (window.turnstile && window.turnstile.render) {
-            window.turnstile.render("#captcha", {
-              sitekey: siteKey,
-              callback: onChange,
-            });
-            clearInterval(tTimer);
-          }
-        }, 300);
-        break;
-      }
-      default:
-        break;
-    }
-  }, [captchaType, subType, siteKey, clientSecret, clientId2, clientSecret2]);
-
-  return <div id="captcha" />;
-};
+// Copyright 2022 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, { useEffect } from "react";
+
+export const CaptchaWidget = (props) => {
+  const {
+    captchaType,
+    subType,
+    siteKey,
+    clientSecret,
+    clientId2,
+    clientSecret2,
+    onChange,
+  } = props;
+
+  const loadScript = (src) => {
+    const tag = document.createElement("script");
+    tag.async = false;
+    tag.src = src;
+    const body = document.getElementsByTagName("body")[0];
+    body.appendChild(tag);
+  };
+
+  useEffect(() => {
+    switch (captchaType) {
+      case "reCAPTCHA": {
+        const reTimer = setInterval(() => {
+          if (!window.grecaptcha) {
+            loadScript("https://recaptcha.net/recaptcha/api.js");
+          }
+          if (window.grecaptcha && window.grecaptcha.render) {
+            window.grecaptcha.render("captcha", {
+              sitekey: siteKey,
+              callback: onChange,
+            });
+            clearInterval(reTimer);
+          }
+        }, 300);
+        break;
+      }
+      case "hCaptcha": {
+        const hTimer = setInterval(() => {
+          if (!window.hcaptcha) {
+            loadScript("https://js.hcaptcha.com/1/api.js");
+          }
+          if (window.hcaptcha && window.hcaptcha.render) {
+            window.hcaptcha.render("captcha", {
+              sitekey: siteKey,
+              callback: onChange,
+            });
+            clearInterval(hTimer);
+          }
+        }, 300);
+        break;
+      }
+      case "Aliyun Captcha": {
+        const AWSCTimer = setInterval(() => {
+          if (!window.AWSC) {
+            loadScript("https://g.alicdn.com/AWSC/AWSC/awsc.js");
+          }
+
+          if (window.AWSC) {
+            if (clientSecret2 && clientSecret2 !== "***") {
+              window.AWSC.use(subType, function (state, module) {
+                module.init({
+                  appkey: clientSecret2,
+                  scene: clientId2,
+                  renderTo: "captcha",
+                  success: function (data) {
+                    onChange(
+                      `SessionId=${data.sessionId}&AccessKeyId=${siteKey}&Scene=${clientId2}&AppKey=${clientSecret2}&Token=${data.token}&Sig=${data.sig}&RemoteIp=192.168.0.1`
+                    );
+                  },
+                });
+              });
+            }
+            clearInterval(AWSCTimer);
+          }
+        }, 300);
+        break;
+      }
+      case "GEETEST": {
+        let getLock = false;
+        const gTimer = setInterval(() => {
+          if (!window.initGeetest4) {
+            loadScript("https://static.geetest.com/v4/gt4.js");
+          }
+          if (window.initGeetest4 && siteKey && !getLock) {
+            const captchaId = String(siteKey);
+            window.initGeetest4(
+              {
+                captchaId,
+                product: "float",
+              },
+              function (captchaObj) {
+                if (!getLock) {
+                  captchaObj.appendTo("#captcha");
+                  getLock = true;
+                }
+                captchaObj.onSuccess(function () {
+                  const result = captchaObj.getValidate();
+                  onChange(
+                    `lot_number=${result.lot_number}&captcha_output=${result.captcha_output}&pass_token=${result.pass_token}&gen_time=${result.gen_time}&captcha_id=${siteKey}`
+                  );
+                });
+              }
+            );
+            clearInterval(gTimer);
+          }
+        }, 500);
+        break;
+      }
+      case "Cloudflare Turnstile": {
+        const tTimer = setInterval(() => {
+          if (!window.turnstile) {
+            loadScript("https://challenges.cloudflare.com/turnstile/v0/api.js");
+          }
+          if (window.turnstile && window.turnstile.render) {
+            window.turnstile.render("#captcha", {
+              sitekey: siteKey,
+              callback: onChange,
+            });
+            clearInterval(tTimer);
+          }
+        }, 300);
+        break;
+      }
+      default:
+        break;
+    }
+  }, [captchaType, subType, siteKey, clientSecret, clientId2, clientSecret2]);
+
+  return <div id="captcha" />;
+};

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 "";
+}