From 0e9e8e0a0e04f246af97f256418bfa7812fa1754 Mon Sep 17 00:00:00 2001
From: Harminder Virk <virk.officials@gmail.com>
Date: Mon, 27 Nov 2023 11:16:04 +0530
Subject: [PATCH] refactor: use usingEdgeJS flag to detect is edge is installed

---
 providers/shield_provider.ts | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/providers/shield_provider.ts b/providers/shield_provider.ts
index b9a93c4..9ded5e3 100644
--- a/providers/shield_provider.ts
+++ b/providers/shield_provider.ts
@@ -7,10 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import { Edge } from 'edge.js'
 import type { ApplicationService } from '@adonisjs/core/types'
 
-import debug from '../src/debug.js'
 import type { ShieldConfig } from '../src/types.js'
 import ShieldMiddleware from '../src/shield_middleware.js'
 
@@ -19,16 +17,6 @@ import ShieldMiddleware from '../src/shield_middleware.js'
  */
 export default class ShieldProvider {
   constructor(protected app: ApplicationService) {}
-  /**
-   * Returns edge when it's installed
-   */
-  protected async getEdge(): Promise<Edge | undefined> {
-    try {
-      const { default: edge } = await import('edge.js')
-      debug('Detected edge.js package. Adding shield primitives to it')
-      return edge
-    } catch {}
-  }
 
   /**
    * Register ShieldMiddleware to the container
@@ -37,9 +25,13 @@ export default class ShieldProvider {
     this.app.container.bind(ShieldMiddleware, async () => {
       const config = this.app.config.get<ShieldConfig>('shield', {})
       const encryption = await this.app.container.make('encryption')
-      const edge = await this.getEdge()
 
-      return new ShieldMiddleware(config, encryption, edge)
+      if (this.app.usingEdgeJS) {
+        const edge = await import('edge.js')
+        return new ShieldMiddleware(config, encryption, edge.default)
+      }
+
+      return new ShieldMiddleware(config, encryption)
     })
   }
 }