nextemos 6.3.0 → 6.4.0

package/dist/helpers/fetchRequest.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -25,7 +48,68 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const __1 = require("../");
 const getConfigs_1 = __importDefault(require("./getConfigs"));
-const { FETCH_OPTIONS } = getConfigs_1.default;
+const { FETCH_OPTIONS, ENVIRONMENT } = getConfigs_1.default;
+// --- www-authenticate interceptor yardımcıları -------------------------------
+// Backend, environment_token süresi dolduğunda yanıtta standart `www-authenticate`
+// başlığını döndürür. Aşağıdaki yardımcılar böyle bir yanıtta token'ı yenileyip isteği bir
+// kez tekrarlar. Eskiden tüketici projelerde Edge middleware'in (readEnvironment) yaptığı işi
+// merkezîleştirir → tüm projeler yalnız nextemos versiyonunu yükselterek faydalanır.
+// Interceptor logları nextemos LOG_LEVEL konvansiyonuna uyar (debug/info/trace).
+const logEnvRefresh = (...args) => {
+    if (["debug", "info", "trace"].includes(FETCH_OPTIONS.LOG_LEVEL))
+        console.log("🔄 [nextemos:env-refresh]", ...args);
+};
+// Aynı süresi dolmuş token için eşzamanlı yenilemeleri tek isteğe indirir (race önleme).
+const environmentRefreshInFlight = new Map();
+const refreshExpiredEnvironment = (environment, ctx) => {
+    const inFlight = environmentRefreshInFlight.get(environment);
+    if (inFlight) {
+        logEnvRefresh("zaten devam eden yenilemeye katıldı (single-flight)");
+        return inFlight;
+    }
+    const task = (() => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            logEnvRefresh("environment_token yenileniyor…");
+            // Dinamik import: services → fetchRequest dairesel bağımlılığını ve TDZ'yi önler.
+            const { EnvironmentService } = yield Promise.resolve().then(() => __importStar(require("../services/environment")));
+            const { data } = yield EnvironmentService.Refresh({
+                environment,
+                countryCode: ENVIRONMENT.COUNTRY_CODE,
+                platform: ENVIRONMENT.PLATFORM,
+            }, {
+                version: ctx.version,
+                __envRetried: true,
+                headers: ctx.authorization
+                    ? { Authorization: ctx.authorization }
+                    : undefined,
+            });
+            const refreshed = (data === null || data === void 0 ? void 0 : data.environment) || null;
+            logEnvRefresh(refreshed
+                ? "environment_token yenilendi ✅"
+                : "yenileme başarısız: yanıtta environment yok ⚠️");
+            return refreshed;
+        }
+        catch (error) {
+            logEnvRefresh("yenileme hatası ❌", error);
+            return null;
+        }
+        finally {
+            environmentRefreshInFlight.delete(environment);
+        }
+    }))();
+    environmentRefreshInFlight.set(environment, task);
+    return task;
+};
+// Yenilenen token'ı, tüketicideki mevcut cookieHandler'ın (data.refreshEnvironment) sıfır
+// değişiklikle yazabilmesi için yanıt gövdesine de enjekte eder.
+const injectRefreshEnvironment = (data, environment) => {
+    if (data && typeof data === "object" && !Array.isArray(data)) {
+        const obj = data;
+        if (!obj.refreshEnvironment)
+            obj.refreshEnvironment = environment;
+    }
+    return data;
+};
 /**
  * İstek yapmak için bir HTTP istemcisi oluşturur.
  * @returns {object} İstek yapmak için yöntemlere sahip HTTP istemcisi.
@@ -39,7 +123,7 @@ const fetchRequest = () => {
      */
     const request = (_a) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;
-        var { url, method, params } = _a, options = __rest(_a, ["url", "method", "params"]);
+        var { url, method, params, __envRetried } = _a, options = __rest(_a, ["url", "method", "params", "__envRetried"]);
         const apiURL = new URL(url);
         if (params) {
             Object.keys(params).forEach((key) => {
@@ -104,6 +188,27 @@ const fetchRequest = () => {
                 };
             }
             if (!response.ok) {
+                // www-authenticate interceptor: environment_token süresi dolmuş → yenile + bir kez retry
+                if (response.status === __1.HttpStatusCode.UNAUTHORIZED &&
+                    headers["www-authenticate"] === "Environment" &&
+                    !__envRetried) {
+                    logEnvRefresh("www-authenticate: Environment yakalandı →", apiURL.toString());
+                    const requestHeaders = options.headers;
+                    const currentEnvironment = requestHeaders === null || requestHeaders === void 0 ? void 0 : requestHeaders["Environment"];
+                    if (currentEnvironment) {
+                        const refreshedEnvironment = yield refreshExpiredEnvironment(currentEnvironment, {
+                            authorization: requestHeaders === null || requestHeaders === void 0 ? void 0 : requestHeaders["Authorization"],
+                            version: options.version,
+                        });
+                        if (refreshedEnvironment) {
+                            logEnvRefresh("istek yeni token ile tekrarlanıyor →", apiURL.toString());
+                            const retried = yield request(Object.assign(Object.assign({ url,
+                                method,
+                                params }, options), { __envRetried: true, headers: Object.assign(Object.assign({}, requestHeaders), { Environment: refreshedEnvironment }) }));
+                            return Object.assign(Object.assign({}, retried), { refreshedEnvironment, data: injectRefreshEnvironment(retried.data, refreshedEnvironment) });
+                        }
+                    }
+                }
                 const errorDetail = yield response.text();
                 if (["debug", "info", "trace"].includes(FETCH_OPTIONS.LOG_LEVEL) &&
                     response.status !== __1.HttpStatusCode.NOT_FOUND)

package/dist/helpers/getConfigs.d.ts

@@ -6,12 +6,9 @@ export declare const defaultConfig: {
         LOG_LEVEL: string;
         CACHE: string;
     };
-    KEYCLOAK: {
-        URL: string;
-        REALM: string;
-        CLIENT_ID: string;
-        CLIENT_SECRET: string;
-        GRANT_TYPE: string;
+    ENVIRONMENT: {
+        COUNTRY_CODE: string;
+        PLATFORM: string;
     };
     K8S_NAMESPACE: string;
     K8S_SERVICE_NAMES: {

package/dist/helpers/getConfigs.js

@@ -29,7 +29,7 @@ function deepMerge(target, ...sources) {
  * Check if value is an object (but not null, array, or primitive)
  */
 function isObject(item) {
-    return item && typeof item === 'object' && !Array.isArray(item);
+    return item && typeof item === "object" && !Array.isArray(item);
 }
 exports.defaultConfig = {
     API_URL: "",
@@ -39,12 +39,11 @@ exports.defaultConfig = {
         LOG_LEVEL: "info",
         CACHE: "",
     },
-    KEYCLOAK: {
-        URL: "https://identity.proj-e.com",
-        REALM: "test",
-        CLIENT_ID: "test_client",
-        CLIENT_SECRET: "",
-        GRANT_TYPE: "client_credentials",
+    // www-authenticate interceptor environment_token'ı yenilerken kullanılan varsayılanlar.
+    // Proje bazında nextemos-config.json ile override edilebilir.
+    ENVIRONMENT: {
+        COUNTRY_CODE: "TR",
+        PLATFORM: "desktop",
     },
     K8S_NAMESPACE: "emosv2service",
     K8S_SERVICE_NAMES: {
@@ -80,7 +79,4 @@ catch (error) {
 }
 // Merge with default config to ensure all required fields exist
 const NEXTEMOS_CONFIG = deepMerge({}, exports.defaultConfig, loadedConfig);
-if (process.env.KEYCLOAK_CLIENT_SECRET) {
-    NEXTEMOS_CONFIG.KEYCLOAK.CLIENT_SECRET = process.env.KEYCLOAK_CLIENT_SECRET;
-}
 exports.default = NEXTEMOS_CONFIG;

package/dist/interfaces/response.d.ts

@@ -4,10 +4,14 @@ export interface IRequestOptions extends RequestInit {
     url: string;
     method: HTTPMethod;
     params?: Record<string, any>;
+    /** internal: www-authenticate retry loop guard */
+    __envRetried?: boolean;
 }
 export interface IRequestInit extends RequestInit {
     useClient?: boolean;
     version?: string;
+    /** internal: www-authenticate retry loop guard */
+    __envRetried?: boolean;
 }
 export interface IApiResponse<T = any> {
     data?: T;
@@ -17,6 +21,8 @@ export interface IApiResponse<T = any> {
     headers?: {
         [key: string]: string;
     };
+    /** www-authenticate sonrası interceptor tarafından yenilenen environment_token */
+    refreshedEnvironment?: string;
 }
 export interface IRequestBase {
     language?: string;

package/dist/services/keycloak/index.js

@@ -8,14 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeycloakService = void 0;
 const __1 = require("../..");
-const getConfigs_1 = __importDefault(require("../../helpers/getConfigs"));
-const { KEYCLOAK } = getConfigs_1.default;
 const createUrlEncodedBody = (plainBodyObject) => {
     const encodedBody = Object.entries(plainBodyObject)
         .map(([key, value]) => {
@@ -26,24 +21,24 @@ const createUrlEncodedBody = (plainBodyObject) => {
 };
 // Environment servisi
 exports.KeycloakService = {
-    ServiceUrl: KEYCLOAK.URL,
-    Token: function (options) {
-        return __awaiter(this, void 0, void 0, function* () {
+    ServiceUrl: "",
+    Token: function (_a, options_1) {
+        return __awaiter(this, arguments, void 0, function* ({ realm, client_id, client_secret, grant_type }, options) {
             // request
             const encodedBody = createUrlEncodedBody({
-                realm: KEYCLOAK.REALM,
-                client_id: KEYCLOAK.CLIENT_ID,
-                client_secret: KEYCLOAK.CLIENT_SECRET,
-                grant_type: KEYCLOAK.GRANT_TYPE,
+                realm,
+                client_id,
+                client_secret,
+                grant_type,
             });
-            return yield (0, __1.fetchRequest)().post(`${this.ServiceUrl}/realms/${KEYCLOAK.REALM}/protocol/openid-connect/token`, Object.assign(Object.assign({}, options), { headers: {
+            return yield (0, __1.fetchRequest)().post(`${this.ServiceUrl}/realms/${realm}/protocol/openid-connect/token`, Object.assign(Object.assign({}, options), { headers: {
                     "Content-Type": "application/x-www-form-urlencoded",
                 }, body: encodedBody }));
         });
     },
-    GetConfigurations: function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, __1.fetchRequest)().get(`${this.ServiceUrl}/realms/${KEYCLOAK.REALM}`, {
+    GetConfigurations: function (_a) {
+        return __awaiter(this, arguments, void 0, function* ({ realm }) {
+            return yield (0, __1.fetchRequest)().get(`${this.ServiceUrl}/realms/${realm}`, {
                 headers: {
                     "Content-Type": "application/json",
                 },

package/dist/services/keycloak/keycloak.types.d.ts

@@ -8,6 +8,8 @@ export interface IKeycloakTokenRequest {
 }
 export interface IKeycloakService {
     ServiceUrl: string;
-    Token: (options?: IRequestInit) => Promise<IApiResponse<IKeycloakTokenResponse>>;
-    GetConfigurations: () => Promise<IApiResponse<IKeycloakConfigurationsResponse>>;
+    Token: ({ realm, client_id, client_secret, grant_type }: IKeycloakTokenRequest, options?: IRequestInit) => Promise<IApiResponse<IKeycloakTokenResponse>>;
+    GetConfigurations: ({ realm, }: {
+        realm: string;
+    }) => Promise<IApiResponse<IKeycloakConfigurationsResponse>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nextemos",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": "For helpers and hooks used in NextJS projects",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",