@internetderdinge/api 1.229.32 → 1.229.39

package/src/users/users.validation.ts

@@ -14,37 +14,39 @@ import {
 
 extendZodWithOpenApi(z);
 
-export const createUserSchema = {
-  body: z.object({
-    meta: z
-      .object({})
-      .passthrough()
-      .optional()
-      .openapi({
-        example: { key: "value" },
-        description: "Additional metadata for the user",
-      }),
-    organization: zObjectId.openapi({
-      description: "Organization ObjectId",
-    }),
-    email: z.string().email().optional().nullable().openapi({
-      example: "user@example.com",
-      description: "User email address",
-    }),
-    timezone: z.string().optional().openapi({
-      example: "Europe/Berlin",
-      description: "IANA timezone string",
-    }),
-    role: z.enum(["user", "admin", "patient", "onlyself"]).optional().openapi({
-      description: "Role assigned to the user",
+export const userAppsSchema = z
+  .record(z.string(), z.unknown())
+  .optional()
+  .openapi({ description: "Application-specific user fields" });
+
+export const createUserBodyShape = {
+  meta: z
+    .object({})
+    .passthrough()
+    .optional()
+    .openapi({
+      example: { key: "value" },
+      description: "Additional metadata for the user",
     }),
-    category: z
-      .enum(["doctor", "nurse", "patient", "pharmacist", "relative"])
-      .optional()
-      .openapi({
-        description: "Category of the user",
-      }),
+  apps: userAppsSchema,
+  organization: zObjectId.openapi({
+    description: "Organization ObjectId",
+  }),
+  email: z.string().email().optional().nullable().openapi({
+    example: "user@example.com",
+    description: "User email address",
+  }),
+  timezone: z.string().optional().openapi({
+    example: "Europe/Berlin",
+    description: "IANA timezone string",
   }),
+  role: z.enum(["user", "admin", "patient", "onlyself"]).optional().openapi({
+    description: "Role assigned to the user",
+  }),
+};
+
+export const createUserSchema = {
+  body: z.object(createUserBodyShape),
 };
 
 export const createCurrentUserSchema = createUserSchema;
@@ -69,39 +71,39 @@ export const getCurrentUserSchema = {
   }),
 };
 
+export const updateUserBodyShape = {
+  name: z.string().optional().openapi({ description: "User full name" }),
+  timezone: z.string().optional().openapi({ description: "IANA timezone" }),
+  avatar: z.string().optional().openapi({ description: "Avatar URL" }),
+  meta: z
+    .object({})
+    .passthrough()
+    .optional()
+    .openapi({ description: "Additional metadata" }),
+  apps: userAppsSchema,
+  email: z
+    .string()
+    .email()
+    .nullable()
+    .optional()
+    .openapi({ description: "User email address" }),
+  role: z
+    .enum(["user", "admin", "patient", "onlyself"])
+    .optional()
+    .openapi({ description: "User role" }),
+  inviteCode: z
+    .string()
+    .nullable()
+    .optional()
+    .openapi({ description: "Invite code" }),
+  organization: zObjectId
+    .optional()
+    .openapi({ description: "Organization ObjectId" }),
+};
+
 export const updateUserSchema = {
   ...zUpdate("userId"),
-  body: zPatchBody({
-    name: z.string().optional().openapi({ description: "User full name" }),
-    timezone: z.string().optional().openapi({ description: "IANA timezone" }),
-    avatar: z.string().optional().openapi({ description: "Avatar URL" }),
-    meta: z
-      .object({})
-      .optional()
-      .openapi({ description: "Additional metadata" }),
-    category: z
-      .enum(["doctor", "nurse", "patient", "pharmacist", "relative"])
-      .optional()
-      .openapi({ description: "User category" }),
-    email: z
-      .string()
-      .email()
-      .nullable()
-      .optional()
-      .openapi({ description: "User email address" }),
-    role: z
-      .enum(["user", "admin", "patient", "onlyself"])
-      .optional()
-      .openapi({ description: "User role" }),
-    inviteCode: z
-      .string()
-      .nullable()
-      .optional()
-      .openapi({ description: "Invite code" }),
-    organization: zObjectId
-      .optional()
-      .openapi({ description: "Organization ObjectId" }),
-  }),
+  body: zPatchBody(updateUserBodyShape),
 };
 
 export const deleteUserSchema = zDelete("userId");

package/src/utils/buildRouterAndDocs.ts

@@ -30,16 +30,25 @@ export type RouteSpec = {
   summary: string;
   description?: string;
   privateDocs?: boolean;
-  memoOnly?: boolean;
+};
+
+export type BuildRouterAndDocsOptions = {
+  routeSpecs?: (specs: RouteSpec[]) => RouteSpec[];
+  includeInDocs?: (spec: RouteSpec) => boolean;
 };
 
 export default function buildAiRouterAndDocs(
   router: Router,
-  routeSpecs: any,
+  routeSpecs: RouteSpec[],
   basePath = "/",
   tags: string[] = [],
+  options: BuildRouterAndDocsOptions = {},
 ) {
-  routeSpecs.forEach((spec) => {
+  const effectiveRouteSpecs = options.routeSpecs
+    ? options.routeSpecs(routeSpecs)
+    : routeSpecs;
+
+  effectiveRouteSpecs.forEach((spec) => {
     const validate = spec.validate || [];
     const routeMiddleware =
       spec.validateWithRequestSchema ||
@@ -68,7 +77,7 @@ export default function buildAiRouterAndDocs(
       spec.responseSchema &&
       !hasRoleValidation(spec.validateWithRequestSchema || validate) &&
       spec.privateDocs !== true &&
-      spec.memoOnly !== true
+      (options.includeInDocs ? options.includeInDocs(spec) : true)
     ) {
       // collect all middleware fn names (falls back to '<anonymous>' if unnamed)
       const middlewareNames = (spec.validateWithRequestSchema || validate).map(
@@ -96,7 +105,7 @@ export default function buildAiRouterAndDocs(
         // (optionally) expose them as a custom extension instead:
         "x-middlewares": middlewareNames,
 
-        security: [{ [bearerAuth.name]: [] }, { [xApiKey.name]: [] }],
+        security: [{ [xApiKey.name]: [] }, { [bearerAuth.name]: [] }],
         responses: {
           200: {
             description: "Object with user data.",

package/src/utils/zValidations.ts

@@ -158,3 +158,11 @@ export const zDelete = (id: string) => ({
 export const zObjectId = zObjectIdFor();
 
 export const zDate = () => z.string().pipe(z.coerce.date());
+
+export const zTypeFilter = z
+  .string()
+  .openapi({
+    description: "Event type filter. Common values include activate and state; any other string is accepted.",
+    example: "activate",
+  })
+  .optional();

package/dist/src/pdf/pdf.controller.js

@@ -1,24 +0,0 @@
-import httpStatus from "http-status";
-import catchAsync from "../utils/catchAsync.js";
-import pdfService from "./pdf.service.js";
-import ApiError from "../utils/ApiError.js";
-export const generatePdfFromUrl = catchAsync(async (req, res) => {
-    const fileName = "memo-print";
-    const authHeader = req.headers["authorization"];
-    if (!authHeader) {
-        throw new ApiError(httpStatus.UNAUTHORIZED, "Missing Authorization header");
-    }
-    const token = authHeader.split(" ")[1];
-    if (!token) {
-        throw new ApiError(httpStatus.UNAUTHORIZED, "Missing bearer token");
-    }
-    const urlPath = typeof req.query.urlPath === "string" ? req.query.urlPath : undefined;
-    if (!urlPath) {
-        throw new ApiError(httpStatus.BAD_REQUEST, "Missing urlPath query parameter");
-    }
-    const result = await pdfService.generatePdfFromUrl({ urlPath, token });
-    res.status(httpStatus.CREATED).send({ signed: result });
-});
-export default {
-    generatePdfFromUrl,
-};

package/dist/src/pdf/pdf.route.js

@@ -1,22 +0,0 @@
-import { Router } from "express";
-import buildRouterAndDocs from "../utils/buildRouterAndDocs.js";
-import { generatePdfSchema } from "./pdf.validation.js";
-import { pdfResponseSchema } from "./pdf.schemas.js";
-import { generatePdfFromUrl } from "./pdf.controller.js";
-import auth from "../middlewares/auth.js";
-export const pdfRouteSpecs = [
-    {
-        method: "get",
-        path: "/",
-        validate: [auth("manageUsers")],
-        requestSchema: generatePdfSchema,
-        responseSchema: pdfResponseSchema,
-        handler: generatePdfFromUrl,
-        summary: "Generate a PDF from a provided URL",
-        description: "This endpoint allows users to generate a PDF document from a specified URL.",
-        memoOnly: true,
-    },
-];
-const router = Router();
-buildRouterAndDocs(router, pdfRouteSpecs, "/pdf", ["PDF"]);
-export default router;

package/dist/src/pdf/pdf.schemas.js

@@ -1,6 +0,0 @@
-import { z } from 'zod';
-export const pdfResponseSchema = z.object({
-    url: z.string().url(),
-    filename: z.string(),
-    size: z.number(),
-});

package/dist/src/pdf/pdf.service.js

@@ -1,64 +0,0 @@
-import puppeteer from "puppeteer";
-import { v4 as uuidv4 } from "uuid";
-import { GetObjectCommand, PutObjectCommand, S3Client, } from "@aws-sdk/client-s3";
-import { getSignedUrl as getS3SignedUrl } from "@aws-sdk/s3-request-presigner";
-import path from "path";
-const s3 = new S3Client({
-    region: process.env.AWS_REGION,
-    credentials: process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
-        ? {
-            accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-            secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        }
-        : undefined,
-});
-// Function to upload a file to S3
-const uploadBuffer = async (buffer, fileName) => {
-    await s3.send(new PutObjectCommand({
-        Bucket: process.env.AWS_S3_BUCKET_NAME,
-        Key: fileName,
-        Body: buffer,
-        ContentType: "application/pdf",
-    }));
-};
-// Generate a signed URL
-const generateSignedUrl = async (fileName) => {
-    return getS3SignedUrl(s3, new GetObjectCommand({
-        Bucket: process.env.AWS_S3_BUCKET_NAME,
-        Key: fileName,
-    }), { expiresIn: 60 * 60 });
-};
-const generatePdfFromUrl = async ({ urlPath, token, }) => {
-    const domain = process.env.FRONTEND_URL;
-    const browser = await puppeteer.launch({
-        defaultViewport: {
-            width: 1300,
-            height: 1200,
-            deviceScaleFactor: 1,
-        },
-        executablePath: process.env.CHROME_BIN,
-        args: ["--no-sandbox"],
-    });
-    const page = await browser.newPage();
-    await page.goto(domain);
-    // Set the token in local storage
-    await page.evaluate((token) => {
-        localStorage.setItem("print-token", token);
-    }, token);
-    await page.goto(domain + urlPath, { waitUntil: "networkidle2" });
-    await page.waitForSelector(".pdf-render-complete");
-    const pdf = await page.pdf({ format: "A4", printBackground: true });
-    await page.evaluate(() => {
-        localStorage.setItem("print-token", "");
-    });
-    await browser.close();
-    const fileName = `download-${uuidv4()}.pdf`;
-    await uploadBuffer(Buffer.from(pdf), fileName);
-    console.log(`File uploaded successfully. File Name: ${fileName}`);
-    const signedUrl = await generateSignedUrl(path.basename(fileName));
-    console.log(`Signed URL: ${signedUrl}`);
-    return signedUrl;
-};
-export default {
-    generatePdfFromUrl,
-};

package/dist/src/pdf/pdf.validation.js

@@ -1,27 +0,0 @@
-import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
-import { z } from 'zod';
-extendZodWithOpenApi(z);
-export const generatePdfSchema = {
-    query: z.object({
-        urlPath: z
-            .string()
-            /* .url()
-            .refine(
-              (value) =>
-                value.startsWith('https://memo.wirewire.de') ||
-                value.startsWith('https://web.wirewire.de') ||
-                (process.env.NODE_ENV !== 'production' && value.startsWith('http://localhost:3200')),
-              {
-                message:
-                  process.env.NODE_ENV !== 'production'
-                    ? 'urlPath must start with https://memo.wirewire.de, https://web.wirewire.de, or http://localhost:3200'
-                    : 'urlPath must start with https://memo.wirewire.de or https://web.wirewire.de',
-              }
-            ) */
-            .openapi({
-            example: 'https://memo.wirewire.de/example.pdf',
-            description: 'URL path to the PDF generation endpoint. Allowed domains: https://memo.wirewire.de, https://web.wirewire.de' +
-                (process.env.NODE_ENV !== 'production' ? ', or http://localhost:3200 (dev)' : ''),
-        }),
-    }),
-};

package/src/pdf/pdf.controller.ts

@@ -1,35 +0,0 @@
-import httpStatus from "http-status";
-import catchAsync from "../utils/catchAsync.js";
-import pdfService from "./pdf.service.js";
-import ApiError from "../utils/ApiError.js";
-
-export const generatePdfFromUrl = catchAsync(async (req, res) => {
-  const fileName = "memo-print";
-
-  const authHeader = req.headers["authorization"];
-  if (!authHeader) {
-    throw new ApiError(httpStatus.UNAUTHORIZED, "Missing Authorization header");
-  }
-
-  const token = authHeader.split(" ")[1];
-  if (!token) {
-    throw new ApiError(httpStatus.UNAUTHORIZED, "Missing bearer token");
-  }
-
-  const urlPath =
-    typeof req.query.urlPath === "string" ? req.query.urlPath : undefined;
-  if (!urlPath) {
-    throw new ApiError(
-      httpStatus.BAD_REQUEST,
-      "Missing urlPath query parameter",
-    );
-  }
-
-  const result = await pdfService.generatePdfFromUrl({ urlPath, token });
-
-  res.status(httpStatus.CREATED).send({ signed: result });
-});
-
-export default {
-  generatePdfFromUrl,
-};

package/src/pdf/pdf.route.ts

@@ -1,28 +0,0 @@
-import { Router } from "express";
-import buildRouterAndDocs from "../utils/buildRouterAndDocs.js";
-import { generatePdfSchema } from "./pdf.validation.js";
-import { pdfResponseSchema } from "./pdf.schemas.js";
-import { generatePdfFromUrl } from "./pdf.controller.js";
-import type { RouteSpec } from "../types/routeSpec";
-import auth from "../middlewares/auth.js";
-
-export const pdfRouteSpecs: RouteSpec[] = [
-  {
-    method: "get",
-    path: "/",
-    validate: [auth("manageUsers")],
-    requestSchema: generatePdfSchema,
-    responseSchema: pdfResponseSchema,
-    handler: generatePdfFromUrl,
-    summary: "Generate a PDF from a provided URL",
-    description:
-      "This endpoint allows users to generate a PDF document from a specified URL.",
-    memoOnly: true,
-  },
-];
-
-const router: Router = Router();
-
-buildRouterAndDocs(router, pdfRouteSpecs, "/pdf", ["PDF"]);
-
-export default router;

package/src/pdf/pdf.schemas.ts

@@ -1,7 +0,0 @@
-import { z } from 'zod';
-
-export const pdfResponseSchema = z.object({
-  url: z.string().url(),
-  filename: z.string(),
-  size: z.number(),
-});

package/src/pdf/pdf.service.ts

@@ -1,103 +0,0 @@
-import puppeteer from "puppeteer";
-import { v4 as uuidv4 } from "uuid";
-import {
-  GetObjectCommand,
-  PutObjectCommand,
-  S3Client,
-} from "@aws-sdk/client-s3";
-import { getSignedUrl as getS3SignedUrl } from "@aws-sdk/s3-request-presigner";
-import path from "path";
-
-const s3 = new S3Client({
-  region: process.env.AWS_REGION,
-  credentials:
-    process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
-      ? {
-          accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-          secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-        }
-      : undefined,
-});
-
-// Function to upload a file to S3
-const uploadBuffer = async (
-  buffer: Buffer,
-  fileName: string,
-): Promise<void> => {
-  await s3.send(
-    new PutObjectCommand({
-      Bucket: process.env.AWS_S3_BUCKET_NAME!,
-      Key: fileName,
-      Body: buffer,
-      ContentType: "application/pdf",
-    }),
-  );
-};
-
-// Generate a signed URL
-const generateSignedUrl = async (fileName: string): Promise<string> => {
-  return getS3SignedUrl(
-    s3,
-    new GetObjectCommand({
-      Bucket: process.env.AWS_S3_BUCKET_NAME!,
-      Key: fileName,
-    }),
-    { expiresIn: 60 * 60 },
-  );
-};
-
-interface GeneratePdfOptions {
-  urlPath: string;
-  token: string;
-}
-
-const generatePdfFromUrl = async ({
-  urlPath,
-  token,
-}: GeneratePdfOptions): Promise<string> => {
-  const domain = process.env.FRONTEND_URL!;
-  const browser = await puppeteer.launch({
-    defaultViewport: {
-      width: 1300,
-      height: 1200,
-      deviceScaleFactor: 1,
-    },
-    executablePath: process.env.CHROME_BIN,
-    args: ["--no-sandbox"],
-  });
-
-  const page = await browser.newPage();
-
-  await page.goto(domain);
-
-  // Set the token in local storage
-  await page.evaluate((token) => {
-    localStorage.setItem("print-token", token);
-  }, token);
-
-  await page.goto(domain + urlPath, { waitUntil: "networkidle2" });
-
-  await page.waitForSelector(".pdf-render-complete");
-
-  const pdf = await page.pdf({ format: "A4", printBackground: true });
-
-  await page.evaluate(() => {
-    localStorage.setItem("print-token", "");
-  });
-
-  await browser.close();
-
-  const fileName = `download-${uuidv4()}.pdf`;
-  await uploadBuffer(Buffer.from(pdf), fileName);
-
-  console.log(`File uploaded successfully. File Name: ${fileName}`);
-
-  const signedUrl = await generateSignedUrl(path.basename(fileName));
-  console.log(`Signed URL: ${signedUrl}`);
-
-  return signedUrl;
-};
-
-export default {
-  generatePdfFromUrl,
-};

package/src/pdf/pdf.validation.ts

@@ -1,30 +0,0 @@
-import { extendZodWithOpenApi } from '@asteasolutions/zod-to-openapi';
-import { z } from 'zod';
-
-extendZodWithOpenApi(z);
-
-export const generatePdfSchema = {
-  query: z.object({
-    urlPath: z
-      .string()
-      /* .url()
-      .refine(
-        (value) =>
-          value.startsWith('https://memo.wirewire.de') ||
-          value.startsWith('https://web.wirewire.de') ||
-          (process.env.NODE_ENV !== 'production' && value.startsWith('http://localhost:3200')),
-        {
-          message:
-            process.env.NODE_ENV !== 'production'
-              ? 'urlPath must start with https://memo.wirewire.de, https://web.wirewire.de, or http://localhost:3200'
-              : 'urlPath must start with https://memo.wirewire.de or https://web.wirewire.de',
-        }
-      ) */
-      .openapi({
-        example: 'https://memo.wirewire.de/example.pdf',
-        description:
-          'URL path to the PDF generation endpoint. Allowed domains: https://memo.wirewire.de, https://web.wirewire.de' +
-          (process.env.NODE_ENV !== 'production' ? ', or http://localhost:3200 (dev)' : ''),
-      }),
-  }),
-};