v2: fixed oauth errors, oauth clients native control added

This commit is contained in:
Ivan Rezchikov
2026-09-15 16:21:53 +03:00
parent 83e1849d73
commit 8b0a3d143b
51 changed files with 1392 additions and 3216 deletions
+159
View File
@@ -0,0 +1,159 @@
"use server"
import type { CreatedOAuthClient, OAuthClient } from "@/types";
import { getTranslations } from "next-intl/server";
import { cookies } from "next/headers";
import { tryRefresh, clearTokens } from "@/actions/auth";
interface CreateClientPayload {
name: string;
redirect_uris: string[];
grant_types: string[];
scopes: string[];
}
interface UpdateClientPayload {
name: string;
redirect_uris: string[];
scopes: string[];
}
export async function fetchOAuthClients(): Promise<OAuthClient[] | []> {
const store = await cookies();
const accessToken = store.get("access_token")?.value;
try {
const response = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/clients`, {
headers: { Authorization: `Bearer ${accessToken}` },
cache: "no-store",
});
if (response.status === 401) {
const refreshed = await tryRefresh();
if (!refreshed) {
await clearTokens();
return [];
}
return fetchOAuthClients();
}
if (!response.ok) return [];
return (await response.json()) as OAuthClient[];
} catch {
return [];
}
}
export async function createClient(
payload: CreateClientPayload
): Promise<{ success: boolean; client?: CreatedOAuthClient; message?: string }> {
const t = await getTranslations("errors");
const store = await cookies();
const accessToken = store.get("access_token")?.value;
if (!payload.name || payload.redirect_uris.length === 0) {
return { success: false, message: t("allFieldsRequired") };
}
try {
const response = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/clients`, {
method: "POST",
headers: {
Authorization: `Bearer ${accessToken}`,
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
cache: "no-store",
});
if (response.status === 401) {
const refreshed = await tryRefresh();
if (!refreshed) {
await clearTokens();
return { success: false, message: t("serverError") };
}
return createClient(payload);
}
if (response.status === 400) return { success: false, message: t("invalidInputError") };
if (!response.ok) return { success: false, message: t("serverError") };
const client = (await response.json()) as CreatedOAuthClient;
return { success: true, client };
} catch {
return { success: false, message: t("serverError") };
}
}
export async function updateClient(
id: string,
payload: UpdateClientPayload
): Promise<{ success: boolean; client?: OAuthClient; message?: string }> {
const t = await getTranslations("errors");
const store = await cookies();
const accessToken = store.get("access_token")?.value;
if (!id || !payload.name || payload.redirect_uris.length === 0) {
return { success: false, message: t("allFieldsRequired") };
}
try {
const response = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/clients/${id}`, {
method: "PATCH",
headers: {
Authorization: `Bearer ${accessToken}`,
"Content-Type": "application/json",
},
body: JSON.stringify(payload),
cache: "no-store",
});
if (response.status === 401) {
const refreshed = await tryRefresh();
if (!refreshed) {
await clearTokens();
return { success: false, message: t("serverError") };
}
return updateClient(id, payload);
}
if (response.status === 400) return { success: false, message: t("invalidInputError") };
if (response.status === 404) return { success: false, message: t("notFoundError") };
if (!response.ok) return { success: false, message: t("serverError") };
const client = (await response.json()) as OAuthClient;
return { success: true, client };
} catch {
return { success: false, message: t("serverError") };
}
}
export async function deleteClient(id: string): Promise<{ success: boolean; message?: string }> {
const t = await getTranslations("errors");
const store = await cookies();
const accessToken = store.get("access_token")?.value;
if (!id) return { success: false, message: t("serverError") };
try {
const response = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/clients/${id}`, {
method: "DELETE",
headers: { Authorization: `Bearer ${accessToken}` },
cache: "no-store",
});
if (response.status === 401) {
const refreshed = await tryRefresh();
if (!refreshed) {
await clearTokens();
return { success: false, message: t("serverError") };
}
return deleteClient(id);
}
if (!response.ok) return { success: false, message: t("serverError") };
return { success: true };
} catch {
return { success: false, message: t("serverError") };
}
}
+8 -8
View File
@@ -3,9 +3,9 @@
import { Consent } from "@/types"
import { cookies } from "next/headers"
export async function fetchConsents() {
const store = await cookies()
const accessToken = store.get("access_token")?.value
export async function fetchConsents(): Promise<Consent[] | []> {
const store = await cookies();
const accessToken = store.get("access_token")?.value;
const response = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/me/consents`,
@@ -14,16 +14,16 @@ export async function fetchConsents() {
Authorization: `Bearer ${accessToken}`,
},
}
)
);
if (!response.ok) return []
if (!response.ok) return [];
const consents = await response.json() as Consent[]
const consents = await response.json() as Consent[];
consents?.forEach((consent: Consent) => {
consent.isRevokable = consent.client_id !== process.env.CLIENT_ID
})
});
return consents
return consents;
}
export async function revokeConsent(clientId: string) {
-266
View File
@@ -1,266 +0,0 @@
"use server"
import type { AdminUser, Permission, Position } from "@/types"
import { cookies } from "next/headers"
async function getAccessToken(): Promise<string | null> {
const store = await cookies()
return store.get("access_token")?.value ?? null
}
async function getAuthHeaders(locale?: string): Promise<HeadersInit> {
const token = await getAccessToken()
return token
? {
Authorization: `Bearer ${token}`,
"Accept-Language": locale ?? "en",
}
: {}
}
async function handleJsonResponse<T>(response: Response): Promise<T | null> {
if (!response.ok) return null
return (await response.json()) as T
}
async function handleSuccessResponse(response: Response): Promise<{ success: boolean }> {
return { success: response.ok }
}
export async function fetchMyPositions(locale?: string): Promise<Position[]> {
const token = await getAccessToken()
if (!token) return []
const res = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/me/positions`,
{ headers: await getAuthHeaders(locale), cache: "no-store" }
)
return (await handleJsonResponse<Position[]>(res)) ?? []
}
export async function fetchAllPositions(locale?: string): Promise<Position[] | null> {
const token = await getAccessToken()
if (!token) return null
const response = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions`,
{ headers: await getAuthHeaders(locale), cache: "no-store" }
)
if (response.status === 403) return null
return await handleJsonResponse<Position[]>(response)
}
export async function savePosition(
code: string,
name: string,
locale: string,
description?: string
): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions`, {
method: "POST",
headers: { ...(await getAuthHeaders(locale)), "Content-Type": "application/json" },
body: JSON.stringify({ code, name, ...(description ? { description } : {}) }),
})
return handleSuccessResponse(res)
}
export async function fetchAllPermissions(locale?: string): Promise<Permission[]> {
const token = await getAccessToken()
if (!token) return []
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/permissions`, {
headers: await getAuthHeaders(locale),
cache: "no-store",
})
return (await handleJsonResponse<Permission[]>(res)) ?? []
}
export async function fetchAdminUsers(locale?: string): Promise<AdminUser[] | null> {
const token = await getAccessToken()
if (!token) return null
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/users`, {
headers: await getAuthHeaders(locale),
cache: "no-store",
})
if (res.status === 403) return []
return await handleJsonResponse<AdminUser[]>(res)
}
export async function addPermission(code: string, description?: string, locale?: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/permissions`, {
method: "POST",
headers: { ...(await getAuthHeaders(locale)), "Content-Type": "application/json" },
body: JSON.stringify({ code, ...(description ? { description } : {}) }),
})
return handleSuccessResponse(res)
}
export async function editPermission(code: string, description?: string, locale?: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/permissions/${code}`, {
method: "PUT",
headers: { ...(await getAuthHeaders(locale)), "Content-Type": "application/json" },
body: JSON.stringify({ ...(description ? { description } : {}) }),
})
return handleSuccessResponse(res)
}
export async function removePermission(code: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/permissions/${code}`, {
method: "DELETE",
headers: await getAuthHeaders(),
})
return handleSuccessResponse(res)
}
function diffPermissions(oldP: string[], newP: string[]) {
const oldSet = new Set(oldP)
const newSet = new Set(newP)
const toAdd = newP.filter(p => !oldSet.has(p))
const toRemove = oldP.filter(p => !newSet.has(p))
return { toAdd, toRemove }
}
export async function syncPositionPermissions(
positionCode: string,
oldPermissions: string[],
newPermissions: string[]
) {
const { toAdd, toRemove } = diffPermissions(oldPermissions, newPermissions)
await Promise.all([
...toAdd.map(p => attachPermissionToPosition(positionCode, p)),
...toRemove.map(p => detachPermissionFromPosition(positionCode, p)),
])
}
export async function attachPermissionToPosition(
positionCode: string,
permissionCode: string
): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions/${positionCode}/permissions`,
{
method: "POST",
headers: { ...(await getAuthHeaders()), "Content-Type": "application/json" },
body: JSON.stringify({ permission_code: permissionCode }),
}
)
return handleSuccessResponse(res)
}
export async function detachPermissionFromPosition(
positionCode: string,
permissionCode: string
): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions/${positionCode}/permissions/${permissionCode}`,
{ method: "DELETE", headers: await getAuthHeaders() }
)
return handleSuccessResponse(res)
}
export async function assignPositionToUser(
userId: string,
positionCode: string,
validFrom?: string,
validTo?: string
): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/users/${userId}/positions`,
{
method: "POST",
headers: { ...(await getAuthHeaders()), "Content-Type": "application/json" },
body: JSON.stringify({
position_code: positionCode,
...(validFrom ? { valid_from: validFrom } : {}),
...(validTo ? { valid_to: validTo } : {}),
}),
}
)
return handleSuccessResponse(res)
}
export async function revokePositionFromUser(userId: string, positionCode: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(
`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/users/${userId}/positions/${positionCode}`,
{ method: "DELETE", headers: await getAuthHeaders() }
)
return handleSuccessResponse(res)
}
export async function addPosition(code: string, name: string, description?: string, locale?: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions`, {
method: "POST",
headers: { ...(await getAuthHeaders(locale)), "Content-Type": "application/json" },
body: JSON.stringify({ code, name, ...(description ? { description } : {}) }),
})
return handleSuccessResponse(res)
}
export async function editPosition(code: string, name: string, description?: string, locale?: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions/${code}`, {
method: "PUT",
headers: { ...(await getAuthHeaders(locale)), "Content-Type": "application/json" },
body: JSON.stringify({ name, ...(description ? { description } : {}) }),
})
return handleSuccessResponse(res)
}
export async function deletePosition(code: string): Promise<{ success: boolean }> {
const token = await getAccessToken()
if (!token) return { success: false }
const res = await fetch(`${process.env.KOTOSOFT_ID_API_URL}/api/v1/admin/positions/${code}`, {
method: "DELETE",
headers: await getAuthHeaders(),
})
return handleSuccessResponse(res)
}