Skip to content

Commit

Permalink
fix(backend): Expose resources types (#2660)
Browse files Browse the repository at this point in the history
* fix(backend): Expose resources types

* fix(nextjs): Expose resources types

* fix(remix): Expose resources types
  • Loading branch information
panteliselef committed Jan 25, 2024
1 parent b7d2f3a commit a8901be
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .changeset/calm-socks-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': patch
---

Expose resources types
5 changes: 5 additions & 0 deletions .changeset/eight-pots-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/remix': patch
---

Expose resources types
5 changes: 5 additions & 0 deletions .changeset/tame-forks-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/nextjs': patch
---

Expose resources types
36 changes: 33 additions & 3 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ import type { CreateAuthenticateRequestOptions } from './tokens/factory';
import { createAuthenticateRequest } from './tokens/factory';
import { verifyToken as _verifyToken } from './tokens/verify';

export type { Organization, Session, User, WebhookEvent, WebhookEventType } from './api/resources';
export type { VerifyTokenOptions } from './tokens/verify';

export const verifyToken = withLegacyReturn(_verifyToken);

export type ClerkOptions = CreateBackendApiOptions &
Expand Down Expand Up @@ -46,3 +43,36 @@ export function createClerkClient(options: ClerkOptions): ClerkClient {
telemetry,
};
}

/**
* General Types
*/
export type { OrganizationMembershipRole } from './api/resources';
export type { VerifyTokenOptions } from './tokens/verify';

/**
* Webhook event types
*/
export type { WebhookEvent, WebhookEventType } from './api/resources';

/**
* Resources
*/
export type {
AllowlistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Invitation,
OauthAccessToken,
Organization,
OrganizationInvitation,
OrganizationMembership,
OrganizationMembershipPublicUserData,
PhoneNumber,
Session,
SignInToken,
SMSMessage,
Token,
User,
} from './api/resources';
28 changes: 27 additions & 1 deletion packages/nextjs/src/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
export { createRouteMatcher } from './routeMatcher';

export { verifyToken, createClerkClient } from '@clerk/backend';
export type { WebhookEvent, WebhookEventType } from '@clerk/backend';
export { clerkClient } from './clerkClient';

/**
Expand All @@ -17,6 +16,33 @@ export { currentUser } from '../app-router/server/currentUser';
export { clerkMiddleware } from './clerkMiddleware';
export type { ClerkMiddlewareAuth, ClerkMiddlewareAuthObject, ClerkMiddlewareOptions } from './clerkMiddleware';

/**
* Re-export resource types from @clerk/backend
*/
export type {
OrganizationMembershipRole,
// Webhook event types
WebhookEvent,
WebhookEventType,
// Resources
AllowlistIdentifier,
Client,
OrganizationMembership,
EmailAddress,
ExternalAccount,
Invitation,
OauthAccessToken,
Organization,
OrganizationInvitation,
OrganizationMembershipPublicUserData,
PhoneNumber,
Session,
SignInToken,
SMSMessage,
Token,
User,
} from '@clerk/backend';

/**
* Deprecated APIs
* These APIs will be removed in v6
Expand Down
27 changes: 27 additions & 0 deletions packages/remix/src/ssr/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
export * from './rootAuthLoader';
export * from './getAuth';
export { getClerkDebugHeaders } from './utils';

/**
* Re-export resource types from @clerk/backend
*/
export type {
OrganizationMembershipRole,
// Webhook event types
WebhookEvent,
WebhookEventType,
// Resources
AllowlistIdentifier,
Client,
OrganizationMembership,
EmailAddress,
ExternalAccount,
Invitation,
OauthAccessToken,
Organization,
OrganizationInvitation,
OrganizationMembershipPublicUserData,
PhoneNumber,
Session,
SignInToken,
SMSMessage,
Token,
User,
} from '@clerk/backend';

0 comments on commit a8901be

Please sign in to comment.