chore(expo): Use error thrower and move useOAuth hook

clerk · May 30, 2024 · c6bf6bb · c6bf6bb
1 parent 28b5c35
commit c6bf6bb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/packages/expo/src/components/uiComponents.tsx b/packages/expo/src/components/uiComponents.tsx
@@ -8,16 +8,18 @@ import {
 } from '@clerk/clerk-react';
 import { Platform } from 'react-native';
 
+import { errorThrower } from '../utils/errors';
+
 const ErrorComponent = (componentName: string) => {
-  throw new Error(`<${componentName}/> is not supported on this platform`);
+  throw errorThrower.throw(`The ${componentName} component is not supported in the Expo environment.`);
 };
 
 function WrapComponent<T extends { displayName: string }>(component: T) {
   const commonentName = component.displayName.replace('withClerk(', '').replace(')', '');
 
-  // @ts-expect-error - This is a hack to make the function signature match the original
+  // @ts-expect-error - This is just to make the function signature match the original
   return Platform.select<T>({
-    // @ts-expect-error - This is a hack to make the function signature match the original
+    // @ts-expect-error - This is just to make the function signature match the original
     native: () => () => ErrorComponent(commonentName),
     default: () => component,
   })();

diff --git a/packages/expo/src/hooks/useOAuth.ts b/packages/expo/src/hooks/useOAuth.ts
diff --git a/packages/expo/src/hooks/useOAuth/index.ts b/packages/expo/src/hooks/useOAuth/index.ts
@@ -0,0 +1 @@
+export * from './useOAuth';
diff --git a/...ges/expo/src/hooks/useOAuthImpl.native.ts → ...xpo/src/hooks/useOAuth/useOAuth.native.ts b/...ges/expo/src/hooks/useOAuthImpl.native.ts → ...xpo/src/hooks/useOAuth/useOAuth.native.ts
@@ -63,6 +63,9 @@ export function useOAuth(useOAuthParams: UseOAuthFlowParams) {
       // @ts-ignore
       externalVerificationRedirectURL.toString(),
       oauthRedirectUrl,
+      {
+        showInRecents: true,
+      },
     );
 
     // @ts-expect-error

diff --git a/packages/expo/src/hooks/useOAuthImpl.ts → packages/expo/src/hooks/useOAuth/useOAuth.ts b/packages/expo/src/hooks/useOAuthImpl.ts → packages/expo/src/hooks/useOAuth/useOAuth.ts
@@ -1,13 +1,15 @@
 import type { OAuthStrategy } from '@clerk/types';
 import { Platform } from 'react-native';
 
+import { errorThrower } from '../../utils/errors';
+
 export type UseOAuthFlowParams = {
   strategy: OAuthStrategy;
   redirectUrl?: string;
   unsafeMetadata?: SignUpUnsafeMetadata;
 };
 export function useOAuth(_useOAuthParams: UseOAuthFlowParams) {
   if (Platform.OS === 'web') {
-    throw new Error('OAuth flow is not supported in web');
+    throw errorThrower.throw('useOAuth hook is not supported in Web');
   }
 }
diff --git a/packages/expo/src/utils/errors.ts b/packages/expo/src/utils/errors.ts
@@ -1,3 +1,3 @@
 import { buildErrorThrower } from '@clerk/shared/error';
 
-export const errorThrower = buildErrorThrower({ packageName: PACKAGE_NAME });
+export const errorThrower = buildErrorThrower({ packageName: PACKAGE_NAME, customMessages: [] });