Serve script and configuration improved

MotaWord · Feb 15, 2022 · a2cfb51 · a2cfb51
1 parent d49feac
commit a2cfb51
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/config/motaword.php b/config/motaword.php
@@ -49,6 +49,15 @@
         |
         */
         'serve_url' => env('MOTAWORD_ACTIVE_SERVE_URL', 'https://serve.motaword.com'),
+        /*
+        |--------------------------------------------------------------------------
+        | Active JS URL
+        |--------------------------------------------------------------------------
+        |
+        | This is the base URL for front facing Active experience. This is typically used if Serve is disabled.
+        |
+        */
+        'active_js_url' => env('MOTAWORD_ACTIVE_JS_URL', 'https://active-js.motaword.com/index.js'),
 
         /*
         |--------------------------------------------------------------------------

diff --git a/src/ActiveJS.php b/src/ActiveJS.php
@@ -13,10 +13,16 @@ public static function generate(): string
     {
         $config = config('motaword.active');
 
-        if (!$config || !$config['token'] || !$config['project_id'] || !$config['widget_id'] || !$config['serve_url']) {
+        if (!$config || !$config['project_id'] || !$config['widget_id'] || !$config['token']
+            || ($config['serve_enable'] && !$config['serve_url'])
+            || (!$config['serve_enable'] && !$config['active_js_url'])) {
             throw new Exception('Token, project ID and widget ID are required for MotaWord Active.');
         }
 
-        return "<script src=\"${config['serve_url']}/js/${config['project_id']}-${config['widget_id']}.js\" crossorigin async></script>";
+        if ($config['serve_enable']) {
+            return "<script src=\"${config['serve_url']}/js/${config['project_id']}-${config['widget_id']}.js\" ".($config['token'] ? 'data-token="'.$config['token'].'"' : '')." crossorigin async></script>";
+        } else {
+            return "<script src=\"${config['active_js_url']}\" ".($config['token'] ? 'data-token="'.$config['token'].'"' : '')." ".($config['project_id'] ? 'data-project-id="'.$config['project_id'].'"' : '')." ".($config['widget_id'] ? 'data-widget-id="'.$config['widget_id'].'"' : '')." crossorigin async></script>";
+        }
     }
 }
diff --git a/src/ActiveServeMiddleware.php b/src/ActiveServeMiddleware.php
@@ -122,8 +122,6 @@ public function handle(Request $request, Closure $next)
     private function shouldShowPrerenderedPage(Request $request): bool
     {
         $userAgent = strtolower($request->server->get('HTTP_USER_AGENT'));
-        $bufferAgent = $request->server->get('X-BUFFERBOT');
-
         $requestUri = $request->getRequestUri();
         $referer = $request->headers->get('Referer');
 
@@ -149,10 +147,6 @@ private function shouldShowPrerenderedPage(Request $request): bool
             }
         }
 
-        if ($bufferAgent) {
-            $isRequestingPrerenderedPage = true;
-        }
-
         if (!$isRequestingPrerenderedPage) {
             return false;
         }
@@ -178,7 +172,6 @@ private function shouldShowPrerenderedPage(Request $request): bool
             }
         }
 
-        // Okay! Prerender please.
         return true;
     }