@springmicro/auth 0.3.0 → 0.3.5

package/src/components/provider/WechatLoginButton.jsx

@@ -1,37 +1,37 @@
-// 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 { createButton } from "react-social-login-buttons";
-import { StaticBaseUrl } from "../forms/util/core";
-
-function Icon({ width = 24, height = 24, color }) {
-  return (
-    <img
-      src={`${StaticBaseUrl}/buttons/wechat.svg`}
-      alt="Sign in with Wechat"
-    />
-  );
-}
-
-const config = {
-  text: "Sign in with Wechat",
-  icon: Icon,
-  iconFormat: (name) => `fa fa-${name}`,
-  style: { background: "rgb(0,194,80)" },
-  activeStyle: { background: "rgb(0,158,64)" },
-};
-
-const WechatLoginButton = createButton(config);
-
-export default WechatLoginButton;
+// 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 { createButton } from "react-social-login-buttons";
+import { StaticBaseUrl } from "../forms/util/core";
+
+function Icon({ width = 24, height = 24, color }) {
+  return (
+    <img
+      src={`${StaticBaseUrl}/buttons/wechat.svg`}
+      alt="Sign in with Wechat"
+    />
+  );
+}
+
+const config = {
+  text: "Sign in with Wechat",
+  icon: Icon,
+  iconFormat: (name) => `fa fa-${name}`,
+  style: { background: "rgb(0,194,80)" },
+  activeStyle: { background: "rgb(0,158,64)" },
+};
+
+const WechatLoginButton = createButton(config);
+
+export default WechatLoginButton;

package/src/components/provider/WeiboLoginButton.jsx

@@ -1,34 +1,34 @@
-// 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 { createButton } from "react-social-login-buttons";
-import { StaticBaseUrl } from "../forms/util/core";
-
-function Icon({ width = 24, height = 24, color }) {
-  return (
-    <img src={`${StaticBaseUrl}/buttons/weibo.svg`} alt="Sign in with Weibo" />
-  );
-}
-
-const config = {
-  text: "Sign in with Weibo",
-  icon: Icon,
-  iconFormat: (name) => `fa fa-${name}`,
-  style: { background: "#e62329" },
-  activeStyle: { background: "#e54329" },
-};
-
-const WeiboLoginButton = createButton(config);
-
-export default WeiboLoginButton;
+// 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 { createButton } from "react-social-login-buttons";
+import { StaticBaseUrl } from "../forms/util/core";
+
+function Icon({ width = 24, height = 24, color }) {
+  return (
+    <img src={`${StaticBaseUrl}/buttons/weibo.svg`} alt="Sign in with Weibo" />
+  );
+}
+
+const config = {
+  text: "Sign in with Weibo",
+  icon: Icon,
+  iconFormat: (name) => `fa fa-${name}`,
+  style: { background: "#e62329" },
+  activeStyle: { background: "#e54329" },
+};
+
+const WeiboLoginButton = createButton(config);
+
+export default WeiboLoginButton;

package/src/components/util.tsx

@@ -1,173 +1,173 @@
-import React from "react";
-
-export type SignupItem = {
-  name: string;
-  label: string;
-  placeholder: string;
-  prompted: boolean;
-  required: boolean;
-  rule: string;
-  visible: boolean;
-};
-
-export function getIcon(
-  signupItem: SignupItem,
-  options: {
-    password: {
-      state: Record<string, boolean>;
-      setState: React.Dispatch<React.SetStateAction<Record<string, boolean>>>;
-    };
-  },
-  Button: React.JSX.ElementType
-) {
-  const eye = (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      className="lucide lucide-eye"
-    >
-      <path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z" />
-      <circle cx="12" cy="12" r="3" />
-    </svg>
-  );
-  const eyeOff = (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke="currentColor"
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      className="lucide lucide-eye-off"
-    >
-      <path d="M9.88 9.88a3 3 0 1 0 4.24 4.24" />
-      <path d="M10.73 5.08A10.43 10.43 0 0 1 12 5c7 0 10 7 10 7a13.16 13.16 0 0 1-1.67 2.68" />
-      <path d="M6.61 6.61A13.526 13.526 0 0 0 2 12s3 7 10 7a9.74 9.74 0 0 0 5.39-1.61" />
-      <line x1="2" x2="22" y1="2" y2="22" />
-    </svg>
-  );
-  const type = getType(signupItem);
-  const key = getKey(signupItem);
-  if (type === "password") {
-    const showPassword = options.password.state[key];
-    return (
-      <Button
-        variant="ghost"
-        size="icon"
-        className="absolute top-1/2 right-2 -translate-y-1/2"
-        onClick={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          options.password.setState({
-            ...options.password.state,
-            [key]: !showPassword,
-          });
-        }}
-      >
-        {showPassword ? eyeOff : eye}
-        <span className="sr-only">Toggle password visibility</span>
-      </Button>
-    );
-  } else {
-    return null;
-  }
-}
-
-export function getKey(signupItem: SignupItem) {
-  const nameMap = {
-    ID: "id",
-    Username: "username",
-    // also firstName, lastName
-    "Display name": "name",
-    Affiliation: "affiliation",
-    "ID card": "idCard",
-    Email: "email",
-    Phone: "phone",
-    Password: "password",
-    "Confirm password": "confirm",
-    "Invitation code": "invitationCode",
-    "Country/Region": "country_region",
-    Agreement: "agreement",
-  };
-  if (Object.keys(nameMap).includes(signupItem.name)) {
-    return nameMap[signupItem.name];
-  } else {
-    return signupItem.name;
-  }
-}
-
-export function getType(
-  signupItem: SignupItem,
-  options?: { hidePassword: Record<string, boolean> }
-) {
-  const password = ["password", "confirm"];
-  const key = getKey(signupItem);
-  if (password.includes(key) && !options?.hidePassword[key]) {
-    return "password";
-  } else {
-    return "text";
-  }
-}
-
-export function getPasswordVisibilityRecord(
-  signupItems: SignupItem[]
-): Record<string, boolean> {
-  return Object.fromEntries(
-    signupItems
-      .filter((item) => getType(item) === "password")
-      .map((item) => [getKey(item), false])
-  );
-}
-
-export function getFormProps(signupItem: SignupItem) {
-  return {
-    name: getKey(signupItem),
-    label: signupItem.label || signupItem.name,
-    placeholder: signupItem.placeholder,
-    required: signupItem.required,
-    type: getType(signupItem),
-  };
-}
-
-export function getZod(z: any, signupItem: SignupItem) {
-  const key = getKey(signupItem);
-  let validator: any = z.string();
-  if (key === "email") {
-    validator = validator.email();
-  }
-  if (!signupItem.required) {
-    validator = validator.optional();
-  }
-  return validator;
-}
-
-export function getDefaultValues(signupItems: SignupItem[]) {
-  const entries = signupItems.map((item) => {
-    return [getKey(item), ""];
-  });
-  // add codes
-  const codes = signupItems
-    .filter((item) => requiresCode(item))
-    .map((item) => {
-      return [getKey(item) + "Code", ""];
-    });
-  return Object.fromEntries([...entries, ...codes]);
-}
-
-export function requiresCode(signupItem: SignupItem) {
-  const key = getKey(signupItem);
-  return (
-    (key === "email" || key === "phone") &&
-    signupItem.rule !== "No verification"
-  );
-}
+import React from "react";
+
+export type SignupItem = {
+  name: string;
+  label: string;
+  placeholder: string;
+  prompted: boolean;
+  required: boolean;
+  rule: string;
+  visible: boolean;
+};
+
+export function getIcon(
+  signupItem: SignupItem,
+  options: {
+    password: {
+      state: Record<string, boolean>;
+      setState: React.Dispatch<React.SetStateAction<Record<string, boolean>>>;
+    };
+  },
+  Button: React.JSX.ElementType
+) {
+  const eye = (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      className="lucide lucide-eye"
+    >
+      <path d="M2 12s3-7 10-7 10 7 10 7-3 7-10 7-10-7-10-7Z" />
+      <circle cx="12" cy="12" r="3" />
+    </svg>
+  );
+  const eyeOff = (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      viewBox="0 0 24 24"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="2"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+      className="lucide lucide-eye-off"
+    >
+      <path d="M9.88 9.88a3 3 0 1 0 4.24 4.24" />
+      <path d="M10.73 5.08A10.43 10.43 0 0 1 12 5c7 0 10 7 10 7a13.16 13.16 0 0 1-1.67 2.68" />
+      <path d="M6.61 6.61A13.526 13.526 0 0 0 2 12s3 7 10 7a9.74 9.74 0 0 0 5.39-1.61" />
+      <line x1="2" x2="22" y1="2" y2="22" />
+    </svg>
+  );
+  const type = getType(signupItem);
+  const key = getKey(signupItem);
+  if (type === "password") {
+    const showPassword = options.password.state[key];
+    return (
+      <Button
+        variant="ghost"
+        size="icon"
+        className="absolute top-1/2 right-2 -translate-y-1/2"
+        onClick={(e) => {
+          e.preventDefault();
+          e.stopPropagation();
+          options.password.setState({
+            ...options.password.state,
+            [key]: !showPassword,
+          });
+        }}
+      >
+        {showPassword ? eyeOff : eye}
+        <span className="sr-only">Toggle password visibility</span>
+      </Button>
+    );
+  } else {
+    return null;
+  }
+}
+
+export function getKey(signupItem: SignupItem) {
+  const nameMap = {
+    ID: "id",
+    Username: "username",
+    // also firstName, lastName
+    "Display name": "name",
+    Affiliation: "affiliation",
+    "ID card": "idCard",
+    Email: "email",
+    Phone: "phone",
+    Password: "password",
+    "Confirm password": "confirm",
+    "Invitation code": "invitationCode",
+    "Country/Region": "country_region",
+    Agreement: "agreement",
+  };
+  if (Object.keys(nameMap).includes(signupItem.name)) {
+    return nameMap[signupItem.name];
+  } else {
+    return signupItem.name;
+  }
+}
+
+export function getType(
+  signupItem: SignupItem,
+  options?: { hidePassword: Record<string, boolean> }
+) {
+  const password = ["password", "confirm"];
+  const key = getKey(signupItem);
+  if (password.includes(key) && !options?.hidePassword[key]) {
+    return "password";
+  } else {
+    return "text";
+  }
+}
+
+export function getPasswordVisibilityRecord(
+  signupItems: SignupItem[]
+): Record<string, boolean> {
+  return Object.fromEntries(
+    signupItems
+      .filter((item) => getType(item) === "password")
+      .map((item) => [getKey(item), false])
+  );
+}
+
+export function getFormProps(signupItem: SignupItem) {
+  return {
+    name: getKey(signupItem),
+    label: signupItem.label || signupItem.name,
+    placeholder: signupItem.placeholder,
+    required: signupItem.required,
+    type: getType(signupItem),
+  };
+}
+
+export function getZod(z: any, signupItem: SignupItem) {
+  const key = getKey(signupItem);
+  let validator: any = z.string();
+  if (key === "email") {
+    validator = validator.email();
+  }
+  if (!signupItem.required) {
+    validator = validator.optional();
+  }
+  return validator;
+}
+
+export function getDefaultValues(signupItems: SignupItem[]) {
+  const entries = signupItems.map((item) => {
+    return [getKey(item), ""];
+  });
+  // add codes
+  const codes = signupItems
+    .filter((item) => requiresCode(item))
+    .map((item) => {
+      return [getKey(item) + "Code", ""];
+    });
+  return Object.fromEntries([...entries, ...codes]);
+}
+
+export function requiresCode(signupItem: SignupItem) {
+  const key = getKey(signupItem);
+  return (
+    (key === "email" || key === "phone") &&
+    signupItem.rule !== "No verification"
+  );
+}

package/src/i18n/en/signup.json

@@ -1,48 +1,48 @@
-{
-  "translation": {
-    "signup": {
-      "username": "Username",
-      "confirm": "Confirm password",
-      "signInNow": "Sign In Now",
-      "signUp": "Sign Up",
-      "haveAccount": "Have account?"
-    },
-    "forget": {
-      "username": "Please input your username.",
-      "firstName": "Please input your first name.",
-      "lastName": "Please input your last name.",
-      "realName": "Please input your real name.",
-      "displayName": "Please input your display name.",
-      "affliation": "Please input your affliation.",
-      "idCard": "Please input your ID card number.",
-      "code": "Please input your verification code.",
-      "email": "Please input your email.",
-      "confirm": "Please confirm your password and ensure it matches.",
-      "invitationCode": "Please input your invitation code."
-    },
-    "format": {
-      "idCard": "The ID card number format is incorrect."
-    },
-    "general": {
-      "firstName": "First name",
-      "lastName": "Last name",
-      "displayName": "Display name",
-      "realName": "Real name",
-      "email": "Email",
-      "password": "Password",
-      "captcha": "Captcha"
-    },
-    "user": {
-      "affliation": "Affliation",
-      "idCard": "ID card"
-    },
-    "code": {
-      "email": "Email code",
-      "sending": "Sending",
-      "sendCode": "Send code"
-    },
-    "application": {
-      "invitationCode": "Invitation code"
-    }
-  }
-}
+{
+  "translation": {
+    "signup": {
+      "username": "Username",
+      "confirm": "Confirm password",
+      "signInNow": "Sign In Now",
+      "signUp": "Sign Up",
+      "haveAccount": "Have account?"
+    },
+    "forget": {
+      "username": "Please input your username.",
+      "firstName": "Please input your first name.",
+      "lastName": "Please input your last name.",
+      "realName": "Please input your real name.",
+      "displayName": "Please input your display name.",
+      "affliation": "Please input your affliation.",
+      "idCard": "Please input your ID card number.",
+      "code": "Please input your verification code.",
+      "email": "Please input your email.",
+      "confirm": "Please confirm your password and ensure it matches.",
+      "invitationCode": "Please input your invitation code."
+    },
+    "format": {
+      "idCard": "The ID card number format is incorrect."
+    },
+    "general": {
+      "firstName": "First name",
+      "lastName": "Last name",
+      "displayName": "Display name",
+      "realName": "Real name",
+      "email": "Email",
+      "password": "Password",
+      "captcha": "Captcha"
+    },
+    "user": {
+      "affliation": "Affliation",
+      "idCard": "ID card"
+    },
+    "code": {
+      "email": "Email code",
+      "sending": "Sending",
+      "sendCode": "Send code"
+    },
+    "application": {
+      "invitationCode": "Invitation code"
+    }
+  }
+}

package/src/i18n/index.ts

@@ -1,17 +1,17 @@
-import i18n from "i18next";
-// import detector from "i18next-browser-languagedetector";
-import { initReactI18next } from "react-i18next";
-import en from "./en/signup.json";
-
-i18n
-  // .use(detector)
-  .use(initReactI18next) // passes i18n down to react-i18next
-  .init({
-    lng: "en",
-    fallbackLng: "en", // use en if detected lng is not available
-    resources: {
-      en,
-    },
-  });
-
-export default i18n;
+import i18n from "i18next";
+// import detector from "i18next-browser-languagedetector";
+import { initReactI18next } from "react-i18next";
+import en from "./en/signup.json";
+
+i18n
+  // .use(detector)
+  .use(initReactI18next) // passes i18n down to react-i18next
+  .init({
+    lng: "en",
+    fallbackLng: "en", // use en if detected lng is not available
+    resources: {
+      en,
+    },
+  });
+
+export default i18n;

package/src/index.tsx

@@ -1,8 +1,8 @@
-import getAuthConfig from "./auth/config";
-import { SignUp, useSignUp, SignUpProvider } from "./components/SignUp";
-
-// function SignUp() {
-//   return <>Sign up</>;
-// }
-
-export { getAuthConfig, SignUp, useSignUp, SignUpProvider };
+import getAuthConfig from "./auth/config";
+import { SignUp, useSignUp, SignUpProvider } from "./components/SignUp";
+
+// function SignUp() {
+//   return <>Sign up</>;
+// }
+
+export { getAuthConfig, SignUp, useSignUp, SignUpProvider };