129 user-agent
This commit is contained in:
+6
-4
@@ -51,7 +51,7 @@
|
||||
|
||||
//variables.framework.docs={};
|
||||
variables.framework.docs.APIName="Deck API";
|
||||
variables.framework.docs.APIVersion="0.128"; /*$ git config --global --unset user.password*/
|
||||
variables.framework.docs.APIVersion="0.129"; /*$ git config --global --unset user.password*/
|
||||
|
||||
|
||||
variables.framework.globalHeaders = structNew();
|
||||
@@ -62,7 +62,8 @@
|
||||
|
||||
request.UNDEFINED_USR_ID=-1;
|
||||
request.ANONYMOUS_USR_ID=2;
|
||||
request.GUEST_USR_ID=3
|
||||
request.GUEST_USR_ID=3;
|
||||
request.USER_AGENT="#variables.framework.docs.APIName# #variables.framework.docs.APIVersion# stand:#this.getStand()#";
|
||||
|
||||
////////////////////////////////////////////////////////
|
||||
request.ORCHESTRATOR_AUTH = createObject("java", "java.lang.System").getEnv("ORCHESTRATOR_AUTH");
|
||||
@@ -108,7 +109,7 @@
|
||||
<cfset request.castToBoolSimple=#castToBoolSimple#/>
|
||||
|
||||
<!--- почему-то эта функция недоступна onApplicationStart --->
|
||||
<!--- <cffunction
|
||||
<cffunction
|
||||
name="getStand"
|
||||
access="private"
|
||||
returntype="string"
|
||||
@@ -126,7 +127,7 @@
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
<cfreturn ""/>
|
||||
</cffunction> --->
|
||||
</cffunction>
|
||||
|
||||
|
||||
<cffunction name="onApplicationStart">
|
||||
@@ -142,6 +143,7 @@
|
||||
<cffunction name="locateIamService"><!--- *** архитектурный колхоз --->
|
||||
<!--- почему-то мы не видим других функций, когда нас вызывают onApplicationStart. С другой стороны, а почему вообще должны вызывать без перезагрузки приложения --->
|
||||
<cfset var stand=""/>
|
||||
<!--- дублируем код, потому что getStand отсюда почему-то не виден --->
|
||||
<cftry>
|
||||
<cfquery name=qConfig>
|
||||
select value as stand from config
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
>
|
||||
<cfhttpparam type="HEADER" name="Authorization" value="#auth#"/>
|
||||
<cfhttpparam type="HEADER" name="Accept" value="application/json"/>
|
||||
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
|
||||
<!--- <cfhttpparam type="formfield" name="delay" value="0sec"/>
|
||||
<cfloop query="qInstanceOperationParam">
|
||||
<cfhttpparam type="formfield" name="#param#" value="#param_value#"/>
|
||||
|
||||
@@ -261,6 +261,7 @@
|
||||
charset="utf-8"
|
||||
result="res"
|
||||
>
|
||||
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
|
||||
<cfhttpparam type="BODY" value='{"role_id":"df05e620-f3a3-8c6a-361d-a96e3b0adeac","secret_id":"585fbb48-ef97-b845-d414-b8831a27d5b6"}'/>
|
||||
</cfhttp>
|
||||
<cfset resData=#deserializeJson(res.filecontent)#/>
|
||||
@@ -275,6 +276,7 @@
|
||||
result="cred"
|
||||
>
|
||||
<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
|
||||
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
|
||||
</cfhttp>
|
||||
|
||||
<!--- *** костыль для перехода от формата v001 к v002 --->
|
||||
@@ -306,6 +308,7 @@
|
||||
result="cred"
|
||||
>
|
||||
<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
|
||||
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
|
||||
</cfhttp>
|
||||
<!--- <cfdump var=#deserializeJson(cred.filecontent)#/> --->
|
||||
<cfset "local.vaultData.subusers[i].userName"=#instanceData.subusers[i].userName#/>
|
||||
|
||||
@@ -217,6 +217,7 @@
|
||||
>
|
||||
<cfhttpparam type="HEADER" name="Authorization" value="#request.ORCHESTRATOR_AUTH#"/>
|
||||
<cfhttpparam type="HEADER" name="Accept" value="application/json"/>
|
||||
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
|
||||
<cfhttpparam type="formfield" name="delay" value="0sec"/>
|
||||
<cfloop query="qInstanceOperationParam">
|
||||
<cfhttpparam type="formfield" name="#param#" value="#param_value#"/>
|
||||
|
||||
Reference in New Issue
Block a user