@springmicro/auth 0.7.4 → 0.7.6

package/README.md

@@ -1,60 +1,60 @@
-# @springmicro/auth
-
-Auth config supplied for connecting with a Casdoor instance. Uses [auth-astro](https://github.com/nowaythatworked/auth-astro).
-
-## Usage
-
-```bash
-npm i -g @springmicro/cli
-springmicro add auth
-```
-
-```ts
-// auth.config.ts
-
-import { getAuthConfig } from "@springmicro/auth";
-
-export default getAuthConfig({
-  casdoorEndpoint: import.meta.env.PUBLIC_CASDOOR_ENDPOINT,
-  clientId: import.meta.env.PUBLIC_CASDOOR_CLIENT_ID,
-  clientSecret: import.meta.env.CASDOOR_CLIENT_SECRET,
-});
-```
-
-`auth-astro` requires building your site in `server` mode with a platform adapter like `@astrojs/node`.
-
-```bash
-pnpm run astro add node
-```
-
-```js
-// astro.config.mjs
-export default defineConfig({
-  output: "server",
-  adapter: node({
-    mode: "standalone",
-  }),
-});
-```
-
-### Casdoor
-
-In the `application` settings, add the callback URL of `http://yourhost/callback`. Enable auto signin (optional).
-
-## Development
-
-### Build
-
-```bash
-pnpm run build
-```
-
-### Install in repo (locally)
-
-```bash
-# testing it out in a demo project
-cd astro-demo-project
-pnpm run astro add react
-pnpm run astro add auth-astro
-pnpm add --workspace @springmicro/auth
-```
+# @springmicro/auth
+
+Auth config supplied for connecting with a Casdoor instance. Uses [auth-astro](https://github.com/nowaythatworked/auth-astro).
+
+## Usage
+
+```bash
+npm i -g @springmicro/cli
+springmicro add auth
+```
+
+```ts
+// auth.config.ts
+
+import { getAuthConfig } from "@springmicro/auth";
+
+export default getAuthConfig({
+  casdoorEndpoint: import.meta.env.PUBLIC_CASDOOR_ENDPOINT,
+  clientId: import.meta.env.PUBLIC_CASDOOR_CLIENT_ID,
+  clientSecret: import.meta.env.CASDOOR_CLIENT_SECRET,
+});
+```
+
+`auth-astro` requires building your site in `server` mode with a platform adapter like `@astrojs/node`.
+
+```bash
+pnpm run astro add node
+```
+
+```js
+// astro.config.mjs
+export default defineConfig({
+  output: "server",
+  adapter: node({
+    mode: "standalone",
+  }),
+});
+```
+
+### Casdoor
+
+In the `application` settings, add the callback URL of `http://yourhost/callback`. Enable auto signin (optional).
+
+## Development
+
+### Build
+
+```bash
+pnpm run build
+```
+
+### Install in repo (locally)
+
+```bash
+# testing it out in a demo project
+cd astro-demo-project
+pnpm run astro add react
+pnpm run astro add auth-astro
+pnpm add --workspace @springmicro/auth
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springmicro/auth",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -53,5 +53,5 @@
     "react-social-login-buttons": "^4.1.0",
     "uuid": "^9.0.1"
   },
-  "gitHead": "b786438d6e75f39145e05d4583a7926eda3c4bf3"
+  "gitHead": "80da3d6ac6bca817c19b88466b9c6c1a1f90b4fc"
 }

package/src/components/forms/AgreementModal.tsx

@@ -1,88 +1,88 @@
-import React from "react";
-import type { SignUpFormState } from "../SignUp";
-import type { Application } from "./util/provider";
-
-export type AgreementModalProps = {
-  application: Application;
-  state: SignUpFormState;
-  setState: React.Dispatch<React.SetStateAction<SignUpFormState>>;
-};
-
-export function AgreementModal({
-  application,
-  state,
-  setState,
-}: AgreementModalProps) {
-  const [visible, setVisible] = React.useState(false);
-  const dialogRef = React.useRef<HTMLDialogElement | null>(null);
-
-  React.useEffect(() => {
-    if (!dialogRef.current) {
-      dialogRef.current = document.getElementById(
-        "agreementDialog"
-      ) as HTMLDialogElement | null;
-    }
-  }, []);
-
-  React.useEffect(() => {
-    if (dialogRef.current) {
-      if (visible) {
-        dialogRef.current.showModal();
-      } else {
-        dialogRef.current.close();
-      }
-    }
-  }, [visible]);
-
-  const handleCancel = () => {
-    setState({ ...state, agreement: false });
-    setVisible(false);
-  };
-
-  const handleOk = () => {
-    setState({ ...state, agreement: true });
-    setVisible(false);
-  };
-
-  const handleOpen = () => {
-    setVisible(true);
-  };
-
-  return (
-    <>
-      <dialog id="agreementDialog" className="modal">
-        <div className="modal-box">
-          <div className="mt-4 mb-8">
-            <iframe
-              src={application.termsOfUse}
-              width="100%"
-              height="300px"
-              sandbox="allow-scripts"
-            />
-          </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">
-              <button className="btn" onClick={handleCancel} key="closebtn">
-                Cancel
-              </button>
-              <button
-                className="btn btn-primary"
-                // disabled={isOkDisabled}
-                onClick={handleOk}
-                key="okbtn"
-              >
-                OK
-              </button>
-            </form>
-          </div>
-        </div>
-      </dialog>
-      <input checked={!!state.agreement} type="checkbox" readOnly />
-      <button onClick={handleOpen}>Open Terms</button>
-    </>
-  );
-}
+import React from "react";
+import type { SignUpFormState } from "../SignUp";
+import type { Application } from "./util/provider";
+
+export type AgreementModalProps = {
+  application: Application;
+  state: SignUpFormState;
+  setState: React.Dispatch<React.SetStateAction<SignUpFormState>>;
+};
+
+export function AgreementModal({
+  application,
+  state,
+  setState,
+}: AgreementModalProps) {
+  const [visible, setVisible] = React.useState(false);
+  const dialogRef = React.useRef<HTMLDialogElement | null>(null);
+
+  React.useEffect(() => {
+    if (!dialogRef.current) {
+      dialogRef.current = document.getElementById(
+        "agreementDialog"
+      ) as HTMLDialogElement | null;
+    }
+  }, []);
+
+  React.useEffect(() => {
+    if (dialogRef.current) {
+      if (visible) {
+        dialogRef.current.showModal();
+      } else {
+        dialogRef.current.close();
+      }
+    }
+  }, [visible]);
+
+  const handleCancel = () => {
+    setState({ ...state, agreement: false });
+    setVisible(false);
+  };
+
+  const handleOk = () => {
+    setState({ ...state, agreement: true });
+    setVisible(false);
+  };
+
+  const handleOpen = () => {
+    setVisible(true);
+  };
+
+  return (
+    <>
+      <dialog id="agreementDialog" className="modal">
+        <div className="modal-box">
+          <div className="mt-4 mb-8">
+            <iframe
+              src={application.termsOfUse}
+              width="100%"
+              height="300px"
+              sandbox="allow-scripts"
+            />
+          </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">
+              <button className="btn" onClick={handleCancel} key="closebtn">
+                Cancel
+              </button>
+              <button
+                className="btn btn-primary"
+                // disabled={isOkDisabled}
+                onClick={handleOk}
+                key="okbtn"
+              >
+                OK
+              </button>
+            </form>
+          </div>
+        </div>
+      </dialog>
+      <input checked={!!state.agreement} type="checkbox" readOnly />
+      <button onClick={handleOpen}>Open Terms</button>
+    </>
+  );
+}

package/src/components/forms/CaptchaController.tsx

@@ -1,94 +1,94 @@
-import React from "react";
-import { CaptchaModal } from "./CaptchaModal";
-import * as AuthBackend from "./util/auth-api";
-
-type CaptchaState = {
-  values: any;
-  openCaptchaModal: boolean;
-};
-
-export default function CaptchaController() {
-  const [state, setState] = React.useState<CaptchaState>({
-    values: {},
-    openCaptchaModal: false,
-  });
-  const dialogRef = React.useRef<HTMLElement | null>(null);
-
-  const handleClick = () => {
-    if (dialogRef.current) {
-      if (!state.openCaptchaModal) {
-        // @ts-ignore
-        dialogRef.current.showModal();
-      } else {
-        // @ts-ignore
-        dialogRef.current.close();
-      }
-      setState({ ...state, openCaptchaModal: !state.openCaptchaModal });
-    }
-  };
-
-  const captchaCallback = (v: any) => {
-    console.log(v);
-  };
-
-  const onOk = (
-    captchaType: string,
-    captchaToken: string,
-    clientSecret: string
-  ) => {
-    if (dialogRef.current) {
-      // @ts-ignore
-      dialogRef.current.close();
-      const values = state.values;
-      values["captchaType"] = captchaType;
-      values["captchaToken"] = captchaToken;
-      values["clientSecret"] = clientSecret;
-      AuthBackend.getCaptchaStatus(values).then((res) => {
-        if (res.status === "ok") {
-          // errors
-          if (res.data) {
-            setState({
-              openCaptchaModal: true,
-              values: values,
-            });
-            return null;
-          }
-        }
-        captchaCallback(values);
-      });
-      setState({ ...state, openCaptchaModal: false });
-    }
-  };
-
-  const onCancel = () => {
-    if (dialogRef.current) {
-      // @ts-ignore
-      dialogRef.current.close();
-      setState({ ...state, openCaptchaModal: false });
-    }
-  };
-
-  React.useEffect(() => {
-    dialogRef.current = document.getElementById("captcha-modal");
-  }, []);
-
-  return (
-    <>
-      <CaptchaModal
-        visible={state.openCaptchaModal}
-        owner="admin"
-        name="provider_captcha_default"
-        isCurrentProvider={true}
-        onCancel={onCancel}
-        onOk={onOk}
-      />
-      <button
-        className="btn btn-primary"
-        // @ts-ignore
-        onClick={handleClick}
-      >
-        Captcha
-      </button>
-    </>
-  );
-}
+import React from "react";
+import { CaptchaModal } from "./CaptchaModal";
+import * as AuthBackend from "./util/auth-api";
+
+type CaptchaState = {
+  values: any;
+  openCaptchaModal: boolean;
+};
+
+export default function CaptchaController() {
+  const [state, setState] = React.useState<CaptchaState>({
+    values: {},
+    openCaptchaModal: false,
+  });
+  const dialogRef = React.useRef<HTMLElement | null>(null);
+
+  const handleClick = () => {
+    if (dialogRef.current) {
+      if (!state.openCaptchaModal) {
+        // @ts-ignore
+        dialogRef.current.showModal();
+      } else {
+        // @ts-ignore
+        dialogRef.current.close();
+      }
+      setState({ ...state, openCaptchaModal: !state.openCaptchaModal });
+    }
+  };
+
+  const captchaCallback = (v: any) => {
+    console.log(v);
+  };
+
+  const onOk = (
+    captchaType: string,
+    captchaToken: string,
+    clientSecret: string
+  ) => {
+    if (dialogRef.current) {
+      // @ts-ignore
+      dialogRef.current.close();
+      const values = state.values;
+      values["captchaType"] = captchaType;
+      values["captchaToken"] = captchaToken;
+      values["clientSecret"] = clientSecret;
+      AuthBackend.getCaptchaStatus(values).then((res) => {
+        if (res.status === "ok") {
+          // errors
+          if (res.data) {
+            setState({
+              openCaptchaModal: true,
+              values: values,
+            });
+            return null;
+          }
+        }
+        captchaCallback(values);
+      });
+      setState({ ...state, openCaptchaModal: false });
+    }
+  };
+
+  const onCancel = () => {
+    if (dialogRef.current) {
+      // @ts-ignore
+      dialogRef.current.close();
+      setState({ ...state, openCaptchaModal: false });
+    }
+  };
+
+  React.useEffect(() => {
+    dialogRef.current = document.getElementById("captcha-modal");
+  }, []);
+
+  return (
+    <>
+      <CaptchaModal
+        visible={state.openCaptchaModal}
+        owner="admin"
+        name="provider_captcha_default"
+        isCurrentProvider={true}
+        onCancel={onCancel}
+        onOk={onOk}
+      />
+      <button
+        className="btn btn-primary"
+        // @ts-ignore
+        onClick={handleClick}
+      >
+        Captcha
+      </button>
+    </>
+  );
+}