authscape 1.0.735 → 1.0.736

package/index.js

@@ -8144,7 +8144,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 function createSitemapRoute(apiUri) {
   return /*#__PURE__*/function () {
     var _GET = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(request) {
-      var url, protocol, host, domain, encodedDomain, response, sitemap;
+      var url, protocol, host, domain, encodedDomain, apiUrl, response, sitemap;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -8152,11 +8152,14 @@ function createSitemapRoute(apiUri) {
             // Get the domain from the request
             url = new URL(request.url);
             protocol = request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
-            host = request.headers.get('host') || url.host;
-            domain = "".concat(protocol, "://").concat(host); // URL encode the domain for the API request
-            encodedDomain = encodeURIComponent(domain);
+            host = request.headers.get('host') || url.host; // Determine protocol based on host
+            if (host.includes("localhost")) {
+              domain = "http://" + host;
+            } else {
+              domain = "https://" + host;
+            }
             if (apiUri) {
-              _context.next = 9;
+              _context.next = 8;
               break;
             }
             console.error('AuthScape Sitemap Error: apiUri is not configured in environment variables');
@@ -8166,21 +8169,28 @@ function createSitemapRoute(apiUri) {
                 'Content-Type': 'text/plain'
               }
             }));
-          case 9:
-            _context.next = 11;
-            return fetch("".concat(apiUri, "/api/Sitemap?domain=").concat(encodedDomain));
-          case 11:
+          case 8:
+            // URL encode the domain for the API request
+            encodedDomain = encodeURIComponent(domain);
+            apiUrl = "".concat(apiUri, "/api/Sitemap?domain=").concat(encodedDomain);
+            console.log('Fetching sitemap from:', apiUrl);
+            _context.next = 13;
+            return fetch(apiUrl);
+          case 13:
             response = _context.sent;
             if (response.ok) {
-              _context.next = 14;
+              _context.next = 16;
               break;
             }
             throw new Error("API request failed with status ".concat(response.status));
-          case 14:
-            _context.next = 16;
-            return response.text();
           case 16:
+            _context.next = 18;
+            return response.text();
+          case 18:
             sitemap = _context.sent;
+            console.log('Sitemap fetched successfully, length:', sitemap.length);
+
+            // Return the XML response with appropriate headers
             return _context.abrupt("return", new Response(sitemap, {
               status: 200,
               headers: {
@@ -8188,21 +8198,21 @@ function createSitemapRoute(apiUri) {
                 'Cache-Control': 'public, s-maxage=86400, stale-while-revalidate'
               }
             }));
-          case 20:
-            _context.prev = 20;
+          case 23:
+            _context.prev = 23;
             _context.t0 = _context["catch"](0);
             console.error('AuthScape Sitemap Error:', _context.t0);
-            return _context.abrupt("return", new Response('Error generating sitemap', {
+            return _context.abrupt("return", new Response("Error generating sitemap: ".concat(_context.t0.message || _context.t0), {
               status: 500,
               headers: {
                 'Content-Type': 'text/plain'
               }
             }));
-          case 24:
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 20]]);
+      }, _callee, null, [[0, 23]]);
     }));
     function GET(_x) {
       return _GET.apply(this, arguments);
@@ -9500,7 +9510,7 @@ function generateSitemap(_x, _x2, _x3) {
 }
 function _generateSitemap() {
   _generateSitemap = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res, apiUri) {
-    var host, domain, encodedDomain, response, sitemap;
+    var host, domain, encodedDomain, apiUrl, response, sitemap;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9514,37 +9524,44 @@ function _generateSitemap() {
           }
 
           // URL encode the domain for the API request
-          encodedDomain = encodeURIComponent(domain); // Make a basic HTTP GET request to AuthScape API
-          _context.next = 6;
-          return fetch("".concat(apiUri, "/api/Sitemap?domain=").concat(encodedDomain));
-        case 6:
+          encodedDomain = encodeURIComponent(domain);
+          apiUrl = "".concat(apiUri, "/api/Sitemap?domain=").concat(encodedDomain);
+          console.log('Fetching sitemap from:', apiUrl);
+
+          // Make a basic HTTP GET request to AuthScape API
+          _context.next = 8;
+          return fetch(apiUrl);
+        case 8:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 9;
+            _context.next = 11;
             break;
           }
           throw new Error("API request failed with status ".concat(response.status));
-        case 9:
-          _context.next = 11;
-          return response.text();
         case 11:
+          _context.next = 13;
+          return response.text();
+        case 13:
           sitemap = _context.sent;
-          // Set the appropriate headers for XML
+          console.log('Sitemap fetched successfully, length:', sitemap.length);
+
+          // Set status code and headers BEFORE writing
+          res.statusCode = 200;
           res.setHeader('Content-Type', 'text/xml; charset=utf-8');
           res.setHeader('Cache-Control', 'public, s-maxage=86400, stale-while-revalidate');
 
-          // Send the XML response
+          // Write and end the response
           res.write(sitemap);
           res.end();
           return _context.abrupt("return", {
             props: {}
           });
-        case 19:
-          _context.prev = 19;
+        case 23:
+          _context.prev = 23;
           _context.t0 = _context["catch"](0);
           console.error('AuthScape Sitemap Error:', _context.t0);
 
-          // Return 500 error with error details
+          // Set status code BEFORE headers and writing
           res.statusCode = 500;
           res.setHeader('Content-Type', 'text/plain');
           res.write("Error generating sitemap: ".concat(_context.t0.message || _context.t0));
@@ -9552,11 +9569,11 @@ function _generateSitemap() {
           return _context.abrupt("return", {
             props: {}
           });
-        case 27:
+        case 31:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 19]]);
+    }, _callee, null, [[0, 23]]);
   }));
   return _generateSitemap.apply(this, arguments);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.735",
+  "version": "1.0.736",
   "description": "",
   "main": "index.js",
   "files": [

package/src/lib/sitemap-route.js

@@ -16,10 +16,14 @@ export function createSitemapRoute(apiUri) {
       const url = new URL(request.url);
       const protocol = request.headers.get('x-forwarded-proto') || url.protocol.replace(':', '');
       const host = request.headers.get('host') || url.host;
-      const domain = `${protocol}://${host}`;
 
-      // URL encode the domain for the API request
-      const encodedDomain = encodeURIComponent(domain);
+      // Determine protocol based on host
+      let domain;
+      if (host.includes("localhost")) {
+        domain = "http://" + host;
+      } else {
+        domain = "https://" + host;
+      }
 
       if (!apiUri) {
         console.error('AuthScape Sitemap Error: apiUri is not configured in environment variables');
@@ -31,7 +35,13 @@ export function createSitemapRoute(apiUri) {
         });
       }
 
-      const response = await fetch(`${apiUri}/api/Sitemap?domain=${encodedDomain}`);
+      // URL encode the domain for the API request
+      const encodedDomain = encodeURIComponent(domain);
+      const apiUrl = `${apiUri}/api/Sitemap?domain=${encodedDomain}`;
+
+      console.log('Fetching sitemap from:', apiUrl);
+
+      const response = await fetch(apiUrl);
 
       if (!response.ok) {
         throw new Error(`API request failed with status ${response.status}`);
@@ -40,6 +50,8 @@ export function createSitemapRoute(apiUri) {
       // Get the sitemap XML
       const sitemap = await response.text();
 
+      console.log('Sitemap fetched successfully, length:', sitemap.length);
+
       // Return the XML response with appropriate headers
       return new Response(sitemap, {
         status: 200,
@@ -51,7 +63,7 @@ export function createSitemapRoute(apiUri) {
     } catch (error) {
       console.error('AuthScape Sitemap Error:', error);
 
-      return new Response('Error generating sitemap', {
+      return new Response(`Error generating sitemap: ${error.message || error}`, {
         status: 500,
         headers: {
           'Content-Type': 'text/plain',

package/src/services/sitemapService.js

@@ -25,9 +25,12 @@ export async function generateSitemap(req, res, apiUri) {
 
     // URL encode the domain for the API request
     const encodedDomain = encodeURIComponent(domain);
+    const apiUrl = `${apiUri}/api/Sitemap?domain=${encodedDomain}`;
+
+    console.log('Fetching sitemap from:', apiUrl);
 
     // Make a basic HTTP GET request to AuthScape API
-    const response = await fetch(`${apiUri}/api/Sitemap?domain=${encodedDomain}`);
+    const response = await fetch(apiUrl);
 
     if (!response.ok) {
       throw new Error(`API request failed with status ${response.status}`);
@@ -36,11 +39,14 @@ export async function generateSitemap(req, res, apiUri) {
     // Get the sitemap XML from the API
     const sitemap = await response.text();
 
-    // Set the appropriate headers for XML
+    console.log('Sitemap fetched successfully, length:', sitemap.length);
+
+    // Set status code and headers BEFORE writing
+    res.statusCode = 200;
     res.setHeader('Content-Type', 'text/xml; charset=utf-8');
     res.setHeader('Cache-Control', 'public, s-maxage=86400, stale-while-revalidate');
 
-    // Send the XML response
+    // Write and end the response
     res.write(sitemap);
     res.end();
 
@@ -50,7 +56,7 @@ export async function generateSitemap(req, res, apiUri) {
   } catch (error) {
     console.error('AuthScape Sitemap Error:', error);
 
-    // Return 500 error with error details
+    // Set status code BEFORE headers and writing
     res.statusCode = 500;
     res.setHeader('Content-Type', 'text/plain');
     res.write(`Error generating sitemap: ${error.message || error}`);