Merge remote-tracking branch 'bill-rush/main'

src/internal/client.ts

@@ -1,6 +1,6 @@
 import { AWSConfig } from './config'
 import { HTTPHeaders } from './http'
-
+import { HTTPScheme } from './http'
 /**
  * Class allowing to build requests targeting AWS APIs
  *
@@ -13,7 +13,7 @@ export class AWSClient {
     serviceName: string
 
     private _host?: string
-
+    private _scheme?: HTTPScheme
     /**
      * @param {AWSConfig} awsConfig - configuration attributes to use when interacting with AWS' APIs
      * @param  {string} serviceName - name of the service to target.
@@ -30,14 +30,33 @@ export class AWSClient {
      */
     public get host() {
         if (this._host == undefined) {
-            return `${this.serviceName}.${this.awsConfig.region}.${this.awsConfig.endpoint}`
+          this._host = `${this.serviceName}.${this.awsConfig.region}.${this.awsConfig.endpoint}`
         }
         return this._host
     }
 
     public set host(host: string) {
         this._host = host
     }
+
+      /**
+     * Property computing the scheme to use http or https. Defaults to https as per AWSConfig Defaults
+     * the specific AWS service the child class implements the functionalities of.
+     */
+
+    public get scheme() {
+
+      if (this._scheme == undefined) {
+        this._scheme = this.awsConfig.scheme;
+      }
+      return this._scheme
+    }
+
+    // Validatiuon should be done by the type declaration 
+    public set scheme(scheme: HTTPScheme) {
+      this._scheme = scheme
+  }
+
 }
 
 /**

src/internal/s3.ts

@@ -8,6 +8,7 @@ import { AWSError } from './error'
 import { SignedHTTPRequest } from './http'
 import { InvalidSignatureError, SignatureV4 } from './signature'
 
+
 /** Class allowing to interact with Amazon AWS's S3 service */
 export class S3Client extends AWSClient {
     signature: SignatureV4
@@ -48,7 +49,7 @@ export class S3Client extends AWSClient {
         const signedRequest: SignedHTTPRequest = this.signature.sign(
             {
                 method: 'GET',
-                protocol: 'https',
+                protocol: this.scheme,
                 hostname: this.host,
                 path: '/',
                 headers: {},
@@ -101,14 +102,14 @@ export class S3Client extends AWSClient {
     listObjects(bucketName: string, prefix?: string): Array<S3Object> {
         // Prepare request
         const method = 'GET'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest: SignedHTTPRequest = this.signature.sign(
             {
                 method: 'GET',
-                protocol: 'https',
+                protocol: this.scheme,
                 hostname: host,
-                path: '/',
+                path: `/${bucketName}/`,
                 query: {
                     'list-type': '2',
                     prefix: prefix || '',
@@ -170,14 +171,14 @@ export class S3Client extends AWSClient {
     getObject(bucketName: string, objectKey: string): S3Object {
         // Prepare request
         const method = 'GET'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest = this.signature.sign(
             {
                 method: 'GET',
-                protocol: 'https',
+                protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {},
             },
             {}
@@ -215,14 +216,14 @@ export class S3Client extends AWSClient {
     putObject(bucketName: string, objectKey: string, data: string | ArrayBuffer) {
         // Prepare request
         const method = 'PUT'
-        const host = `${bucketName}.${this.host}`
-
+        const host = `${this.host}`
+  
         const signedRequest = this.signature.sign(
             {
                 method: method,
-                protocol: 'https',
+                protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {
                     Host: host,
                 },
@@ -249,14 +250,14 @@ export class S3Client extends AWSClient {
     deleteObject(bucketName: string, objectKey: string): void {
         // Prepare request
         const method = 'DELETE'
-        const host = `${bucketName}.${this.host}`
+        const host = `${this.host}`
 
         const signedRequest = this.signature.sign(
             {
                 method: method,
-                protocol: 'https',
+                protocol: this.scheme,
                 hostname: host,
-                path: `/${objectKey}`,
+                path: `/${bucketName}/${objectKey}`,
                 headers: {},
             },
             {}

tests/internal/s3.js

@@ -4,6 +4,7 @@ import { AWSConfig, S3Client, S3ServiceError } from '../../build/s3.js'
 export function s3TestSuite(data) {
     const s3Client = new S3Client(data.awsConfig)
     s3Client.host = `s3.${data.awsConfig.endpoint}`
+    s3Client.scheme = `https`
 
     describe('list buckets', () => {
         // Act
@@ -196,4 +197,4 @@ export function s3TestSuite(data) {
         data.s3.testObjects[2].key,
         data.s3.testObjects[2].body
     )
-}
+}