Skip to content

chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimkl merged 2 commits into from
Nov 1, 2023
Merged

chore(fastify): Drop deprecations #1976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05fdc93
chore(fastify): Drop `CLERK_API_KEY`
dimkl Oct 30, 2023
385e8e2
chore(fastify): Drop `CLERK_FRONTEND_API`
dimkl Oct 30, 2023
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
9 changes: 9 additions & 0 deletions .changeset/lovely-mirrors-remember.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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`
3 changes: 1 addition & 2 deletions packages/fastify/jest.setup.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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';
2 changes: 1 addition & 1 deletion packages/fastify/src/__snapshots__/clerkClient.test.ts.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
},
],
]
Expand Down
2 changes: 0 additions & 2 deletions packages/fastify/src/__snapshots__/constants.test.ts.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/fastify/src/constants.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down
16 changes: 0 additions & 16 deletions packages/fastify/src/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down
9 changes: 3 additions & 6 deletions packages/fastify/src/withClerkMiddleware.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
}),
);
Expand DownExpand Up@@ -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),
}),
);
Expand DownExpand Up@@ -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),
}),
);
Expand Down
8 changes: 2 additions & 6 deletions packages/fastify/src/withClerkMiddleware.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });

@panteliselefpanteliselefOct 30, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅

@dimkldimklOct 31, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR


return reply
.code(401)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
chore(fastify): Drop deprecations by dimkl · Pull Request #1976 · clerk/javascript · GitHub
Skip to content
chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(fastify): Drop deprecations by dimkl · Pull Request #1976 · clerk/javascript · GitHub
Skip to content
chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
chore(fastify): Drop deprecations by dimkl · Pull Request #1976 · clerk/javascript · GitHub
Skip to content
chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(fastify): Drop deprecations by dimkl · Pull Request #1976 · clerk/javascript · GitHub
Skip to content
chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
chore(fastify): Drop deprecations by dimkl · Pull Request #1976 · clerk/javascript · GitHub
Skip to content
chore(fastify): Drop deprecations #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimkl
merged 2 commits into

from

Nov 1, 2023
 Merged


chore(fastify): Drop deprecations #1976
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
05fdc93

chore(fastify): Drop `CLERK_API_KEY`


dimkl Oct 30, 2023
385e8e2

chore(fastify): Drop `CLERK_FRONTEND_API`


dimkl Oct 30, 2023

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


9 changes: 9 additions & 0 deletions
.changeset/lovely-mirrors-remember.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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`

3 changes: 1 addition & 2 deletions
packages/fastify/jest.setup.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

2 changes: 1 addition & 1 deletion
packages/fastify/src/__snapshots__/clerkClient.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
 },
 ],
]
Expand Down

2 changes: 0 additions & 2 deletions
packages/fastify/src/__snapshots__/constants.test.ts.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

4 changes: 0 additions & 4 deletions
packages/fastify/src/constants.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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';

Expand Down

16 changes: 0 additions & 16 deletions
packages/fastify/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -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 || '';

Expand Down

9 changes: 3 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand DownExpand Up@@ -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),
 }),
 );
Expand Down

8 changes: 2 additions & 6 deletions
packages/fastify/src/withClerkMiddleware.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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] }),
Expand DownExpand Up@@ -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: '' });
@panteliselefpanteliselefOct 30, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ oh is this required ? 😅
@dimkldimklOct 31, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. Will be fixed in the @clerk/backend deprecations PR

 return reply
 .code(401)
Expand Down