@springmicro/auth 0.7.5 → 0.7.7

package/src/components/forms/CaptchaModal.jsx

@@ -1,171 +1,171 @@
-// 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";
-import * as UserBackend from "./util/user-api";
-import { CaptchaWidget } from "./CaptchaWidget";
-import { useTranslation } from "react-i18next";
-
-export const CaptchaModal = (props) => {
-  const { t } = useTranslation();
-  const { owner, name, visible, onOk, onCancel, isCurrentProvider } = props;
-
-  const [captchaType, setCaptchaType] = React.useState("none");
-  const [clientId, setClientId] = React.useState("");
-  const [clientSecret, setClientSecret] = React.useState("");
-  const [subType, setSubType] = React.useState("");
-  const [clientId2, setClientId2] = React.useState("");
-  const [clientSecret2, setClientSecret2] = React.useState("");
-
-  const [open, setOpen] = React.useState(false);
-  const [captchaImg, setCaptchaImg] = React.useState("");
-  const [captchaToken, setCaptchaToken] = React.useState("");
-
-  const defaultInputRef = React.useRef(null);
-
-  useEffect(() => {
-    if (visible) {
-      loadCaptcha();
-    } else {
-      handleCancel();
-      setOpen(false);
-    }
-  }, [visible]);
-
-  const handleOk = () => {
-    onOk?.(captchaType, captchaToken, clientSecret);
-  };
-
-  const handleCancel = () => {
-    setCaptchaToken("");
-    onCancel?.();
-  };
-
-  const loadCaptcha = () => {
-    UserBackend.getCaptcha(owner, name, isCurrentProvider).then((res) => {
-      if (res.type === "none") {
-        handleOk();
-      } else if (res.type === "Default") {
-        setOpen(true);
-        setClientSecret(res.captchaId);
-        setCaptchaImg(res.captchaImage);
-        setCaptchaType("Default");
-      } else {
-        setOpen(true);
-        setCaptchaType(res.type);
-        setClientId(res.clientId);
-        setClientSecret(res.clientSecret);
-        setSubType(res.subType);
-        setClientId2(res.clientId2);
-        setClientSecret2(res.clientSecret2);
-      }
-    });
-  };
-
-  const renderDefaultCaptcha = () => {
-    return (
-      <div className="flex flex-col items-center">
-        <div
-          className="bg-no-repeat mb-4 border border-current rounded w-[200px] h-[80px]"
-          style={{
-            backgroundImage: `url('data:image/png;base64,${captchaImg}')`,
-          }}
-        />
-        <input
-          className="input input-bordered w-[200px]"
-          type="text"
-          ref={defaultInputRef}
-          value={captchaToken}
-          // prefix={<SafetyOutlined />}
-          placeholder={t("general.captcha")}
-          onKeyDown={(e) => (e.key === "Enter" ? handleOk() : null)}
-          onChange={(e) => setCaptchaToken(e.target.value)}
-        />
-      </div>
-    );
-  };
-
-  const onChange = (token) => {
-    setCaptchaToken(token);
-  };
-
-  const renderCaptcha = () => {
-    if (captchaType === "Default") {
-      return renderDefaultCaptcha();
-    } else {
-      return (
-        <div className="flex justify-center">
-          <CaptchaWidget
-            captchaType={captchaType}
-            subType={subType}
-            siteKey={clientId}
-            clientSecret={clientSecret}
-            onChange={onChange}
-            clientId2={clientId2}
-            clientSecret2={clientSecret2}
-          />
-        </div>
-      );
-    }
-  };
-
-  const renderFooter = () => {
-    let isOkDisabled = false;
-    if (captchaType === "Default") {
-      const regex = /^\d{5}$/;
-      if (!regex.test(captchaToken)) {
-        isOkDisabled = true;
-      }
-    } else if (captchaToken === "") {
-      isOkDisabled = true;
-    }
-
-    return [
-      <button className="btn" onClick={handleCancel} key="closebtn">
-        Cancel
-      </button>,
-      <button
-        className="btn btn-primary"
-        disabled={isOkDisabled}
-        onClick={handleOk}
-        key="okbtn"
-      >
-        OK
-      </button>,
-    ];
-  };
-
-  return (
-    <dialog id="captcha-modal" className="modal">
-      <div className="modal-box">
-        <div className="mt-4 mb-8">{renderCaptcha()}</div>
-        <div className="modal-action">
-          <form method="dialog" className="modal-backdrop">
-            {/* if there is a button in form, it will close the modal */}
-            <button>Close</button>
-          </form>
-          <form method="dialog" className="flex gap-3">
-            {renderFooter()}
-          </form>
-        </div>
-      </div>
-    </dialog>
-  );
-};
-
-export const CaptchaRule = {
-  Always: "Always",
-  Never: "Never",
-  Dynamic: "Dynamic",
-};
+// 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";
+import * as UserBackend from "./util/user-api";
+import { CaptchaWidget } from "./CaptchaWidget";
+import { useTranslation } from "react-i18next";
+
+export const CaptchaModal = (props) => {
+  const { t } = useTranslation();
+  const { owner, name, visible, onOk, onCancel, isCurrentProvider } = props;
+
+  const [captchaType, setCaptchaType] = React.useState("none");
+  const [clientId, setClientId] = React.useState("");
+  const [clientSecret, setClientSecret] = React.useState("");
+  const [subType, setSubType] = React.useState("");
+  const [clientId2, setClientId2] = React.useState("");
+  const [clientSecret2, setClientSecret2] = React.useState("");
+
+  const [open, setOpen] = React.useState(false);
+  const [captchaImg, setCaptchaImg] = React.useState("");
+  const [captchaToken, setCaptchaToken] = React.useState("");
+
+  const defaultInputRef = React.useRef(null);
+
+  useEffect(() => {
+    if (visible) {
+      loadCaptcha();
+    } else {
+      handleCancel();
+      setOpen(false);
+    }
+  }, [visible]);
+
+  const handleOk = () => {
+    onOk?.(captchaType, captchaToken, clientSecret);
+  };
+
+  const handleCancel = () => {
+    setCaptchaToken("");
+    onCancel?.();
+  };
+
+  const loadCaptcha = () => {
+    UserBackend.getCaptcha(owner, name, isCurrentProvider).then((res) => {
+      if (res.type === "none") {
+        handleOk();
+      } else if (res.type === "Default") {
+        setOpen(true);
+        setClientSecret(res.captchaId);
+        setCaptchaImg(res.captchaImage);
+        setCaptchaType("Default");
+      } else {
+        setOpen(true);
+        setCaptchaType(res.type);
+        setClientId(res.clientId);
+        setClientSecret(res.clientSecret);
+        setSubType(res.subType);
+        setClientId2(res.clientId2);
+        setClientSecret2(res.clientSecret2);
+      }
+    });
+  };
+
+  const renderDefaultCaptcha = () => {
+    return (
+      <div className="flex flex-col items-center">
+        <div
+          className="bg-no-repeat mb-4 border border-current rounded w-[200px] h-[80px]"
+          style={{
+            backgroundImage: `url('data:image/png;base64,${captchaImg}')`,
+          }}
+        />
+        <input
+          className="input input-bordered w-[200px]"
+          type="text"
+          ref={defaultInputRef}
+          value={captchaToken}
+          // prefix={<SafetyOutlined />}
+          placeholder={t("general.captcha")}
+          onKeyDown={(e) => (e.key === "Enter" ? handleOk() : null)}
+          onChange={(e) => setCaptchaToken(e.target.value)}
+        />
+      </div>
+    );
+  };
+
+  const onChange = (token) => {
+    setCaptchaToken(token);
+  };
+
+  const renderCaptcha = () => {
+    if (captchaType === "Default") {
+      return renderDefaultCaptcha();
+    } else {
+      return (
+        <div className="flex justify-center">
+          <CaptchaWidget
+            captchaType={captchaType}
+            subType={subType}
+            siteKey={clientId}
+            clientSecret={clientSecret}
+            onChange={onChange}
+            clientId2={clientId2}
+            clientSecret2={clientSecret2}
+          />
+        </div>
+      );
+    }
+  };
+
+  const renderFooter = () => {
+    let isOkDisabled = false;
+    if (captchaType === "Default") {
+      const regex = /^\d{5}$/;
+      if (!regex.test(captchaToken)) {
+        isOkDisabled = true;
+      }
+    } else if (captchaToken === "") {
+      isOkDisabled = true;
+    }
+
+    return [
+      <button className="btn" onClick={handleCancel} key="closebtn">
+        Cancel
+      </button>,
+      <button
+        className="btn btn-primary"
+        disabled={isOkDisabled}
+        onClick={handleOk}
+        key="okbtn"
+      >
+        OK
+      </button>,
+    ];
+  };
+
+  return (
+    <dialog id="captcha-modal" className="modal">
+      <div className="modal-box">
+        <div className="mt-4 mb-8">{renderCaptcha()}</div>
+        <div className="modal-action">
+          <form method="dialog" className="modal-backdrop">
+            {/* if there is a button in form, it will close the modal */}
+            <button>Close</button>
+          </form>
+          <form method="dialog" className="flex gap-3">
+            {renderFooter()}
+          </form>
+        </div>
+      </div>
+    </dialog>
+  );
+};
+
+export const CaptchaRule = {
+  Always: "Always",
+  Never: "Never",
+  Dynamic: "Dynamic",
+};

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