Skip to content

directly access orgId from Clerk auth #52

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

Open
davidnmargulies wants to merge 1 commit into
base: main
Choose a base branch
from
Open

directly access orgId from Clerk auth #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions dashboard/log-analyzer/src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const basicMiddleware = async () => {

// Enhanced middleware with Clerk authentication
const enhancedMiddleware = clerkMiddleware(async (auth) => {
const { userId, sessionId, orgPermissions } = await auth();
const { userId, sessionId, orgId } = await auth();

// If user is not authenticated, continue without modification
if (!userId || !sessionId) {
Expand All @@ -28,13 +28,11 @@ const enhancedMiddleware = clerkMiddleware(async (auth) => {
}

try {
const orgName = orgPermissions?.[0]?.split(':').pop() || '';

// Create Tinybird JWT only if the secret is available
if (!process.env.TINYBIRD_JWT_SECRET || !process.env.TINYBIRD_WORKSPACE_ID) {
const response = NextResponse.next();
response.headers.set('x-tinybird-token', process.env.NEXT_PUBLIC_TINYBIRD_API_KEY || '');
response.headers.set('x-org-name', orgName);
response.headers.set('x-org-name', orgId || '');
return response;
}

Expand All @@ -49,22 +47,22 @@ const enhancedMiddleware = clerkMiddleware(async (auth) => {
{
type: "PIPES:READ",
resource: "log_analysis",
fixed_params: { user_id: userId, org_permission: orgName, service: "web" }
fixed_params: { user_id: userId, org_id: orgId || '', service: "web" }
},
{
type: "PIPES:READ",
resource: "log_explorer",
fixed_params: { user_id: userId, org_permission: orgName, service: "web" }
fixed_params: { user_id: userId, org_id: orgId || '', service: "web" }
},
{
type: "PIPES:READ",
resource: "generic_counter",
fixed_params: { user_id: userId, org_permission: orgName, service: "web" }
fixed_params: { user_id: userId, org_id: orgId || '', service: "web" }
},
{
type: "PIPES:READ",
resource: "log_timeseries",
fixed_params: { user_id: userId, org_permission: orgName, service: "web" }
fixed_params: { user_id: userId, org_id: orgId || '', service: "web" }
}
],
limits: {
Expand All @@ -77,7 +75,7 @@ const enhancedMiddleware = clerkMiddleware(async (auth) => {
// Clone the response and add token
const response = NextResponse.next();
response.headers.set('x-tinybird-token', token);
response.headers.set('x-org-name', orgName);
response.headers.set('x-org-name', orgId || '');
return response;
} catch (error) {
console.error('Middleware error:', error);
Expand Down