cleanup unused code

clerk · Oct 3, 2024 · 8c336ab · 8c336ab
1 parent 77c58d3
commit 8c336ab
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 111 deletions.
diff --git a/packages/nextjs/src/app-router/server/controlComponents.tsx b/packages/nextjs/src/app-router/server/controlComponents.tsx
@@ -4,7 +4,6 @@ import { __internal_findFailedProtectConfiguration } from '@clerk/shared';
 import type {
   __experimental_SessionVerificationLevel,
   Autocomplete,
-  CheckAuthorizationWithCustomPermissions,
   OrganizationCustomPermissionKey,
   OrganizationCustomRoleKey,
 } from '@clerk/types';
@@ -97,28 +96,18 @@ type NonNullableRecord<T, K extends keyof T> = {
 
 type WithProtectComponentParams =
   | {
-      condition?: never;
       role: OrganizationCustomRoleKey;
       permission?: never;
       reverification?: never;
       fallback?: React.ComponentType | string;
     }
   | {
-      condition?: never;
       role?: never;
       permission: OrganizationCustomPermissionKey;
       reverification?: never;
       fallback?: React.ComponentType | string;
     }
   | {
-      condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
-      role?: never;
-      permission?: never;
-      reverification?: never;
-      fallback?: React.ComponentType;
-    }
-  | {
-      condition?: never;
       role?: never;
       permission?: never;
       reverification:
@@ -232,10 +221,6 @@ function __experimental_protectComponent(params?: ProtectComponentParams) {
       if (failedItem?.fallback) {
         const Fallback = failedItem.fallback;
 
-        if (Fallback === 'modal') {
-          return <UserVerificationModal />;
-        }
-
         if (Fallback === 'redirectToSignIn') {
           _auth.redirectToSignIn();
         }
@@ -248,26 +233,13 @@ function __experimental_protectComponent(params?: ProtectComponentParams) {
           throw 'not valid';
         }
 
-        if (!failedItem.reverification) {
-          return (
-            // @ts-expect-error type props
-            <Fallback
-              {
-                // Could this be unsafe ?
-                ...props
-              }
-            />
-          );
-        }
-
         return (
           // @ts-expect-error type props
           <Fallback
             {
               // Could this be unsafe ?
               ...props
             }
-            UserVerificationTrigger={UserVerificationTrigger}
           />
         );
       }

diff --git a/packages/nextjs/src/server/protectAction.ts b/packages/nextjs/src/server/protectAction.ts
@@ -2,7 +2,6 @@ import type { ProtectConfiguration } from '@clerk/shared/protect';
 import { __internal_findFailedProtectConfiguration } from '@clerk/shared/protect';
 import type {
   __experimental_SessionVerificationLevel,
-  CheckAuthorizationWithCustomPermissions,
   OrganizationCustomPermissionKey,
   OrganizationCustomRoleKey,
 } from '@clerk/types';
@@ -24,25 +23,16 @@ type NonNullableRecord<T, K extends keyof T> = {
 
 type WithProtectActionParams =
   | {
-      condition?: never;
       role: OrganizationCustomRoleKey;
       permission?: never;
       reverification?: never;
     }
   | {
-      condition?: never;
       role?: never;
       permission: OrganizationCustomPermissionKey;
       reverification?: never;
     }
   | {
-      condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
-      role?: never;
-      permission?: never;
-      reverification?: never;
-    }
-  | {
-      condition?: never;
       role?: never;
       permission?: never;
       reverification:
@@ -84,15 +74,10 @@ function protectAction() {
         | Promise<
             InferStrictTypeParams<T> extends { reverification: any }
               ? {
-                  // a: InferStrictTypeParams<T>;
                   clerk_error: {
                     type: 'forbidden';
                     reason: 'assurance';
                     metadata: Omit<InferStrictTypeParams<T>, 'fallback'>;
-                    //   {
-                    //   level: __experimental_SessionVerificationLevel;
-                    //   maxAge: __experimental_SessionVerificationMaxAge;
-                    // };
                   };
                 }
               : InferStrictTypeParams<T> extends
@@ -180,31 +165,6 @@ function protectAction() {
       const _auth = auth();
       const failedItem = __internal_findFailedProtectConfiguration(configs, _auth);
 
-      if (failedItem?.reverification) {
-        const errorObj = {
-          clerk_error: {
-            type: 'forbidden',
-            reason: 'assurance',
-            metadata: failedItem.reverification,
-          },
-        } as const;
-
-        //@ts-ignore
-        return errorObj;
-      }
-
-      if (failedItem?.role || failedItem?.permission) {
-        // What should we do here ?
-        return {
-          //@ts-ignore
-          clerk_error: {
-            type: 'something',
-            reason: 'something',
-            metadata: failedItem,
-          },
-        };
-      }
-
       if (failedItem) {
         return {
           //@ts-ignore

diff --git a/packages/nextjs/src/server/protectRoute.ts b/packages/nextjs/src/server/protectRoute.ts
@@ -2,7 +2,6 @@ import type { ProtectConfiguration } from '@clerk/shared/protect';
 import { __internal_findFailedProtectConfiguration } from '@clerk/shared/protect';
 import type {
   __experimental_SessionVerificationLevel,
-  CheckAuthorizationWithCustomPermissions,
   OrganizationCustomPermissionKey,
   OrganizationCustomRoleKey,
 } from '@clerk/types';
@@ -21,25 +20,16 @@ type NonNullableRecord<T, K extends keyof T> = {
 
 type WithProtectActionParams =
   | {
-      condition?: never;
       role: OrganizationCustomRoleKey;
       permission?: never;
       reverification?: never;
     }
   | {
-      condition?: never;
       role?: never;
       permission: OrganizationCustomPermissionKey;
       reverification?: never;
     }
   | {
-      condition: (has: CheckAuthorizationWithCustomPermissions) => boolean;
-      role?: never;
-      permission?: never;
-      reverification?: never;
-    }
-  | {
-      condition?: never;
       role?: never;
       permission?: never;
       reverification:
@@ -122,7 +112,7 @@ function protectRoute() {
               },
             }),
             {
-              status: 403,
+              status: 401,
             },
           );
         }
@@ -147,36 +137,6 @@ function protectRoute() {
       const _auth = auth();
       const failedItem = __internal_findFailedProtectConfiguration(configs, _auth);
 
-      if (failedItem?.reverification) {
-        const errorObj = {
-          clerk_error: {
-            type: 'forbidden',
-            reason: 'assurance',
-            metadata: failedItem.reverification,
-          },
-        } as const;
-
-        return new Response(JSON.stringify(errorObj), {
-          status: 403,
-        });
-      }
-
-      if (failedItem?.role || failedItem?.permission) {
-        // What should we do here ?
-        return new Response(
-          JSON.stringify({
-            clerk_error: {
-              type: 'something',
-              reason: 'something',
-              metadata: failedItem,
-            },
-          }),
-          {
-            status: 403,
-          },
-        );
-      }
-
       if (failedItem) {
         return new Response(
           JSON.stringify({
@@ -186,7 +146,7 @@ function protectRoute() {
             },
           }),
           {
-            status: 403,
+            status: 401,
           },
         );
       }

diff --git a/packages/react/src/components/index.ts b/packages/react/src/components/index.ts
@@ -16,7 +16,6 @@ export {
   SignedOut,
   SignedIn,
   Protect,
-  // protect as __experimental_protect,
   __experimental_protectComponent,
   RedirectToSignIn,
   RedirectToSignUp,