api修正

cateiru · Feb 14, 2024 · 3fd5dfc · 3fd5dfc
1 parent 25c526f
commit 3fd5dfc
Show file tree

Hide file tree

Showing 57 changed files with 50 additions and 232 deletions.
diff --git a/components/Auth/useOidcRequire.tsx b/components/Auth/useOidcRequire.tsx
@@ -1,6 +1,6 @@
 import {useRouter, useSearchParams} from 'next/navigation';
 import React from 'react';
-import {api} from '../../utils/api';
+import {api, fetch} from '../../utils/api';
 import {
   PublicAuthenticationLoginSessionSchema,
   PublicAuthenticationRequest,
@@ -47,8 +47,6 @@ export const useOidcRequire = (submit: () => Promise<void>) => {
 
     try {
       res = await fetch(api('/oidc/require'), {
-        credentials: 'include',
-        mode: 'cors',
         method: 'POST',
         body: params,
         headers: {

diff --git a/components/Auth/useOidcSubmit.tsx b/components/Auth/useOidcSubmit.tsx
@@ -34,8 +34,6 @@ export const useOidcSubmit = (): Returns => {
     }
 
     const response = await submitRequest({
-      credentials: 'include',
-      mode: 'cors',
       method: 'POST',
       body: params,
       headers: {
@@ -67,8 +65,6 @@ export const useOidcSubmit = (): Returns => {
     }
 
     const response = await cancelRequest({
-      credentials: 'include',
-      mode: 'cors',
       method: 'POST',
       body: params,
       headers: {

diff --git a/components/Client/ClientAllowUser.tsx b/components/Client/ClientAllowUser.tsx
@@ -72,8 +72,6 @@ export const ClientAllowUser = () => {
     const res = await request({
       method: 'POST',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/Client/ClientAllowUserTable.tsx b/components/Client/ClientAllowUserTable.tsx
@@ -42,8 +42,6 @@ export const ClientAllowUserTable: React.FC<{id: string | string[]}> = ({
     const res = await request(
       {
         method: 'DELETE',
-        mode: 'cors',
-        credentials: 'include',
       },
       param
     );

diff --git a/components/Client/ClientDeleteModal.tsx b/components/Client/ClientDeleteModal.tsx
@@ -21,8 +21,6 @@ export const ClientDeleteModal: React.FC<Props> = ({clientId, orgId}) => {
     const res = await request(
       {
         method: 'DELETE',
-        mode: 'cors',
-        credentials: 'include',
       },
       params
     );

diff --git a/components/Client/EditClient.tsx b/components/Client/EditClient.tsx
@@ -91,8 +91,6 @@ export const EditClient = () => {
     const c = async () => {
       const res = await requestConfig({
         method: 'GET',
-        mode: 'cors',
-        credentials: 'include',
       });
 
       if (res) {
@@ -113,8 +111,6 @@ export const EditClient = () => {
       const res = await request(
         {
           method: 'GET',
-          mode: 'cors',
-          credentials: 'include',
         },
         param
       );
@@ -206,8 +202,6 @@ export const EditClient = () => {
 
     const res = await request({
       method: 'PUT',
-      mode: 'cors',
-      credentials: 'include',
       body: form,
     });
 
@@ -231,8 +225,6 @@ export const EditClient = () => {
     const res = await requestDeleteImage(
       {
         method: 'DELETE',
-        mode: 'cors',
-        credentials: 'include',
       },
       param
     );

diff --git a/components/Client/RegisterClient.tsx b/components/Client/RegisterClient.tsx
@@ -80,8 +80,6 @@ export const RegisterClient = () => {
     const f = async () => {
       const res = await requestConfig({
         method: 'GET',
-        mode: 'cors',
-        credentials: 'include',
       });
 
       if (res) {
@@ -141,8 +139,6 @@ export const RegisterClient = () => {
 
     const res = await request({
       method: 'POST',
-      mode: 'cors',
-      credentials: 'include',
       body: form,
     });
 

diff --git a/components/Common/Form/OrgJoinUser.tsx b/components/Common/Form/OrgJoinUser.tsx
@@ -45,8 +45,6 @@ export const OrgJoinUser: React.FC<Props> = props => {
     const res = await request({
       method: 'POST',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/Common/Form/UserNameForm.tsx b/components/Common/Form/UserNameForm.tsx
@@ -60,8 +60,6 @@ export const UserNameForm: React.FC<Props> = ({userName}) => {
 
     const res = await request({
       method: 'POST',
-      mode: 'cors',
-      credentials: 'include',
       body: form,
     });
 

diff --git a/components/Common/useLogout.tsx b/components/Common/useLogout.tsx
@@ -13,8 +13,6 @@ export const useLogout = (): Returns => {
   const logout = async () => {
     const res = await request({
       method: 'POST',
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/Common/useRequest.tsx b/components/Common/useRequest.tsx
@@ -1,5 +1,5 @@
 import {useToast} from '@chakra-ui/react';
-import {api} from '../../utils/api';
+import {api, fetch} from '../../utils/api';
 import {
   ErrorSchema,
   ErrorType,
@@ -13,15 +13,15 @@ interface Options {
 
 interface Returns {
   request: (
-    data: RequestInit,
+    data?: RequestInit,
     urlParams?: URLSearchParams
   ) => Promise<Response | undefined>;
 }
 
 export const useRequest = (path: string, options?: Options): Returns => {
   const toast = useToast();
 
-  const request = async (data: RequestInit, urlParams?: URLSearchParams) => {
+  const request = async (data?: RequestInit, urlParams?: URLSearchParams) => {
     try {
       const res = await fetch(api(path, urlParams), data);
 

diff --git a/components/Common/useSession.tsx b/components/Common/useSession.tsx
@@ -33,8 +33,6 @@ export const useSession = () => {
 
       fetch(api('/user/me'), {
         method: 'GET',
-        credentials: 'include',
-        mode: 'cors',
       })
         .then(async res => {
           if (res.ok) {

diff --git a/components/Histories/LogoutDevice.tsx b/components/Histories/LogoutDevice.tsx
@@ -19,8 +19,6 @@ export const LogoutDevice: React.FC<Props> = props => {
 
     const res = await request({
       method: 'POST',
-      mode: 'cors',
-      credentials: 'include',
       body: form,
     });
 

diff --git a/components/Login/OtpPage.tsx b/components/Login/OtpPage.tsx
@@ -62,8 +62,6 @@ export const OtpPage: React.FC<Props> = props => {
     const res = await request({
       method: 'POST',
       body: form,
-      credentials: 'include',
-      mode: 'cors',
       headers: {
         ...oauthLoginSession(),
       },

diff --git a/components/Login/UserIDEmailForm.tsx b/components/Login/UserIDEmailForm.tsx
@@ -71,8 +71,6 @@ export const UserIDEmailForm: React.FC<Props> = ({
       const res = await request({
         method: 'POST',
         body: form,
-        mode: 'cors',
-        credentials: 'include',
       });
 
       if (res) {

diff --git a/components/Login/UserIDEmailPage.tsx b/components/Login/UserIDEmailPage.tsx
@@ -68,8 +68,6 @@ export const UserIDEmailPage: React.FC<Props> = props => {
     const res = await request({
       method: 'POST',
       body: form,
-      credentials: 'include',
-      mode: 'cors',
       headers: {
         ...getOauthLoginSession(),
       },

diff --git a/components/Login/useWebAuthn.tsx b/components/Login/useWebAuthn.tsx
@@ -40,8 +40,6 @@ export const useWebAuthn = (loginSuccess: (user: UserMe) => void): Returns => {
 
     const f = async () => {
       const res = await getBeginKey({
-        mode: 'cors',
-        credentials: 'include',
         method: 'POST',
       });
       if (!res) return;
@@ -76,8 +74,6 @@ export const useWebAuthn = (loginSuccess: (user: UserMe) => void): Returns => {
       }
 
       const resCredential = await pushCredential({
-        mode: 'cors',
-        credentials: 'include',
         body: JSON.stringify(credential),
         headers: {
           'Content-Type': 'application/json',
@@ -112,8 +108,6 @@ export const useWebAuthn = (loginSuccess: (user: UserMe) => void): Returns => {
 
   const onClickWebAuthn = async () => {
     const res = await getBeginKey({
-      mode: 'cors',
-      credentials: 'include',
       method: 'POST',
     });
     if (!res) return;
@@ -145,8 +139,6 @@ export const useWebAuthn = (loginSuccess: (user: UserMe) => void): Returns => {
     }
 
     const resCredential = await pushCredential({
-      mode: 'cors',
-      credentials: 'include',
       body: JSON.stringify(credential),
       headers: {
         'Content-Type': 'application/json',

diff --git a/components/Organization/JoinOrganization.tsx b/components/Organization/JoinOrganization.tsx
@@ -68,8 +68,6 @@ const InviteForm: React.FC<InviteFormProps> = ({
     const res = await request({
       method: 'POST',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {
@@ -161,8 +159,6 @@ const JoinForm: React.FC<JoinFormProps> = ({
     const res = await request({
       method: 'POST',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/Organization/OrganizationMember.tsx b/components/Organization/OrganizationMember.tsx
@@ -114,8 +114,6 @@ export const OrganizationMember: React.FC<Props> = ({id}) => {
     const res = await request({
       method: 'PUT',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {
@@ -132,8 +130,6 @@ export const OrganizationMember: React.FC<Props> = ({id}) => {
     const res = await request(
       {
         method: 'DELETE',
-        mode: 'cors',
-        credentials: 'include',
       },
       param
     );
@@ -154,8 +150,6 @@ export const OrganizationMember: React.FC<Props> = ({id}) => {
     const res = await requestJoin(
       {
         method: 'DELETE',
-        mode: 'cors',
-        credentials: 'include',
       },
       param
     );

diff --git a/components/Profile/UpdateAvatar.tsx b/components/Profile/UpdateAvatar.tsx
@@ -97,8 +97,6 @@ export const UpdateAvatar = () => {
             const res = await request({
               method: 'POST',
               body: form,
-              mode: 'cors',
-              credentials: 'include',
             });
 
             if (res) {
@@ -150,8 +148,6 @@ export const UpdateAvatar = () => {
 
     const res = await request({
       method: 'DELETE',
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/Profile/useUpdateProfile.tsx b/components/Profile/useUpdateProfile.tsx
@@ -40,8 +40,6 @@ export const useUpdateProfile = (): Returns => {
     const res = await request({
       method: 'PUT',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {

diff --git a/components/RegisterAccount/EmailInputPage.tsx b/components/RegisterAccount/EmailInputPage.tsx
@@ -35,8 +35,6 @@ export const EmailInputPage: React.FC<Props> = props => {
 
     const res = await request({
       method: 'POST',
-      credentials: 'include',
-      mode: 'cors',
       body: form,
     });
 

diff --git a/components/RegisterAccount/EmailResend.tsx b/components/RegisterAccount/EmailResend.tsx
@@ -26,8 +26,6 @@ export const EmailResend: React.FC<Props> = props => {
 
     const res = await request({
       method: 'POST',
-      credentials: 'include',
-      mode: 'cors',
       body: form,
       headers: {
         'X-Register-Token': props.registerToken,

diff --git a/components/RegisterAccount/EmailVerifyPage.tsx b/components/RegisterAccount/EmailVerifyPage.tsx
@@ -28,8 +28,6 @@ export const EmailVerifyPage: React.FC<Props> = props => {
 
     const res = await request({
       method: 'POST',
-      credentials: 'include',
-      mode: 'cors',
       body: form,
       headers: {
         'X-Register-Token': props.registerToken,

diff --git a/components/RegisterAccount/RegisterCertificatePage.tsx b/components/RegisterAccount/RegisterCertificatePage.tsx
@@ -40,8 +40,6 @@ export const RegisterCertificatePage: React.FC<Props> = props => {
 
     const res = await requestPassword({
       method: 'POST',
-      credentials: 'include',
-      mode: 'cors',
       body: form,
       headers: {
         'X-Register-Token': props.registerToken,
@@ -59,8 +57,6 @@ export const RegisterCertificatePage: React.FC<Props> = props => {
   const onSubmitPasskey = async (data: RegistrationPublicKeyCredential) => {
     const res = await requestPasskey({
       method: 'POST',
-      credentials: 'include',
-      mode: 'cors',
       body: JSON.stringify(data),
       headers: {
         'X-Register-Token': props.registerToken,

diff --git a/components/RegisterAccount/RegisterPasskeyForm.tsx b/components/RegisterAccount/RegisterPasskeyForm.tsx
@@ -23,8 +23,6 @@ export const RegisterPasskeyForm: React.FC<Props> = props => {
     const f = async () => {
       const res = await request({
         method: 'POST',
-        credentials: 'include',
-        mode: 'cors',
         headers: {
           'X-Register-Token': props.registerToken,
         },

diff --git a/components/RegisterAccount/useInvite.tsx b/components/RegisterAccount/useInvite.tsx
@@ -38,8 +38,6 @@ export const useInvite = (
 
       const res = await request({
         method: 'POST',
-        mode: 'cors',
-        credentials: 'include',
         body: form,
       });
 

diff --git a/components/ReregistrationPassword/Forget.tsx b/components/ReregistrationPassword/Forget.tsx
@@ -30,8 +30,6 @@ export const Forget = () => {
     const res = await request({
       method: 'POST',
       body: form,
-      mode: 'cors',
-      credentials: 'include',
     });
 
     if (res) {