@springmicro/auth 0.5.3 → 0.5.5

package/dist/{number-D9Q-3_Cz.js → number-CYbm8TMo.js}

@@ -1,4 +1,4 @@
-import { i as D, t as ue, q as h, B as f, o as He, s as I, y as ce, C as ze, u as je, d as P, n as w, f as $, g as U, e as te } from "./Web3Auth-R27O2eCc.js";
+import { i as D, t as ue, q as h, B as f, o as He, s as I, y as ce, C as ze, u as je, d as P, n as w, f as $, g as U, e as te } from "./Web3Auth-hzrmIcT1.js";
 function A(e) {
   if (!Number.isSafeInteger(e) || e < 0)
     throw new Error(`Wrong positive integer: ${e}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springmicro/auth",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "private": false,
   "publishConfig": {
     "access": "public",
@@ -54,5 +54,5 @@
     "react-social-login-buttons": "^4.1.0",
     "uuid": "^9.0.1"
   },
-  "gitHead": "049eb0491834ffa64dd66a1d965ccd3e5751d085"
+  "gitHead": "9ccb87063f4e9e3a6b51bf48c27c1323b3de2858"
 }

package/src/components/SignUp.tsx

@@ -49,8 +49,6 @@ export type SignUpFormState = {
 type SignUpFormProps = {
   application: Application | null;
   applicationName?: string;
-  CLIENT_ID: string;
-  CLIENT_SECRET: string;
 
   // onUpdateAccount: (account: Account) => void;
   onUpdateApplication: (application: Application | null) => void;
@@ -80,19 +78,16 @@ function SignUpForm(props: SignUpFormProps) {
       return;
     }
 
-    ApplicationBackend.getApplication(
-      "admin",
-      applicationName,
-      props.CLIENT_ID,
-      props.CLIENT_SECRET
-    ).then((res: any) => {
-      if (res.status === "error") {
-        Setting.showMessage("error", res.msg);
-        return;
-      }
+    ApplicationBackend.getApplication("admin", applicationName).then(
+      (res: any) => {
+        if (res.status === "error") {
+          Setting.showMessage("error", res.msg);
+          return;
+        }
 
-      onUpdateApplication(res.data);
-    });
+        onUpdateApplication(res.data);
+      }
+    );
   };
   const getApplicationLogin = (oAuthParams: any) => {
     AuthBackend.getApplicationLogin(oAuthParams).then((res) => {
@@ -181,15 +176,7 @@ function SignUpForm(props: SignUpFormProps) {
   return application.signupItems?.map((signupItem, idx) => {
     return (
       <div key={idx}>
-        {renderFormItem(
-          application,
-          signupItem,
-          state,
-          setState,
-          t,
-          props.CLIENT_ID,
-          props.CLIENT_SECRET
-        )}
+        {renderFormItem(application, signupItem, state, setState, t)}
       </div>
     );
   });
@@ -203,16 +190,12 @@ type SignUpProps = {
   applicationName: string;
   casdoorApiRoot: string;
   springmicroApiRoot?: string;
-  CLIENT_ID: string;
-  CLIENT_SECRET: string;
 };
 
 export function SignUp({
   applicationName,
   casdoorApiRoot,
   springmicroApiRoot,
-  CLIENT_ID,
-  CLIENT_SECRET,
 }: SignUpProps) {
   Setting.ROOT_URLS.casdoor = casdoorApiRoot;
   if (springmicroApiRoot) {
@@ -221,22 +204,19 @@ export function SignUp({
   const [state, setState] = React.useState<SignUpState>({ application: null });
 
   const getApplication = () => {
-    ApplicationBackend.getApplication(
-      "admin",
-      applicationName,
-      CLIENT_ID,
-      CLIENT_SECRET
-    ).then((res: any) => {
-      console.log(res);
-      if (res.status === "error") {
-        Setting.showMessage("error", res.msg);
-        return;
-      }
+    ApplicationBackend.getApplication("admin", applicationName).then(
+      (res: any) => {
+        console.log(res);
+        if (res.status === "error") {
+          Setting.showMessage("error", res.msg);
+          return;
+        }
 
-      setState({
-        application: res.data,
-      });
-    });
+        setState({
+          application: res.data,
+        });
+      }
+    );
   };
 
   React.useEffect(() => {
@@ -254,8 +234,6 @@ export function SignUp({
             application: application,
           });
         }}
-        CLIENT_ID={CLIENT_ID}
-        CLIENT_SECRET={CLIENT_SECRET}
       />
     </I18nextProvider>
   );
@@ -287,8 +265,6 @@ export function SignUpProvider({
   applicationName,
   casdoorApiRoot,
   springmicroApiRoot,
-  CLIENT_ID,
-  CLIENT_SECRET,
   children,
 }: React.PropsWithChildren<SignUpProps>) {
   const { t, i18n } = useTranslation();
@@ -303,22 +279,19 @@ export function SignUpProvider({
     React.useState<Record<string, boolean>>({});
 
   const getApplication = () => {
-    ApplicationBackend.getApplication(
-      "admin",
-      applicationName,
-      CLIENT_ID,
-      CLIENT_SECRET
-    ).then((res: any) => {
-      console.log(res);
-      if (res.status === "error") {
-        Setting.showMessage("error", res.msg);
-        return;
-      }
+    ApplicationBackend.getApplication("admin", applicationName).then(
+      (res: any) => {
+        console.log(res);
+        if (res.status === "error") {
+          Setting.showMessage("error", res.msg);
+          return;
+        }
 
-      setState({
-        application: res.data,
-      });
-    });
+        setState({
+          application: res.data,
+        });
+      }
+    );
   };
 
   const onUpdateApplication = (application: Application) => {

package/src/components/forms/SendCodeInput.tsx

@@ -21,7 +21,7 @@ import { useTranslation } from "react-i18next";
 
 type ButtonClickArgsTuple = [
   dest: any,
-  type: any,
+  type: string,
   applicationId: any,
   checkUser?: string
 ];
@@ -35,8 +35,6 @@ export type SendCodeInputProps = {
   application: Application;
   method: string;
   countryCode: string;
-  CLIENT_ID: string;
-  CLIENT_SECRET: string;
 };
 
 export const SendCodeInput = ({
@@ -48,8 +46,6 @@ export const SendCodeInput = ({
   application,
   method,
   countryCode,
-  CLIENT_ID,
-  CLIENT_SECRET,
 }: SendCodeInputProps) => {
   const { t } = useTranslation();
   const [visible, setVisible] = React.useState(false);
@@ -84,9 +80,7 @@ export const SendCodeInput = ({
       clientSecret,
       method,
       countryCode,
-      ...onButtonClickArgs,
-      CLIENT_ID,
-      CLIENT_SECRET
+      ...onButtonClickArgs
     ).then((res: any) => {
       setButtonLoading(false);
       if (res) {

package/src/components/forms/SignUpFormItem.tsx

@@ -157,9 +157,7 @@ export function renderFormItem(
   signupItem: any,
   state: SignUpFormState,
   setState: React.Dispatch<React.SetStateAction<SignUpFormState>>,
-  t: TFunction<"translation", undefined>,
-  CLIENT_ID: string,
-  CLIENT_SECRET: string
+  t: TFunction<"translation", undefined>
 ) {
   if (!signupItem.visible) {
     return null;
@@ -355,8 +353,6 @@ export function renderFormItem(
                   onChange={(value: string) =>
                     setState({ ...state, emailCode: value })
                   }
-                  CLIENT_ID={CLIENT_ID}
-                  CLIENT_SECRET={CLIENT_SECRET}
                 />
               }
               setFieldValue={setFieldValue}

package/src/components/forms/util/application-api.ts

@@ -59,21 +59,15 @@ export function getApplicationsByOrganization(
   ).then((res) => res.json());
 }
 
-export function getApplication(
-  owner: string,
-  name: string,
-  CLIENT_ID: string,
-  CLIENT_SECRET: string
-) {
-  console.log("ATTEMPTING TO GET APPLICATION");
+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: {
-        Authorization: "Basic " + btoa(`${CLIENT_ID}:${CLIENT_SECRET}`),
         "Content-Type": "application/json",
       },
     }

package/src/components/forms/util/user-api.ts

@@ -170,9 +170,7 @@ export function sendCode(
   dest,
   type,
   applicationId,
-  checkUser = "",
-  CLIENT_ID,
-  CLIENT_SECRET
+  checkUser = ""
 ) {
   const formData = new FormData();
   formData.append("captchaType", captchaType);
@@ -184,14 +182,13 @@ export function sendCode(
   formData.append("type", type);
   formData.append("applicationId", "admin/" + applicationId);
   formData.append("checkUser", checkUser);
-  console.log(Object.fromEntries(formData.entries()));
+
   return fetch(`${ROOT_URLS.casdoor}/api/send-verification-code`, {
     method: "POST",
-    // credentials: ROOT_URLS.casdoor.startsWith("https") ? "include" : undefined,
+    credentials: "include",
     body: formData,
     headers: {
-      Authorization: "Basic " + btoa(`${CLIENT_ID}:${CLIENT_SECRET}`),
-      "Content-Type": "application/json",
+      // "Content-Type": "application/json",
       "Accept-Language": getAcceptLanguage(),
     },
   })