@springmicro/auth 0.6.4 → 0.7.0

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/util/auth-api.ts

@@ -1,198 +1,198 @@
-// 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 { getAcceptLanguage, ROOT_URLS } from "./core";
-
-export function getAccount(query = "") {
-  return fetch(`${ROOT_URLS.casdoor}/api/get-account${query}`, {
-    method: "GET",
-    credentials: "include",
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-/**
- * {"application":"app-sm-api","organization":"org-hosting","username":"db","name":"David Buckley","password":"password","confirm":"password","email":"me@example.com","emailCode":"433910","countryCode":"US","agreement":true,"plan":null,"pricing":null}
- * @param {*} values
- * @returns
- */
-export function signup(values) {
-  let url = `${ROOT_URLS.casdoor}/api/signup`;
-  if (ROOT_URLS.springmicro) {
-    url = `${ROOT_URLS.springmicro}/api/accounts/users/register`;
-  }
-  return fetch(url, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(values),
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-      "Content-Type": "application/json",
-    },
-  }).then((res) => res.json());
-}
-
-export function getEmailAndPhone(organization, username) {
-  return fetch(
-    `${ROOT_URLS.casdoor}/api/get-email-and-phone?organization=${organization}&username=${username}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function casLoginParamsToQuery(casParams) {
-  return `?type=${casParams?.type}&id=${casParams?.id}&redirectUri=${casParams?.service}`;
-}
-
-export function oAuthParamsToQuery(oAuthParams) {
-  // login
-  if (oAuthParams === null || oAuthParams === undefined) {
-    return "";
-  }
-
-  // code
-  return `?clientId=${oAuthParams.clientId}&responseType=${
-    oAuthParams.responseType
-  }&redirectUri=${encodeURIComponent(oAuthParams.redirectUri)}&type=${
-    oAuthParams.type
-  }&scope=${oAuthParams.scope}&state=${oAuthParams.state}&nonce=${
-    oAuthParams.nonce
-  }&code_challenge_method=${oAuthParams.challengeMethod}&code_challenge=${
-    oAuthParams.codeChallenge
-  }`;
-}
-
-export function getApplicationLogin(params) {
-  const queryParams =
-    params?.type === "cas"
-      ? casLoginParamsToQuery(params)
-      : oAuthParamsToQuery(params);
-  return fetch(`${ROOT_URLS.casdoor}/api/get-app-login${queryParams}`, {
-    method: "GET",
-    credentials: "include",
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function login(values, oAuthParams) {
-  return fetch(
-    `${ROOT_URLS.casdoor}/api/login${oAuthParamsToQuery(oAuthParams)}`,
-    {
-      method: "POST",
-      credentials: "include",
-      body: JSON.stringify(values),
-      headers: {
-        "Accept-Language": getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function loginCas(values, params) {
-  return fetch(`${ROOT_URLS.casdoor}/api/login?service=${params.service}`, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(values),
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function logout() {
-  return fetch(`${ROOT_URLS.casdoor}/api/logout`, {
-    method: "POST",
-    credentials: "include",
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function unlink(values) {
-  return fetch(`${ROOT_URLS.casdoor}/api/unlink`, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(values),
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function getSamlLogin(providerId, relayState) {
-  return fetch(
-    `${ROOT_URLS.casdoor}/api/get-saml-login?id=${providerId}&relayState=${relayState}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function loginWithSaml(values, param) {
-  return fetch(`${ROOT_URLS.casdoor}/api/login${param}`, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(values),
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function getWechatMessageEvent(ticket) {
-  return fetch(`${ROOT_URLS.casdoor}/api/get-webhook-event?ticket=${ticket}`, {
-    method: "GET",
-    credentials: "include",
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function getWechatQRCode(providerId) {
-  return fetch(`${ROOT_URLS.casdoor}/api/get-qrcode?id=${providerId}`, {
-    method: "GET",
-    credentials: "include",
-    headers: {
-      "Accept-Language": getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function getCaptchaStatus(values) {
-  return fetch(
-    `${ROOT_URLS.casdoor}/api/get-captcha-status?organization=${values["organization"]}&userId=${values["username"]}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
+// 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 { getAcceptLanguage, ROOT_URLS } from "./core";
+
+export function getAccount(query = "") {
+  return fetch(`${ROOT_URLS.casdoor}/api/get-account${query}`, {
+    method: "GET",
+    credentials: "include",
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+/**
+ * {"application":"app-sm-api","organization":"org-hosting","username":"db","name":"David Buckley","password":"password","confirm":"password","email":"me@example.com","emailCode":"433910","countryCode":"US","agreement":true,"plan":null,"pricing":null}
+ * @param {*} values
+ * @returns
+ */
+export function signup(values) {
+  let url = `${ROOT_URLS.casdoor}/api/signup`;
+  if (ROOT_URLS.springmicro) {
+    url = `${ROOT_URLS.springmicro}/api/accounts/users/register`;
+  }
+  return fetch(url, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(values),
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+      "Content-Type": "application/json",
+    },
+  }).then((res) => res.json());
+}
+
+export function getEmailAndPhone(organization, username) {
+  return fetch(
+    `${ROOT_URLS.casdoor}/api/get-email-and-phone?organization=${organization}&username=${username}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function casLoginParamsToQuery(casParams) {
+  return `?type=${casParams?.type}&id=${casParams?.id}&redirectUri=${casParams?.service}`;
+}
+
+export function oAuthParamsToQuery(oAuthParams) {
+  // login
+  if (oAuthParams === null || oAuthParams === undefined) {
+    return "";
+  }
+
+  // code
+  return `?clientId=${oAuthParams.clientId}&responseType=${
+    oAuthParams.responseType
+  }&redirectUri=${encodeURIComponent(oAuthParams.redirectUri)}&type=${
+    oAuthParams.type
+  }&scope=${oAuthParams.scope}&state=${oAuthParams.state}&nonce=${
+    oAuthParams.nonce
+  }&code_challenge_method=${oAuthParams.challengeMethod}&code_challenge=${
+    oAuthParams.codeChallenge
+  }`;
+}
+
+export function getApplicationLogin(params) {
+  const queryParams =
+    params?.type === "cas"
+      ? casLoginParamsToQuery(params)
+      : oAuthParamsToQuery(params);
+  return fetch(`${ROOT_URLS.casdoor}/api/get-app-login${queryParams}`, {
+    method: "GET",
+    credentials: "include",
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function login(values, oAuthParams) {
+  return fetch(
+    `${ROOT_URLS.casdoor}/api/login${oAuthParamsToQuery(oAuthParams)}`,
+    {
+      method: "POST",
+      credentials: "include",
+      body: JSON.stringify(values),
+      headers: {
+        "Accept-Language": getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function loginCas(values, params) {
+  return fetch(`${ROOT_URLS.casdoor}/api/login?service=${params.service}`, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(values),
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function logout() {
+  return fetch(`${ROOT_URLS.casdoor}/api/logout`, {
+    method: "POST",
+    credentials: "include",
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function unlink(values) {
+  return fetch(`${ROOT_URLS.casdoor}/api/unlink`, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(values),
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function getSamlLogin(providerId, relayState) {
+  return fetch(
+    `${ROOT_URLS.casdoor}/api/get-saml-login?id=${providerId}&relayState=${relayState}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function loginWithSaml(values, param) {
+  return fetch(`${ROOT_URLS.casdoor}/api/login${param}`, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(values),
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function getWechatMessageEvent(ticket) {
+  return fetch(`${ROOT_URLS.casdoor}/api/get-webhook-event?ticket=${ticket}`, {
+    method: "GET",
+    credentials: "include",
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function getWechatQRCode(providerId) {
+  return fetch(`${ROOT_URLS.casdoor}/api/get-qrcode?id=${providerId}`, {
+    method: "GET",
+    credentials: "include",
+    headers: {
+      "Accept-Language": getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function getCaptchaStatus(values) {
+  return fetch(
+    `${ROOT_URLS.casdoor}/api/get-captcha-status?organization=${values["organization"]}&userId=${values["username"]}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}