Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/eighty-swans-trade.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
'@clerk/shared': patch
---

Apply deprecation warnings:
Apply deprecation warnings for `@clerk/shared`:
- `OrganizationContext`
- `organizationList`
- `useOrganizations`
Expand Down
4 changes: 2 additions & 2 deletions .changeset/late-carrots-notice.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
---
'@clerk/clerk-react': patch
---

Warn about `setSession` deprecation.
Apply deprecation warnings for `@clerk/clerk-react`:
- `setSession`
2 changes: 1 addition & 1 deletion .changeset/silent-fishes-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,4 @@
'@clerk/backend': minor
---

Replace utilities with @clerk/shared exports
Replace utilities with `@clerk/shared` exports
7 changes: 6 additions & 1 deletion .changeset/spicy-toys-change.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,4 +2,9 @@
'@clerk/nextjs': patch
---

Warn about deprecations that will be dropped in next major version
Apply deprecation warnings for `@clerk/nextjs`:
- `CLERK_JS_VERSION` environment variable
- `CLERK_API_KEY` environment variable
- `NEXT_PUBLIC_CLERK_FRONTEND_API` environment variable
- `withClerkMiddleware`
- `withServerSideAuth`
14 changes: 14 additions & 0 deletions .changeset/two-ads-type.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
---
"@clerk/backend": patch
---

Apply deprecation warnings for `@clerk/backend`:
- backend api return format
- `clockSkewInSeconds`
- `pkgVersion`
- `picture`/`logoUrl`/`profileImageUrl`
- `InterstitialAPI`
- `httpOptions`
- `apiKey`
- `frontendApi`
- `__unstable_options`
7 changes: 6 additions & 1 deletion packages/backend/src/api/endpoints/InterstitialApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
import { deprecated } from '../../util/shared';
import { AbstractAPI } from './AbstractApi';

/**
* @deprecated Switch to the public interstitial endpoint from Clerk Backend API.
*/
export class InterstitialAPI extends AbstractAPI {
public async getInterstitial() {
deprecated(
'getInterstitial()',
'Switch to `Clerk(...).localInterstitial(...)` from `import { Clerk } from "@clerk/backend"`.',
);

return this.request<string>({
path: 'internal/interstitial',
method: 'GET',
Expand Down
20 changes: 18 additions & 2 deletions packages/backend/src/api/request.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { API_URL, API_VERSION, constants, USER_AGENT } from '../constants';
import runtime from '../runtime';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { joinPaths } from '../util/path';
import { deprecated } from '../util/shared';
import type { CreateBackendApiOptions } from './factory';
import { deserialize } from './resources/Deserializer';

Expand DownExpand Up@@ -50,6 +51,11 @@ type LegacyRequestFunction = <T>(requestOptions: ClerkBackendApiRequestOptions)
const withLegacyReturn =
(cb: any): LegacyRequestFunction =>
async (...args) => {
deprecated(
'',
'Resources return format will switch to `{ data: any, errors: ClerkAPIError[] }` from `data | never` the next major version.',
'resources-legacy-return',
);
// @ts-ignore
const { data, errors, status, statusText } = await cb<T>(...args);
if (errors === null) {
Expand All@@ -67,11 +73,21 @@ export function buildRequest(options: CreateBackendApiOptions) {
const {
apiKey,
secretKey,
httpOptions,
apiUrl = API_URL,
apiVersion = API_VERSION,
userAgent = USER_AGENT,
httpOptions = {},
} = options;
if (apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}
if (httpOptions) {
deprecated(
'httpOptions',
'This option has been deprecated and will be removed with the next major release.\nA RequestInit init object used by the `request` method.',
);
}

const { path, method, queryParams, headerParams, bodyParams, formData } = requestOptions;
const key = secretKey || apiKey;

Expand DownExpand Up@@ -119,7 +135,7 @@ export function buildRequest(options: CreateBackendApiOptions) {

res = await runtime.fetch(
finalUrl.href,
deepmerge(httpOptions, {
deepmerge(httpOptions || {}, {
method,
headers,
...body,
Expand Down
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/ExternalAccount.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { ExternalAccountJSON } from './JSON';
import { Verification } from './Verification';

Expand DownExpand Up@@ -41,3 +42,5 @@ export class ExternalAccount {
);
}
}

deprecatedProperty(ExternalAccount, 'picture', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Organization.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import type { OrganizationJSON } from './JSON';

export class Organization {
Expand DownExpand Up@@ -40,3 +41,5 @@ export class Organization {
);
}
}

deprecatedProperty(Organization, 'logoUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/OrganizationMembership.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { Organization } from '../resources';
import type { OrganizationMembershipRole } from './Enums';
import type { OrganizationMembershipJSON, OrganizationMembershipPublicUserDataJSON } from './JSON';
Expand DownExpand Up@@ -54,3 +55,5 @@ export class OrganizationMembershipPublicUserData {
);
}
}

deprecatedProperty(OrganizationMembershipPublicUserData, 'profileImageUrl', 'Use `imageUrl` instead.');
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/User.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { deprecatedProperty } from '../../util/shared';
import { EmailAddress } from './EmailAddress';
import { ExternalAccount } from './ExternalAccount';
import type { ExternalAccountJSON, UserJSON } from './JSON';
Expand DownExpand Up@@ -72,3 +73,5 @@ export class User {
);
}
}

deprecatedProperty(User, 'profileImageUrl', 'Use `imageUrl` instead.');
14 changes: 13 additions & 1 deletion packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { deprecatedObjectProperty } from '@clerk/shared';

import type { CreateBackendApiOptions } from './api';
import { createBackendApiClient } from './api';
import type { CreateAuthenticateRequestOptions } from './tokens';
Expand DownExpand Up@@ -26,12 +28,22 @@ export function Clerk(options: ClerkOptions) {
const apiClient = createBackendApiClient(opts);
const requestState = createAuthenticateRequest({ options: opts, apiClient });

return {
const clerkInstance = {
...apiClient,
...requestState,
/**
* @deprecated This prop has been deprecated and will be removed in the next major release.
*/
__unstable_options: opts,
};

// The __unstable_options is not being used internally and
// it's only being set in packages/sdk-node/src/clerkClient.ts#L86
deprecatedObjectProperty(
clerkInstance,
'__unstable_options',
'Use `createClerkClient({...})` to create a new clerk instance instead.',
);
Comment thread
dimkl marked this conversation as resolved.

return clerkInstance;
}
4 changes: 3 additions & 1 deletion packages/backend/src/redirections.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { errorThrower, parsePublishableKey } from './util/shared';
import { deprecated, errorThrower, parsePublishableKey } from './util/shared';

type RedirectAdapter = (url: string) => any;

Expand DownExpand Up@@ -39,6 +39,8 @@ type RedirectParams = {
export function redirect({ redirectAdapter, signUpUrl, signInUrl, frontendApi, publishableKey }: RedirectParams) {
if (!frontendApi) {
frontendApi = parsePublishableKey(publishableKey)?.frontendApi;
} else {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

const accountsBaseUrl = buildAccountsBaseUrl(frontendApi);
Expand Down
18 changes: 18 additions & 0 deletions packages/backend/src/tokens/interstitial.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import { joinPaths } from '../util/path';
import {
addClerkPrefix,
callWithRetry,
deprecated,
getClerkJsMajorVersionOrTag,
getScriptUrl,
isDevOrStagingUrl,
Expand All@@ -33,6 +34,13 @@ export type LoadInterstitialOptions = {
} & MultiDomainAndOrProxyPrimitives;

export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions, 'apiUrl'>) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const domainOnlyInProd = !isDevOrStagingUrl(options.frontendApi) ? addClerkPrefix(options.domain) : '';
const {
Expand DownExpand Up@@ -126,6 +134,12 @@ export function loadInterstitialFromLocal(options: Omit<LoadInterstitialOptions,

// TODO: Add caching to Interstitial
export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}
if (options.pkgVersion) {
deprecated('pkgVersion', 'Use `clerkJSVersion` instead.');
}
options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const url = buildPublicInterstitialUrl(options);
const response = await callWithRetry(() =>
Expand All@@ -149,6 +163,10 @@ export async function loadInterstitialFromBAPI(options: LoadInterstitialOptions)
}

export function buildPublicInterstitialUrl(options: LoadInterstitialOptions) {
if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

options.frontendApi = parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi || '';
const { apiUrl, frontendApi, pkgVersion, clerkJSVersion, publishableKey, proxyUrl, isSatellite, domain, signInUrl } =
options;
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/jwt/verifyJwt.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type { Jwt, JwtPayload } from '@clerk/types';
// For more information refer to https://sinonjs.org/how-to/stub-dependency/
import runtime from '../../runtime';
import { base64url } from '../../util/rfc4648';
import { deprecated } from '../../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from '../errors';
import type { IssuerResolver } from './assertions';
import {
Expand DownExpand Up@@ -114,6 +115,10 @@ export async function verifyJwt(
token: string,
{ audience, authorizedParties, clockSkewInSeconds, clockSkewInMs, issuer, key }: VerifyJwtOptions,
): Promise<JwtPayload> {
if (clockSkewInSeconds) {
deprecated('clockSkewInSeconds', 'Use `clockSkewInMs` instead.');
}

const clockSkew = clockSkewInMs || clockSkewInSeconds || DEFAULT_CLOCK_SKEW_IN_SECONDS;

const decoded = decodeJwt(token);
Expand Down
10 changes: 9 additions & 1 deletion packages/backend/src/tokens/request.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { API_URL, API_VERSION, constants } from '../constants';
import { assertValidSecretKey } from '../util/assertValidSecretKey';
import { buildRequest, stripAuthorizationHeader } from '../util/IsomorphicRequest';
import { isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import { deprecated, isDevelopmentFromApiKey, parsePublishableKey } from '../util/shared';
import type { RequestState } from './authStatus';
import { AuthErrorReason, interstitial, signedOut, unknownState } from './authStatus';
import type { TokenCarrier } from './errors';
Expand DownExpand Up@@ -120,6 +120,14 @@ function assertProxyUrlOrDomain(proxyUrlOrDomain: string | undefined) {
export async function authenticateRequest(options: AuthenticateRequestOptions): Promise<RequestState> {
const { cookies, headers, searchParams } = buildRequest(options?.request);

if (options.frontendApi) {
deprecated('frontentApi', 'Use `publishableKey` instead.');
}

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

options = {
...options,
frontendApi: parsePublishableKey(options.publishableKey)?.frontendApi || options.frontendApi,
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/tokens/verify.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import type { JwtPayload } from '@clerk/types';

import { deprecated } from '../util/shared';
import { TokenVerificationError, TokenVerificationErrorAction, TokenVerificationErrorReason } from './errors';
import type { VerifyJwtOptions } from './jwt';
import { decodeJwt, verifyJwt } from './jwt';
Expand DownExpand Up@@ -33,6 +34,10 @@ export async function verifyToken(token: string, options: VerifyTokenOptions): P
skipJwksCache,
} = options;

if (options.apiKey) {
deprecated('apiKey', 'Use `secretKey` instead.');
}

const { header } = decodeJwt(token);
const { kid } = header;

Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/util/shared.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
isDevelopmentFromApiKey,
isProductionFromApiKey,
parsePublishableKey,
deprecated,
deprecatedProperty,
} from '@clerk/shared';

import { buildErrorThrower } from '@clerk/shared';
Expand Down