From 40b28b4cc295feb0bfe73eee2c43228f0b1dbd67 Mon Sep 17 00:00:00 2001 From: alma Date: Sat, 3 May 2025 17:15:12 +0200 Subject: [PATCH] equipes keycloak flow --- app/api/users/[userId]/roles/route.ts | 5 ++--- lib/keycloak.ts | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/api/users/[userId]/roles/route.ts b/app/api/users/[userId]/roles/route.ts index 16ca7552..e34da2dd 100644 --- a/app/api/users/[userId]/roles/route.ts +++ b/app/api/users/[userId]/roles/route.ts @@ -2,7 +2,6 @@ import { NextResponse } from "next/server"; import { getServerSession } from "next-auth"; import { authOptions } from "@/app/api/auth/[...nextauth]/route"; import { getKeycloakAdminClient } from "@/lib/keycloak"; -import { RoleRepresentation } from "@keycloak/keycloak-admin-client/lib/defs/roleRepresentation"; // Fix for Next.js "params should be awaited" error export const dynamic = 'force-dynamic'; @@ -31,7 +30,7 @@ export async function GET( if (!process.env.KEYCLOAK_BASE_URL && !process.env.KEYCLOAK_ISSUER && !process.env.NEXT_PUBLIC_KEYCLOAK_ISSUER) { missingVars.push('KEYCLOAK_BASE_URL or KEYCLOAK_ISSUER'); } - if (!process.env.KEYCLOAK_ADMIN_CLIENT_ID) missingVars.push('KEYCLOAK_ADMIN_CLIENT_ID'); + if (!process.env.KEYCLOAK_CLIENT_ID) missingVars.push('KEYCLOAK_CLIENT_ID'); if (!process.env.KEYCLOAK_ADMIN_USERNAME) missingVars.push('KEYCLOAK_ADMIN_USERNAME'); if (!process.env.KEYCLOAK_ADMIN_PASSWORD) missingVars.push('KEYCLOAK_ADMIN_PASSWORD'); if (!process.env.KEYCLOAK_REALM) missingVars.push('KEYCLOAK_REALM'); @@ -102,7 +101,7 @@ export async function PUT( if (!process.env.KEYCLOAK_BASE_URL && !process.env.KEYCLOAK_ISSUER && !process.env.NEXT_PUBLIC_KEYCLOAK_ISSUER) { missingVars.push('KEYCLOAK_BASE_URL or KEYCLOAK_ISSUER'); } - if (!process.env.KEYCLOAK_ADMIN_CLIENT_ID) missingVars.push('KEYCLOAK_ADMIN_CLIENT_ID'); + if (!process.env.KEYCLOAK_CLIENT_ID) missingVars.push('KEYCLOAK_CLIENT_ID'); if (!process.env.KEYCLOAK_ADMIN_USERNAME) missingVars.push('KEYCLOAK_ADMIN_USERNAME'); if (!process.env.KEYCLOAK_ADMIN_PASSWORD) missingVars.push('KEYCLOAK_ADMIN_PASSWORD'); if (!process.env.KEYCLOAK_REALM) missingVars.push('KEYCLOAK_REALM'); diff --git a/lib/keycloak.ts b/lib/keycloak.ts index 9ddb155e..d2a0b584 100644 --- a/lib/keycloak.ts +++ b/lib/keycloak.ts @@ -23,7 +23,7 @@ export async function getKeycloakAdminClient(): Promise { // Only use environment variables - no hardcoded defaults const keycloakUrl = process.env.KEYCLOAK_BASE_URL || process.env.KEYCLOAK_ISSUER || process.env.NEXT_PUBLIC_KEYCLOAK_ISSUER; - const adminClientId = process.env.KEYCLOAK_ADMIN_CLIENT_ID; + const adminClientId = process.env.KEYCLOAK_CLIENT_ID; const adminUsername = process.env.KEYCLOAK_ADMIN_USERNAME; const adminPassword = process.env.KEYCLOAK_ADMIN_PASSWORD; const realmName = process.env.KEYCLOAK_REALM; @@ -36,7 +36,7 @@ export async function getKeycloakAdminClient(): Promise { if (!adminClientId || !adminUsername || !adminPassword || !realmName) { const missing = []; - if (!adminClientId) missing.push('KEYCLOAK_ADMIN_CLIENT_ID'); + if (!adminClientId) missing.push('KEYCLOAK_CLIENT_ID'); if (!adminUsername) missing.push('KEYCLOAK_ADMIN_USERNAME'); if (!adminPassword) missing.push('KEYCLOAK_ADMIN_PASSWORD'); if (!realmName) missing.push('KEYCLOAK_REALM');