save worker info in component prop

ujjwalguptaofficial · Jan 14, 2024 · 21307b4 · 21307b4
1 parent ec8a74e
commit 21307b4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/src/abstracts/guard.ts b/src/abstracts/guard.ts
@@ -18,7 +18,7 @@ export abstract class Guard extends Component {
  }
 
  get workerName() {
- return this['componentProp_'].workerName;
+ return this['componentProp_'].workerInfo.workerName;
  }
 
  abstract check(...args): Promise<IHttpResult | void>;

diff --git a/src/abstracts/shield.ts b/src/abstracts/shield.ts
@@ -6,7 +6,7 @@ import { Component } from "./component";
 
 export abstract class Shield extends Component {
  get workerName() {
- return this['componentProp_'].workerName;
+ return this['componentProp_'].workerInfo.workerName;
  }
 
  get logger(): Logger {

diff --git a/src/handlers/request_handler.ts b/src/handlers/request_handler.ts
@@ -129,11 +129,10 @@ export class RequestHandler extends RequestHandlerHelper {
 
  this.componentProps.param = routeMatchInfo.params;
  this.componentProps.controllerName = routeMatchInfo.controllerName;
- this.componentProps.workerName = workerInfo.workerName;
+ this.componentProps.workerInfo = workerInfo;
 
  const shieldResult = await this.executeShieldsProtection_();
  if (shieldResult) return shieldResult;
-
  const guardResult = await this.executeGuardsCheck_(
  workerInfo.guards
  );

diff --git a/src/helpers/test/init_controller.ts b/src/helpers/test/init_controller.ts
@@ -31,7 +31,9 @@ export const initController = (controllerInstance: Controller, data?: IControlle
  param: data.param || {},
  data: data.data || {},
  file: new FileManager(data.file || {}),
- workerName: (data as any).workerName,
+ workerInfo: {
+ workerName: (data as any).workerName
+ } as any,
  global: FORT_GLOBAL,
  cache: cacheManager
  };

diff --git a/src/interfaces/component_prop.ts b/src/interfaces/component_prop.ts
@@ -4,6 +4,7 @@ import { FortGlobal } from "../constants";
 import { SessionManager } from "../utils";
 import { TComponentQuery } from "../types";
 import { CacheManager } from "../utils/cache_manager";
+import { IWorkerInfo } from "./worker_info";
 
 export interface IComponentProp {
  request: http.IncomingMessage;
@@ -15,8 +16,8 @@ export interface IComponentProp {
  param?: { [key: string]: string };
  data: { [key: string]: any };
  file?: FileManager;
- workerName?: string;
  controllerName?: string;
  global: FortGlobal;
  cache: CacheManager;
+ workerInfo?: IWorkerInfo;
 }
diff --git a/src/providers/cache_guard.ts b/src/providers/cache_guard.ts
@@ -3,6 +3,7 @@ import { IHttpResult } from "../interfaces";
 
 export class CacheGuard extends Guard {
  async check(...args: any[]): Promise<void | IHttpResult> {
+ const cache = this['componentProp_'].workerInfo.cache;
  // get cache condition from routes
  // and check if condition exist