@adminforth/upload 1.0.20 → 1.0.21

package/dist/index.js

@@ -11,7 +11,7 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
-import { RateLimiter, getClientIp } from "adminforth";
+import { RateLimiter } from "adminforth";
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 export default class UploadPlugin extends AdminForthPlugin {
     constructor(options) {
@@ -329,6 +329,7 @@ export default class UploadPlugin extends AdminForthPlugin {
         });
     }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
+        this.adminforth = adminforth;
         // called here because modifyResourceConfig can be called in build time where there is no environment and AWS secrets
         this.setupLifecycleRule();
     }
@@ -418,7 +419,7 @@ export default class UploadPlugin extends AdminForthPlugin {
                 }
                 if ((_d = this.options.generation.rateLimit) === null || _d === void 0 ? void 0 : _d.limit) {
                     // rate limit
-                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_e = this.options.generation.rateLimit) === null || _e === void 0 ? void 0 : _e.limit, getClientIp(headers));
+                    const { error } = RateLimiter.checkRateLimit(this.pluginInstanceId, (_e = this.options.generation.rateLimit) === null || _e === void 0 ? void 0 : _e.limit, this.adminforth.auth.getClientIp(headers));
                     if (error) {
                         return { error: this.options.generation.rateLimit.errorMessage };
                     }

package/index.ts

@@ -4,13 +4,15 @@ import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { ExpirationStatus, GetObjectCommand, ObjectCannedACL, PutObjectCommand, S3 } from '@aws-sdk/client-s3';
 import { AdminForthPlugin, AdminForthResourceColumn, AdminForthResourcePages, IAdminForth, IHttpServer, suggestIfTypo } from "adminforth";
 import { Readable } from "stream";
-import { RateLimiter, getClientIp } from "adminforth";
+import { RateLimiter } from "adminforth";
 
 const ADMINFORTH_NOT_YET_USED_TAG = 'adminforth-candidate-for-cleanup';
 
 export default class UploadPlugin extends AdminForthPlugin {
   options: PluginOptions;
 
+  adminforth!: IAdminForth;
+
   constructor(options: PluginOptions) {
     super(options, import.meta.url);
     this.options = options;
@@ -363,6 +365,7 @@ export default class UploadPlugin extends AdminForthPlugin {
   }
 
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: any) {
+    this.adminforth = adminforth;
     // called here because modifyResourceConfig can be called in build time where there is no environment and AWS secrets
     this.setupLifecycleRule();
   }
@@ -464,7 +467,7 @@ export default class UploadPlugin extends AdminForthPlugin {
           const { error } = RateLimiter.checkRateLimit(
             this.pluginInstanceId, 
             this.options.generation.rateLimit?.limit,
-            getClientIp(headers),
+            this.adminforth.auth.getClientIp(headers),
           );
           if (error) {
             return { error: this.options.generation.rateLimit.errorMessage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/upload",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",