mirror of
https://github.com/alexandernicholson/s3panoramic.git
synced 2026-03-31 09:07:11 +09:00
fix: enable non-access-key flows
This commit is contained in:
@@ -5,12 +5,10 @@ import { objectList } from "../templates/components/object_list.ts";
|
||||
|
||||
const apiRoutes = new Hono();
|
||||
|
||||
const storageService = new StorageService(
|
||||
Deno.env.get("S3_BUCKET") || "",
|
||||
Deno.env.get("S3_REGION") || "",
|
||||
Deno.env.get("AWS_ACCESS_KEY_ID") || "",
|
||||
Deno.env.get("AWS_SECRET_ACCESS_KEY") || "",
|
||||
);
|
||||
const storageService = new StorageService({
|
||||
bucket: Deno.env.get("S3_BUCKET") || "",
|
||||
region: Deno.env.get("S3_REGION") || ""
|
||||
});
|
||||
|
||||
const searchService = new SearchService(storageService);
|
||||
|
||||
|
||||
@@ -4,16 +4,13 @@ import { browser } from "../templates/browser.ts";
|
||||
import { layout } from "../templates/layout.ts";
|
||||
import { objectList } from "../templates/components/object_list.ts";
|
||||
import { pagination } from "../templates/components/pagination.ts";
|
||||
import { DOMParser } from "https://deno.land/x/deno_dom@v0.1.48/deno-dom-wasm.ts";
|
||||
|
||||
const viewRoutes = new Hono();
|
||||
|
||||
const storageService = new StorageService(
|
||||
Deno.env.get("S3_BUCKET") || "",
|
||||
Deno.env.get("S3_REGION") || "",
|
||||
Deno.env.get("AWS_ACCESS_KEY_ID") || "",
|
||||
Deno.env.get("AWS_SECRET_ACCESS_KEY") || "",
|
||||
);
|
||||
const storageService = new StorageService({
|
||||
bucket: Deno.env.get("S3_BUCKET") || "",
|
||||
region: Deno.env.get("S3_REGION") || ""
|
||||
});
|
||||
|
||||
viewRoutes.get("/", async (c) => {
|
||||
const prefix = c.req.query("prefix") || "";
|
||||
|
||||
@@ -10,18 +10,23 @@ interface Credentials {
|
||||
sessionToken?: string;
|
||||
}
|
||||
|
||||
interface StorageServiceConfig {
|
||||
bucket: string;
|
||||
region: string;
|
||||
}
|
||||
|
||||
export class StorageService {
|
||||
private client: S3;
|
||||
private credentials!: Credentials;
|
||||
|
||||
constructor(private bucket: string, private region: string) {
|
||||
constructor(private config: StorageServiceConfig) {
|
||||
this.initializeClient();
|
||||
}
|
||||
|
||||
private async initializeClient() {
|
||||
this.credentials = await this.resolveCredentials();
|
||||
const factory = new ApiFactory({
|
||||
region: this.region,
|
||||
region: this.config.region,
|
||||
credentials: this.credentials,
|
||||
});
|
||||
|
||||
@@ -114,9 +119,9 @@ export class StorageService {
|
||||
return await getSignedUrl({
|
||||
accessKeyId: this.credentials.awsAccessKeyId,
|
||||
secretAccessKey: this.credentials.awsSecretKey,
|
||||
bucket: this.bucket,
|
||||
bucket: this.config.bucket,
|
||||
key,
|
||||
region: this.region,
|
||||
region: this.config.region,
|
||||
expiresIn,
|
||||
});
|
||||
}
|
||||
@@ -125,7 +130,7 @@ export class StorageService {
|
||||
await this.ensureInitialized();
|
||||
try {
|
||||
const params: ListObjectsV2Request = {
|
||||
Bucket: this.bucket,
|
||||
Bucket: this.config.bucket,
|
||||
Prefix: options.prefix,
|
||||
Delimiter: options.delimiter,
|
||||
MaxKeys: options.maxKeys,
|
||||
@@ -163,7 +168,7 @@ export class StorageService {
|
||||
private async getContentType(key: string): Promise<string | undefined> {
|
||||
try {
|
||||
const response = await this.client.headObject({
|
||||
Bucket: this.bucket,
|
||||
Bucket: this.config.bucket,
|
||||
Key: key,
|
||||
});
|
||||
return response.ContentType;
|
||||
|
||||
Reference in New Issue
Block a user