@springmicro/auth 0.5.0 → 0.5.2

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

@@ -1,155 +1,157 @@
-// https://github.com/casdoor/casdoor/blob/master/web/src/backend/ApplicationBackend.js
-
-// 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 * as Setting from "./core";
-
-export function getApplications(
-  owner: string,
-  page = "",
-  pageSize = "",
-  field = "",
-  value = "",
-  sortField = "",
-  sortOrder = ""
-) {
-  return fetch(
-    `${Setting.ROOT_URLS.casdoor}/api/get-applications?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function getApplicationsByOrganization(
-  owner: string,
-  organization: string,
-  page = "",
-  pageSize = "",
-  field = "",
-  value = "",
-  sortField = "",
-  sortOrder = ""
-) {
-  return fetch(
-    `${Setting.ROOT_URLS.casdoor}/api/get-organization-applications?owner=${owner}&organization=${organization}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function getApplication(owner: string, name: string) {
-  return fetch(
-    `${
-      Setting.ROOT_URLS.casdoor
-    }/api/get-application?id=${owner}/${encodeURIComponent(name)}`,
-    {
-      method: "GET",
-      // credentials: "include",
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function getUserApplication(owner: string, name: string) {
-  return fetch(
-    `${
-      Setting.ROOT_URLS.casdoor
-    }/api/get-user-application?id=${owner}/${encodeURIComponent(name)}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function updateApplication(
-  owner: string,
-  name: string,
-  application: string
-) {
-  return fetch(
-    `${
-      Setting.ROOT_URLS.casdoor
-    }/api/update-application?id=${owner}/${encodeURIComponent(name)}`,
-    {
-      method: "POST",
-      credentials: "include",
-      body: JSON.stringify(application),
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.json());
-}
-
-export function addApplication(application: string) {
-  const newApplication = Setting.deepCopy(application);
-  return fetch(`${Setting.ROOT_URLS.casdoor}/api/add-application`, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(newApplication),
-    headers: {
-      "Accept-Language": Setting.getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function deleteApplication(application: string) {
-  const newApplication = Setting.deepCopy(application);
-  return fetch(`${Setting.ROOT_URLS.casdoor}/api/delete-application`, {
-    method: "POST",
-    credentials: "include",
-    body: JSON.stringify(newApplication),
-    headers: {
-      "Accept-Language": Setting.getAcceptLanguage(),
-    },
-  }).then((res) => res.json());
-}
-
-export function getSamlMetadata(
-  owner: string,
-  name: string,
-  enablePostBinding: boolean
-) {
-  return fetch(
-    `${
-      Setting.ROOT_URLS.casdoor
-    }/api/saml/metadata?application=${owner}/${encodeURIComponent(
-      name
-    )}&enablePostBinding=${enablePostBinding}`,
-    {
-      method: "GET",
-      credentials: "include",
-      headers: {
-        "Accept-Language": Setting.getAcceptLanguage(),
-      },
-    }
-  ).then((res) => res.text());
-}
+// https://github.com/casdoor/casdoor/blob/master/web/src/backend/ApplicationBackend.js
+
+// 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 * as Setting from "./core";
+
+export function getApplications(
+  owner: string,
+  page = "",
+  pageSize = "",
+  field = "",
+  value = "",
+  sortField = "",
+  sortOrder = ""
+) {
+  return fetch(
+    `${Setting.ROOT_URLS.casdoor}/api/get-applications?owner=${owner}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function getApplicationsByOrganization(
+  owner: string,
+  organization: string,
+  page = "",
+  pageSize = "",
+  field = "",
+  value = "",
+  sortField = "",
+  sortOrder = ""
+) {
+  return fetch(
+    `${Setting.ROOT_URLS.casdoor}/api/get-organization-applications?owner=${owner}&organization=${organization}&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function getApplication(owner: string, name: string) {
+  return fetch(
+    `${
+      Setting.ROOT_URLS.casdoor
+    }/api/get-application?id=${owner}/${encodeURIComponent(name)}`,
+    {
+      method: "GET",
+      credentials: Setting.ROOT_URLS.casdoor.startsWith("https")
+        ? "include"
+        : undefined,
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function getUserApplication(owner: string, name: string) {
+  return fetch(
+    `${
+      Setting.ROOT_URLS.casdoor
+    }/api/get-user-application?id=${owner}/${encodeURIComponent(name)}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function updateApplication(
+  owner: string,
+  name: string,
+  application: string
+) {
+  return fetch(
+    `${
+      Setting.ROOT_URLS.casdoor
+    }/api/update-application?id=${owner}/${encodeURIComponent(name)}`,
+    {
+      method: "POST",
+      credentials: "include",
+      body: JSON.stringify(application),
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.json());
+}
+
+export function addApplication(application: string) {
+  const newApplication = Setting.deepCopy(application);
+  return fetch(`${Setting.ROOT_URLS.casdoor}/api/add-application`, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(newApplication),
+    headers: {
+      "Accept-Language": Setting.getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function deleteApplication(application: string) {
+  const newApplication = Setting.deepCopy(application);
+  return fetch(`${Setting.ROOT_URLS.casdoor}/api/delete-application`, {
+    method: "POST",
+    credentials: "include",
+    body: JSON.stringify(newApplication),
+    headers: {
+      "Accept-Language": Setting.getAcceptLanguage(),
+    },
+  }).then((res) => res.json());
+}
+
+export function getSamlMetadata(
+  owner: string,
+  name: string,
+  enablePostBinding: boolean
+) {
+  return fetch(
+    `${
+      Setting.ROOT_URLS.casdoor
+    }/api/saml/metadata?application=${owner}/${encodeURIComponent(
+      name
+    )}&enablePostBinding=${enablePostBinding}`,
+    {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Accept-Language": Setting.getAcceptLanguage(),
+      },
+    }
+  ).then((res) => res.text());
+}