From 5580b68038bdbc7fb0bfe9d1e243befd2b213556 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 26 Oct 2024 11:06:02 +0300
Subject: [PATCH] debug 2

---
 v1/Application.cfc | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 39d5179..d43ab01 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -71,8 +71,8 @@
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
-		variables.framework.globalHeaders["Access-Control-Allow-Credentials"] = "true"; 
-		variables.framework.globalHeaders["X-Application-Version"] = "0.00.001"; 
+		variables.framework.globalHeaders["Access-Control-Allow-Credentials"] = "true";
+		variables.framework.globalHeaders["X-Application-Version"] = "0.00.001"; 		
 		//variables.framework.globalHeaders["Access-Control-Allow-Origin"] = "*"; //*** не знаю, нужно ли - но просили этот заголовок
 		//variables.framework.globalHeaders["X-MY-HEADER"] = "my header value for example";
 		
@@ -84,9 +84,21 @@
 		request.ANONYMOUS_USR_ID=2;
 		request.GUEST_USR_ID=3;
 		////////////////////////////////////////////////////////
-		request.ORCHESTRATOR_AUTH="Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"; //*** времянка, дубль из корневого Application.cfm
+
+		request.ORCHESTRATOR_AUTH = createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH");
+		if (isNull(request.ORCHESTRATOR_AUTH)) {
+			request.ORCHESTRATOR_AUTH = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3";//*** времянка, дубль из корневого Application.cfm
+		} 
+		//почему-то scope this ведет себя совершенно не так, как request и variables
+		// в нем переменная имеет значение Empty:null и можно выполнить writedump, а в других получаем ошибку, что такой переменной нет
+
 	</cfscript>
 	
+<!--- 	<cfset this.orchestrator_authorization_string=createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH")/>
+ 	<cfif isEmpty(this.orchestrator_authorization_string)>
+		<cfset this.orchestrator_authorization_string = "Basic c3ZjX2xrdGVzdDoxMTgzZDIyNzc1OWExYjFkZmVjM2M3NTFiMzIyNzdiYTQ3"/><!--- *** remove --->
+	</cfif>  --->
+	
 
 	<cffunction name="onApplicationStart">		
 <!---		<cfset application.dbUser = "username" />
@@ -137,7 +149,7 @@
 
 		//if (UCase(arguments.verb) EQ 'OPTIONS') return newRepresentation().noData().withStatus("204","No Data").withHeaders({"Content-Type":"application/json;charset=utf-8"});
 		if (UCase(arguments.verb) EQ 'OPTIONS') return true;
-	return true;
+	
 		var auth="";
 		if (structKeyExists(headers,"Authorization")) {
 			auth=headers.Authorization;