chore(fastify): Drop deprecations

.changeset/lovely-mirrors-remember.md

@@ -0,0 +1,9 @@
+---
+'@clerk/fastify': major
+---
+
+Drop deprecations. Migration steps:
+- use `CLERK_SECRET_KEY` instead of `CLERK_API_KEY` env variable
+- use `secretKey` instead of `apiKey`
+- use `CLERK_PUBLISHABLE_KEY` instead of `CLERK_FRONTEND_API` env variable
+- use `publishableKey` instead of `frontendApi`

packages/fastify/jest.setup.js

@@ -1,2 +1 @@
-process.env.CLERK_API_KEY = 'TEST_API_KEY';
-process.env.CLERK_SECRET_KEY = 'TEST_API_KEY';
+process.env.CLERK_SECRET_KEY = 'TEST_SECRET_KEY';

packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

@@ -7,7 +7,7 @@ exports[`clerk initializes clerk with constants 1`] = `
       "apiUrl": "https://api.clerk.com",
       "apiVersion": "v1",
       "jwtKey": "",
-      "secretKey": "TEST_API_KEY",
+      "secretKey": "TEST_SECRET_KEY",
     },
   ],
 ]

packages/fastify/src/__snapshots__/constants.test.ts.snap

@@ -2,14 +2,12 @@
 
 exports[`constants from environment variables 1`] = `
 {
-  "API_KEY": "CLERK_API_KEY",
   "API_URL": "CLERK_API_URL",
   "API_VERSION": "CLERK_API_VERSION",
   "Cookies": {
     "ClientUat": "__client_uat",
     "Session": "__session",
   },
-  "FRONTEND_API": "CLERK_FRONTEND_API",
   "Headers": {
     "AuthMessage": "x-clerk-auth-message",
     "AuthReason": "x-clerk-auth-reason",

packages/fastify/src/constants.test.ts

@@ -1,18 +1,14 @@
 const clonedEnvVars = {
   CLERK_API_URL: process.env.CLERK_API_URL,
   CLERK_API_VERSION: process.env.CLERK_API_VERSION,
-  CLERK_API_KEY: process.env.CLERK_API_KEY,
   CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
-  CLERK_FRONTEND_API: process.env.CLERK_FRONTEND_API,
   CLERK_PUBLISHABLE_KEY: process.env.CLERK_PUBLISHABLE_KEY,
   CLERK_JWT_KEY: process.env.CLERK_JWT_KEY,
 };
 
 process.env.CLERK_API_URL = 'CLERK_API_URL';
 process.env.CLERK_API_VERSION = 'CLERK_API_VERSION';
-process.env.CLERK_API_KEY = 'CLERK_API_KEY';
 process.env.CLERK_SECRET_KEY = 'CLERK_SECRET_KEY';
-process.env.CLERK_FRONTEND_API = 'CLERK_FRONTEND_API';
 process.env.CLERK_PUBLISHABLE_KEY = 'CLERK_PUBLISHABLE_KEY';
 process.env.CLERK_JWT_KEY = 'CLERK_JWT_KEY';
 

packages/fastify/src/constants.ts

@@ -1,24 +1,8 @@
 import { constants } from '@clerk/backend';
-import { deprecated } from '@clerk/shared/deprecated';
 
 export const API_URL = process.env.CLERK_API_URL || 'https://api.clerk.com';
 export const API_VERSION = process.env.CLERK_API_VERSION || 'v1';
-/**
- * Backend API key
- * @deprecated Use `CLERK_SECRET_KEY` instead.
- */
-export const API_KEY = process.env.CLERK_API_KEY || '';
-if (API_KEY) {
-  deprecated('CLERK_API_KEY', 'Use `CLERK_SECRET_KEY` environment variable instead.');
-}
 export const SECRET_KEY = process.env.CLERK_SECRET_KEY || '';
-/**
- * @deprecated Use `CLERK_PUBLISHABLE_KEY` instead.
- */
-export const FRONTEND_API = process.env.CLERK_FRONTEND_API || '';
-if (FRONTEND_API) {
-  deprecated('CLERK_FRONTEND_API', 'Use `CLERK_PUBLISHABLE_KEY` environment variable instead.');
-}
 export const PUBLISHABLE_KEY = process.env.CLERK_PUBLISHABLE_KEY || '';
 export const JWT_KEY = process.env.CLERK_JWT_KEY || '';
 

packages/fastify/src/withClerkMiddleware.test.ts

@@ -57,8 +57,7 @@ describe('withClerkMiddleware(options)', () => {
     expect(response.body).toEqual(JSON.stringify({ auth: 'mockedAuth' }));
     expect(authenticateRequestMock).toBeCalledWith(
       expect.objectContaining({
-        secretKey: 'TEST_API_KEY',
-        apiKey: 'TEST_API_KEY',
+        secretKey: 'TEST_SECRET_KEY',
         request: expect.any(Request),
       }),
     );
@@ -97,8 +96,7 @@ describe('withClerkMiddleware(options)', () => {
     expect(response.body).toEqual(JSON.stringify({ auth: 'mockedAuth' }));
     expect(authenticateRequestMock).toBeCalledWith(
       expect.objectContaining({
-        secretKey: 'TEST_API_KEY',
-        apiKey: 'TEST_API_KEY',
+        secretKey: 'TEST_SECRET_KEY',
         request: expect.any(Request),
       }),
     );
@@ -193,8 +191,7 @@ describe('withClerkMiddleware(options)', () => {
     expect(response.body).toEqual(JSON.stringify({ auth: 'mockedAuth' }));
     expect(authenticateRequestMock).toBeCalledWith(
       expect.objectContaining({
-        secretKey: 'TEST_API_KEY',
-        apiKey: 'TEST_API_KEY',
+        secretKey: 'TEST_SECRET_KEY',
         request: expect.any(Request),
       }),
     );

packages/fastify/src/withClerkMiddleware.ts

@@ -14,8 +14,6 @@ export const withClerkMiddleware = (options: ClerkFastifyOptions) => {
       ...options,
       secretKey,
       publishableKey,
-      apiKey: constants.API_KEY,
-      frontendApi: constants.FRONTEND_API,
       request: createIsomorphicRequest((Request, Headers) => {
         const requestHeaders = Object.keys(req.headers).reduce(
           (acc, key) => Object.assign(acc, { [key]: req?.headers[key] }),
@@ -43,10 +41,8 @@ export const withClerkMiddleware = (options: ClerkFastifyOptions) => {
     }
 
     if (requestState.isInterstitial) {
-      const interstitialHtmlPage = clerkClient.localInterstitial({
-        publishableKey,
-        frontendApi: constants.FRONTEND_API,
-      });
+      // TODO(@dimkl): use empty string for frontendApi until type is fixed in @clerk/backend to drop it
+      const interstitialHtmlPage = clerkClient.localInterstitial({ publishableKey, frontendApi: '' });
 
       return reply
         .code(401)