feat: add tenant and user management with migrations, handlers, and tests
- Implemented tenant and user management features including: - Tenant creation and management with associated migrations. - User creation and management with associated migrations. - Tenant membership management with associated migrations. - Platform user roles management with associated migrations. - Quota management with associated migrations. - Article and template management with associated migrations. - Added HTTP handlers for templates and workspaces. - Created tests for protected and public routes. - Introduced a script to check tenant scope in SQL queries. - Documented task plan for backend completion and frontend foundation.
This commit is contained in:
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "@geo/http-client",
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@geo/shared-types": "workspace:*",
|
||||
"axios": "^1.14.0"
|
||||
},
|
||||
"exports": {
|
||||
".": "./src/index.ts"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
import axios, {
|
||||
type AxiosError,
|
||||
type AxiosInstance,
|
||||
type AxiosRequestConfig,
|
||||
type InternalAxiosRequestConfig,
|
||||
} from "axios";
|
||||
|
||||
import type { ApiEnvelope, ApiErrorEnvelope, AuthTokens } from "@geo/shared-types";
|
||||
|
||||
export interface AuthBindings {
|
||||
getAccessToken: () => string | null;
|
||||
getRefreshToken: () => string | null;
|
||||
setTokens: (tokens: AuthTokens) => void;
|
||||
clearTokens: () => void;
|
||||
refresh: (refreshToken: string) => Promise<AuthTokens>;
|
||||
}
|
||||
|
||||
export interface CreateApiClientOptions {
|
||||
baseURL?: string;
|
||||
timeoutMs?: number;
|
||||
auth?: AuthBindings;
|
||||
}
|
||||
|
||||
export class ApiClientError extends Error {
|
||||
status?: number;
|
||||
code: number;
|
||||
detail?: string;
|
||||
requestId?: string;
|
||||
|
||||
constructor(input: {
|
||||
message: string;
|
||||
code?: number;
|
||||
status?: number;
|
||||
detail?: string;
|
||||
requestId?: string;
|
||||
}) {
|
||||
super(input.message);
|
||||
this.name = "ApiClientError";
|
||||
this.code = input.code ?? 50000;
|
||||
this.status = input.status;
|
||||
this.detail = input.detail;
|
||||
this.requestId = input.requestId;
|
||||
}
|
||||
}
|
||||
|
||||
export interface ApiClient {
|
||||
raw: AxiosInstance;
|
||||
get: <T>(url: string, config?: AxiosRequestConfig) => Promise<T>;
|
||||
post: <T, B = unknown>(url: string, body?: B, config?: AxiosRequestConfig) => Promise<T>;
|
||||
put: <T, B = unknown>(url: string, body?: B, config?: AxiosRequestConfig) => Promise<T>;
|
||||
remove: <T>(url: string, config?: AxiosRequestConfig) => Promise<T>;
|
||||
}
|
||||
|
||||
function normalizeError(error: unknown): ApiClientError {
|
||||
if (error instanceof ApiClientError) {
|
||||
return error;
|
||||
}
|
||||
|
||||
if (axios.isAxiosError(error)) {
|
||||
const payload = error.response?.data as Partial<ApiErrorEnvelope> | undefined;
|
||||
return new ApiClientError({
|
||||
message: payload?.message ?? error.message ?? "network_error",
|
||||
code: payload?.code ?? 50000,
|
||||
status: error.response?.status,
|
||||
detail: payload?.detail,
|
||||
requestId: payload?.request_id,
|
||||
});
|
||||
}
|
||||
|
||||
if (error instanceof Error) {
|
||||
return new ApiClientError({ message: error.message });
|
||||
}
|
||||
|
||||
return new ApiClientError({ message: "unknown_error" });
|
||||
}
|
||||
|
||||
function unwrapEnvelope<T>(response: { data: ApiEnvelope<T> }): T {
|
||||
return response.data.data;
|
||||
}
|
||||
|
||||
export function createApiClient(options: CreateApiClientOptions = {}): ApiClient {
|
||||
const client = axios.create({
|
||||
baseURL: options.baseURL ?? "",
|
||||
timeout: options.timeoutMs ?? 15000,
|
||||
withCredentials: false,
|
||||
});
|
||||
|
||||
const auth = options.auth;
|
||||
let refreshPromise: Promise<AuthTokens> | null = null;
|
||||
|
||||
client.interceptors.request.use((config) => {
|
||||
if (!auth) {
|
||||
return config;
|
||||
}
|
||||
|
||||
const accessToken = auth.getAccessToken();
|
||||
if (accessToken) {
|
||||
config.headers = config.headers ?? {};
|
||||
(config.headers as Record<string, string>).Authorization = `Bearer ${accessToken}`;
|
||||
}
|
||||
|
||||
return config;
|
||||
});
|
||||
|
||||
client.interceptors.response.use(
|
||||
(response) => response,
|
||||
async (error: AxiosError<ApiErrorEnvelope>) => {
|
||||
if (auth && error.response?.status === 401 && error.config) {
|
||||
const originalRequest = error.config as InternalAxiosRequestConfig & {
|
||||
_retry?: boolean;
|
||||
};
|
||||
const refreshToken = auth.getRefreshToken();
|
||||
|
||||
if (refreshToken && !originalRequest._retry) {
|
||||
originalRequest._retry = true;
|
||||
|
||||
try {
|
||||
if (!refreshPromise) {
|
||||
refreshPromise = auth
|
||||
.refresh(refreshToken)
|
||||
.then((tokens) => {
|
||||
auth.setTokens(tokens);
|
||||
return tokens;
|
||||
})
|
||||
.finally(() => {
|
||||
refreshPromise = null;
|
||||
});
|
||||
}
|
||||
|
||||
const nextTokens = await refreshPromise;
|
||||
originalRequest.headers = originalRequest.headers ?? {};
|
||||
(originalRequest.headers as Record<string, string>).Authorization =
|
||||
`Bearer ${nextTokens.accessToken}`;
|
||||
return client.request(originalRequest);
|
||||
} catch (refreshError) {
|
||||
auth.clearTokens();
|
||||
throw normalizeError(refreshError);
|
||||
}
|
||||
}
|
||||
|
||||
auth.clearTokens();
|
||||
}
|
||||
|
||||
throw normalizeError(error);
|
||||
},
|
||||
);
|
||||
|
||||
return {
|
||||
raw: client,
|
||||
async get<T>(url: string, config?: AxiosRequestConfig) {
|
||||
return unwrapEnvelope(await client.get<ApiEnvelope<T>>(url, config));
|
||||
},
|
||||
async post<T, B = unknown>(url: string, body?: B, config?: AxiosRequestConfig) {
|
||||
return unwrapEnvelope(await client.post<ApiEnvelope<T>>(url, body, config));
|
||||
},
|
||||
async put<T, B = unknown>(url: string, body?: B, config?: AxiosRequestConfig) {
|
||||
return unwrapEnvelope(await client.put<ApiEnvelope<T>>(url, body, config));
|
||||
},
|
||||
async remove<T>(url: string, config?: AxiosRequestConfig) {
|
||||
return unwrapEnvelope(await client.delete<ApiEnvelope<T>>(url, config));
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"name": "@geo/shared-types",
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"exports": {
|
||||
".": "./src/index.ts"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,258 @@
|
||||
export interface ApiEnvelope<T> {
|
||||
code: number;
|
||||
message: string;
|
||||
data: T;
|
||||
request_id: string;
|
||||
}
|
||||
|
||||
export interface ApiErrorEnvelope {
|
||||
code: number;
|
||||
message: string;
|
||||
detail?: string;
|
||||
request_id?: string;
|
||||
}
|
||||
|
||||
export interface AuthTokens {
|
||||
accessToken: string;
|
||||
refreshToken: string;
|
||||
}
|
||||
|
||||
export interface LoginRequest {
|
||||
email: string;
|
||||
password: string;
|
||||
}
|
||||
|
||||
export interface UserInfo {
|
||||
id: number;
|
||||
email: string;
|
||||
name: string;
|
||||
avatar_url: string | null;
|
||||
tenant_id: number;
|
||||
tenant_role: string;
|
||||
permissions: string[];
|
||||
}
|
||||
|
||||
export interface LoginResponse {
|
||||
access_token: string;
|
||||
refresh_token: string;
|
||||
expires_at: number;
|
||||
user: UserInfo;
|
||||
}
|
||||
|
||||
export interface RefreshResponse {
|
||||
access_token: string;
|
||||
refresh_token: string;
|
||||
expires_at: number;
|
||||
}
|
||||
|
||||
export interface WorkspaceOverview {
|
||||
article_count: number;
|
||||
published_count: number;
|
||||
brand_count: number;
|
||||
supported_platform_count: number;
|
||||
}
|
||||
|
||||
export interface RecentArticle {
|
||||
id: number;
|
||||
title: string | null;
|
||||
template_name: string | null;
|
||||
generate_status: string;
|
||||
publish_status: string;
|
||||
source_type: string;
|
||||
word_count: number;
|
||||
source_label: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface QuotaSummary {
|
||||
plan_code: string;
|
||||
plan_name: string;
|
||||
total_quota: number;
|
||||
used_quota: number;
|
||||
balance: number;
|
||||
reset_at: string | null;
|
||||
}
|
||||
|
||||
export interface TemplateCard {
|
||||
id: number;
|
||||
scope: string;
|
||||
template_key: string;
|
||||
template_name: string;
|
||||
origin_type: string;
|
||||
card_config: Record<string, unknown> | null;
|
||||
prompt_visibility: string;
|
||||
}
|
||||
|
||||
export type JsonPrimitive = string | number | boolean | null;
|
||||
export type JsonValue = JsonPrimitive | JsonValue[] | { [key: string]: JsonValue };
|
||||
|
||||
export interface TemplateSchemaField {
|
||||
name: string;
|
||||
type: string;
|
||||
label: string;
|
||||
required?: boolean;
|
||||
default?: JsonValue;
|
||||
options?: Array<string | number | { label: string; value: string | number }>;
|
||||
placeholder?: string;
|
||||
help_text?: string;
|
||||
}
|
||||
|
||||
export interface TemplateSchema {
|
||||
fields?: TemplateSchemaField[];
|
||||
[key: string]: JsonValue | TemplateSchemaField[] | undefined;
|
||||
}
|
||||
|
||||
export interface TemplateListItem {
|
||||
id: number;
|
||||
scope: string;
|
||||
origin_type: string;
|
||||
template_key: string;
|
||||
template_name: string;
|
||||
schema_json: TemplateSchema;
|
||||
prompt_visibility: string;
|
||||
card_config: Record<string, JsonValue> | null;
|
||||
status: string;
|
||||
version_no: number;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface TemplateDetail extends TemplateListItem {
|
||||
prompt_template?: string | null;
|
||||
}
|
||||
|
||||
export interface TemplateGenerateRequest {
|
||||
input_params: Record<string, JsonValue>;
|
||||
}
|
||||
|
||||
export interface TemplateGenerateResponse {
|
||||
article_id: number;
|
||||
task_id: number;
|
||||
}
|
||||
|
||||
export interface ArticleListParams {
|
||||
page?: number;
|
||||
page_size?: number;
|
||||
generate_status?: string;
|
||||
publish_status?: string;
|
||||
source_type?: string;
|
||||
template_id?: number;
|
||||
keyword?: string;
|
||||
}
|
||||
|
||||
export interface ArticleListItem {
|
||||
id: number;
|
||||
source_type: string;
|
||||
template_name: string | null;
|
||||
generate_status: string;
|
||||
publish_status: string;
|
||||
title: string | null;
|
||||
word_count: number;
|
||||
source_label: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface ArticleListResponse {
|
||||
items: ArticleListItem[];
|
||||
total: number;
|
||||
page: number;
|
||||
page_size: number;
|
||||
}
|
||||
|
||||
export interface ArticleDetail {
|
||||
id: number;
|
||||
source_type: string;
|
||||
template_id: number | null;
|
||||
template_name: string | null;
|
||||
generate_status: string;
|
||||
publish_status: string;
|
||||
title: string | null;
|
||||
html_content: string | null;
|
||||
markdown_content: string | null;
|
||||
word_count: number;
|
||||
source_label: string | null;
|
||||
version_no: number | null;
|
||||
generation_error_message: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface ArticleVersion {
|
||||
id: number;
|
||||
version_no: number;
|
||||
title: string | null;
|
||||
word_count: number;
|
||||
source_label: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface BrandRequest {
|
||||
name: string;
|
||||
description?: string | null;
|
||||
}
|
||||
|
||||
export interface Brand {
|
||||
id: number;
|
||||
name: string;
|
||||
description: string | null;
|
||||
status: string;
|
||||
created_at: string;
|
||||
updated_at?: string;
|
||||
}
|
||||
|
||||
export interface KeywordRequest {
|
||||
name: string;
|
||||
}
|
||||
|
||||
export interface Keyword {
|
||||
id: number;
|
||||
brand_id: number;
|
||||
name: string;
|
||||
status: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface QuestionRequest {
|
||||
keyword_id: number;
|
||||
question_text: string;
|
||||
}
|
||||
|
||||
export interface UpdateQuestionRequest {
|
||||
question_text: string;
|
||||
}
|
||||
|
||||
export interface Question {
|
||||
id: number;
|
||||
brand_id: number;
|
||||
keyword_id: number;
|
||||
current_version_id: number | null;
|
||||
question_text: string | null;
|
||||
version_no: number | null;
|
||||
status: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface QuestionVersion {
|
||||
id: number;
|
||||
question_id: number;
|
||||
question_text: string;
|
||||
question_hash: string;
|
||||
version_no: number;
|
||||
is_active: boolean;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface CompetitorRequest {
|
||||
name: string;
|
||||
website?: string | null;
|
||||
description?: string | null;
|
||||
product_lines_json?: JsonValue;
|
||||
}
|
||||
|
||||
export interface Competitor {
|
||||
id: number;
|
||||
brand_id: number;
|
||||
name: string;
|
||||
website: string | null;
|
||||
description: string | null;
|
||||
product_lines_json: JsonValue | null;
|
||||
created_at: string;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2022",
|
||||
"useDefineForClassFields": true,
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Bundler",
|
||||
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
||||
"strict": true,
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"esModuleInterop": true,
|
||||
"skipLibCheck": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"noEmit": true,
|
||||
"jsx": "preserve"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user