@cytario/web 2.1.8 → 2.2.1

package/app/.server/auth/getS3Client.ts

@@ -1,93 +0,0 @@
-import { S3Client } from "@aws-sdk/client-s3";
-import { Credentials } from "@aws-sdk/client-sts";
-import crypto from "crypto";
-import { LRUCache } from "lru-cache";
-
-import { ConnectionConfig } from "~/.generated/client";
-import { isAwsS3Endpoint } from "~/utils/s3Provider";
-
-interface CacheEntry {
-  client: S3Client;
-  userId: string;
-  bucketName: string;
-}
-
-/**
- * User-scoped S3Client cache with TTL and LRU eviction.
- * Prevents cross-user data leakage and handles credential expiration.
- */
-const s3ClientCache = new LRUCache<string, CacheEntry>({
-  max: 10000,
-  ttl: 3600000, // 1 hour in milliseconds (matches typical STS credential TTL)
-});
-
-/**
- * Creates a unique cache key scoped to user, bucket, and credential identity.
- */
-const createCacheKey = (userId: string, bucketName: string, credentials: Credentials): string => {
-  // Hash credentials to detect when they change (e.g., after refresh)
-  const credHash = crypto
-    .createHash("sha256")
-    .update(`${credentials.AccessKeyId}:${credentials.SecretAccessKey}:${credentials.SessionToken}`)
-    .digest("hex")
-    .substring(0, 16);
-
-  return `${userId}:${bucketName}:${credHash}`;
-};
-
-export const getS3Client = async (
-  connectionConfig: ConnectionConfig,
-  credentials: Credentials,
-  userId: string,
-): Promise<S3Client> => {
-  const { bucketName, region, endpoint } = connectionConfig;
-  const { AccessKeyId, SecretAccessKey, SessionToken } = credentials;
-
-  if (!AccessKeyId || !SecretAccessKey) throw Error("No Credentials");
-  if (!userId) throw Error("User ID is required for S3Client cache");
-
-  // Check cache first
-  const key = createCacheKey(userId, bucketName, credentials);
-  const cachedEntry = s3ClientCache.get(key);
-  if (cachedEntry) {
-    return cachedEntry.client;
-  }
-
-  // Use default region if null
-  const actualRegion = region ?? "eu-central-1";
-
-  // Detect if this is AWS S3 or a compatible service (MinIO, etc.)
-  const isAwsS3 = isAwsS3Endpoint(endpoint);
-
-  const s3Client = new S3Client({
-    region: actualRegion,
-    // Only set endpoint for non-AWS S3 services
-    ...(endpoint && !isAwsS3 ? { endpoint } : {}),
-    credentials: {
-      accessKeyId: AccessKeyId,
-      secretAccessKey: SecretAccessKey,
-      sessionToken: SessionToken,
-    },
-    // Only use path style for non-AWS S3 services (MinIO, etc.)
-    forcePathStyle: !isAwsS3,
-  });
-
-  // Cache the client
-  s3ClientCache.set(key, {
-    client: s3Client,
-    userId,
-    bucketName,
-  });
-
-  return s3Client;
-};
-
-/** Remove all cached S3 clients for a given user + bucket (e.g. after config change). */
-export const invalidateS3ClientsForBucket = (userId: string, bucketName: string): void => {
-  for (const key of s3ClientCache.keys()) {
-    const entry = s3ClientCache.peek(key);
-    if (entry && entry.userId === userId && entry.bucketName === bucketName) {
-      s3ClientCache.delete(key);
-    }
-  }
-};

package/app/routes/presign.route.tsx

@@ -1,42 +0,0 @@
-import { ActionFunctionArgs } from "react-router";
-
-import { authContext, authMiddleware } from "~/.server/auth/authMiddleware";
-import { getPresignedUrl } from "~/.server/auth/getPresignedUrl";
-import { getS3Client } from "~/.server/auth/getS3Client";
-import { createLabel } from "~/.server/logging";
-import { requestDurationMiddleware } from "~/.server/requestDurationMiddleware";
-import { getConnection } from "~/routes/connections/connections.server";
-
-export const middleware = [requestDurationMiddleware, authMiddleware];
-
-const label = createLabel("presign", "gray");
-
-export const loader = async ({ params, context }: ActionFunctionArgs): Promise<Response> => {
-  const { user, credentials: connectionsCredentials } = context.get(authContext);
-  const { name: connectionName } = params;
-  const pathName = params["*"] ?? "";
-
-  if (!connectionName) throw new Error("Connection name is required");
-
-  const connectionConfig = await getConnection(user, connectionName);
-  if (!connectionConfig) {
-    throw new Error("Connection configuration not found");
-  }
-
-  const { provider, bucketName, prefix: connPrefix } = connectionConfig;
-  const s3Key = connPrefix ? `${connPrefix.replace(/\/$/, "")}/${pathName}` : pathName;
-  console.info(`${label} Presign route: ${provider}/${bucketName}/${s3Key}`);
-
-  const credentials = connectionsCredentials[connectionName];
-  if (!credentials) throw new Error(`No credentials for connection: ${connectionName}`);
-
-  try {
-    const s3Client = await getS3Client(connectionConfig, credentials, user.sub);
-    const presignedUrl = await getPresignedUrl(connectionConfig, s3Client, s3Key);
-
-    return Response.json({ url: presignedUrl });
-  } catch (error) {
-    console.error("Error presigning url", error);
-    return Response.json({ error: "Failed to generate presigned URL" }, { status: 500 });
-  }
-};

package/app/utils/getObjects.ts

@@ -1,24 +0,0 @@
-import { _Object, ListObjectsV2Command, S3Client } from "@aws-sdk/client-s3";
-
-import { filterObjects } from "./filterObjects";
-import { ConnectionConfig } from "~/.generated/client";
-
-export const getObjects = async (
-  connectionConfig: ConnectionConfig,
-  s3Client: S3Client,
-  query?: string | null,
-  prefix?: string,
-  maxKeys?: number,
-): Promise<_Object[]> => {
-  const listObjectsCommand = new ListObjectsV2Command({
-    Bucket: connectionConfig.bucketName,
-    Prefix: prefix,
-    ...(maxKeys ? { MaxKeys: maxKeys } : {}),
-  });
-
-  const { Contents } = await s3Client.send(listObjectsCommand);
-
-  const filteredFiles = filterObjects(Contents, { query });
-
-  return filteredFiles;
-};