@social-mail/social-mail-web-server 1.7.182 → 1.7.183

package/dist/wwwroot/routes/social-mail/public/geo/country/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/geo/country/get.tsx"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAM5D,OAAO,YAAY,MAAM,0DAA0D,CAAC;AAIpF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,YAAY,EAAE,YAAY,CAAC;IAErB,GAAG;CAkBZ"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/geo/country/get.tsx"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6CAA6C,CAAC;AAClE,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAM5D,OAAO,YAAY,MAAM,0DAA0D,CAAC;AAIpF,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,YAAY,EAAE,YAAY,CAAC;IAErB,GAAG;CAyBZ"}

package/dist/wwwroot/routes/social-mail/public/geo/country/get.js

@@ -7,20 +7,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import Page from "@entity-access/server-pages/dist/Page.js";
+import AccessTokenService from "../../../../../../server/smtp/services/AccessTokenService.js";
 import GeoIPService from "../../../../../../server/services/geo-ip/GeoIPService.js";
 let builder;
 export default class default_1 extends Page {
     async run() {
         let ip = this.request.remoteIPAddress;
+        let sendJson = false;
         if (this.childPath.length) {
             ip = this.childPath[0];
-            // const ats = ServiceProvider.resolve(this, AccessTokenService);
-            // await ats.verifyToken(this.request.headers.authorization);
+            const ats = ServiceProvider.resolve(this, AccessTokenService);
+            await ats.verifyToken(this.request.headers.authorization);
+            sendJson = true;
         }
-        const { country } = await this.geoIPService.getBlock(ip);
+        const { blockStart, blockEnd, country, verified, error } = await this.geoIPService.getBlock(ip);
         this.cacheControl = "public, max-age=8600, immutable";
+        if (sendJson) {
+            return this.json({ blockStart, blockEnd, country, verified, error });
+        }
         return this.json({ country });
     }
 }

package/dist/wwwroot/routes/social-mail/public/geo/country/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/geo/country/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAA2B,MAAM,4CAA4C,CAAC;AAErF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAM5D,OAAO,YAAY,MAAM,0DAA0D,CAAC;AAEpF,IAAI,OAAqB,CAAC;AAE1B,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QAEL,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;QAEtC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACxB,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAEvB,iEAAiE;YACjE,6DAA6D;QACjE,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,YAAY,GAAG,iCAAiC,CAAC;QAEtD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAClC,CAAC;CAEJ;AApBG;IADC,MAAM;8BACO,YAAY;+CAAC"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/public/geo/country/get.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAErF,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAK5D,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAC9F,OAAO,YAAY,MAAM,0DAA0D,CAAC;AAEpF,IAAI,OAAqB,CAAC;AAE1B,MAAM,CAAC,OAAO,gBAAO,SAAQ,IAAI;IAK7B,KAAK,CAAC,GAAG;QAEL,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;QAEtC,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACxB,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAEvB,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;YAC9D,MAAM,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YAC1D,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;QAED,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEhG,IAAI,CAAC,YAAY,GAAG,iCAAiC,CAAC;QAEtD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAClC,CAAC;CAEJ;AA3BG;IADC,MAAM;8BACO,YAAY;+CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.182",
+  "version": "1.7.183",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/wwwroot/routes/social-mail/public/geo/country/get.tsx

@@ -19,17 +19,24 @@ export default class extends Page {
 
         let ip = this.request.remoteIPAddress;
 
+        let sendJson = false;
+
         if (this.childPath.length) {
             ip = this.childPath[0];
 
-            // const ats = ServiceProvider.resolve(this, AccessTokenService);
-            // await ats.verifyToken(this.request.headers.authorization);
+            const ats = ServiceProvider.resolve(this, AccessTokenService);
+            await ats.verifyToken(this.request.headers.authorization);
+            sendJson = true;
         }
 
-        const { country } = await this.geoIPService.getBlock(ip);
+        const { blockStart, blockEnd, country, verified, error } = await this.geoIPService.getBlock(ip);
 
         this.cacheControl = "public, max-age=8600, immutable";
 
+        if (sendJson) {
+            return this.json({ blockStart, blockEnd, country, verified, error });
+        }
+
         return this.json({ country });
     }