From a706dcf6a9b91ef2c3d1e1d28449b9b8e0e8187d Mon Sep 17 00:00:00 2001 From: IwanIDev Date: Thu, 19 Mar 2026 20:16:23 +0000 Subject: Add support for headless Drupal integration with environment variables and Docker setup - Create .env.example for environment variable configuration - Update Dockerfile to accept Drupal-related build arguments - Enhance docker_build.yml to pass environment variables during Docker build - Add drupalClient and env configuration for API interaction - Implement local development instructions and Docker deployment steps in README - Add drupal and mariadb services to docker-stack.yml for complete setup - Update package.json and bun.lock to include axios and drupal-jsonapi-params dependencies - Add TypeScript definitions for new environment variables --- src/config/env.ts | 23 +++++++++++++++++++++++ src/lib/drupalClient.ts | 36 ++++++++++++++++++++++++++++++++++++ src/vite-env.d.ts | 11 +++++++++++ 3 files changed, 70 insertions(+) create mode 100644 src/config/env.ts create mode 100644 src/lib/drupalClient.ts create mode 100644 src/vite-env.d.ts (limited to 'src') diff --git a/src/config/env.ts b/src/config/env.ts new file mode 100644 index 0000000..c530b3a --- /dev/null +++ b/src/config/env.ts @@ -0,0 +1,23 @@ +const trimTrailingSlashes = (value: string): string => value.replace(/\/+$/, '') + +const normalizePathPrefix = (value: string): string => { + if (!value) { + return '/jsonapi' + } + + return value.startsWith('/') ? value : `/${value}` +} + +export const drupalEnv = { + baseUrl: trimTrailingSlashes(import.meta.env.VITE_DRUPAL_BASE_URL ?? ''), + apiPrefix: normalizePathPrefix(import.meta.env.VITE_DRUPAL_API_PREFIX ?? '/jsonapi'), + authToken: import.meta.env.VITE_DRUPAL_AUTH_TOKEN ?? '', +} + +export const getDrupalApiBaseUrl = (): string => { + if (!drupalEnv.baseUrl) { + throw new Error('Missing VITE_DRUPAL_BASE_URL. Set it in your environment before using the Drupal client.') + } + + return `${drupalEnv.baseUrl}${drupalEnv.apiPrefix}` +} diff --git a/src/lib/drupalClient.ts b/src/lib/drupalClient.ts new file mode 100644 index 0000000..7a30729 --- /dev/null +++ b/src/lib/drupalClient.ts @@ -0,0 +1,36 @@ +import axios from 'axios' +import type { AxiosRequestConfig } from 'axios' +import { DrupalJsonApiParams } from 'drupal-jsonapi-params' +import { drupalEnv, getDrupalApiBaseUrl } from '../config/env' + +export const drupalClient = axios.create({ + baseURL: getDrupalApiBaseUrl(), + headers: { + Accept: 'application/vnd.api+json', + 'Content-Type': 'application/vnd.api+json', + }, +}) + +drupalClient.interceptors.request.use((config) => { + if (drupalEnv.authToken) { + config.headers.Authorization = `Bearer ${drupalEnv.authToken}` + } + + return config +}) + +export const createDrupalParams = (): DrupalJsonApiParams => new DrupalJsonApiParams() + +export const fetchDrupalResource = async ( + resourcePath: string, + options?: { + params?: DrupalJsonApiParams + config?: AxiosRequestConfig + }, +): Promise => { + const queryString = options?.params?.getQueryString() + const url = queryString ? `${resourcePath}?${queryString}` : resourcePath + const { data } = await drupalClient.get(url, options?.config) + + return data +} diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts new file mode 100644 index 0000000..55d593d --- /dev/null +++ b/src/vite-env.d.ts @@ -0,0 +1,11 @@ +/// + +interface ImportMetaEnv { + readonly VITE_DRUPAL_BASE_URL?: string + readonly VITE_DRUPAL_API_PREFIX?: string + readonly VITE_DRUPAL_AUTH_TOKEN?: string +} + +interface ImportMeta { + readonly env: ImportMetaEnv +} -- cgit