smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

154 bug fix

Browse Source
This commit is contained in:
smishchuk
2025-10-27 13:10:00 +03:00
parent 3f61e8919b
commit fd3cee87d2
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/Application.cfc
+1 -1
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={}; //variables.framework.docs={};
variables.framework.docs.APIName="svc-api"; variables.framework.docs.APIName="svc-api";
variables.framework.docs.APIVersion="0.153"; /*$ git config --global --unset user.password*/ variables.framework.docs.APIVersion="0.154"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
v1/resources/instance.cfc
+16 -15
View File
@@ -281,6 +281,7 @@
AND o.operation='create' AND o.operation='create'
</cfquery> </cfquery>
<cfset local.instanceData = {}/>
<cftry> <cftry>
<cfset local.instanceData=deserializeJson(local.qCurrentState.instance_data)/> <cfset local.instanceData=deserializeJson(local.qCurrentState.instance_data)/>
<cfloop query="local.qCfsParam"> <cfloop query="local.qCfsParam">
@@ -302,17 +303,17 @@
<cfset var out=structNew("linked")/> <cfset var out=structNew("linked")/>
<cfset "local.vaultData"=structNew("linked")/> <cfset "local.vaultData"=structNew("linked")/>
<cfif structKeyExists(instanceData,"vault") AND structKeyExists(instanceData.vault,"fields")> <cfif structKeyExists(local.instanceData,"vault") AND structKeyExists(local.instanceData.vault,"fields")>
<cfset "local.vaultFields" = #instanceData.vault.fields#/> <cfset "local.vaultFields" = #instanceData.vault.fields#/>
</cfif> </cfif>
<cftry><!--- *** надо бы такие вещи делать асинхронно ---> <cftry><!--- *** надо бы такие вещи делать асинхронно --->
<cfset vaultUrl=""/> <cfset vaultUrl=""/>
<cfset instanceData="#deserializeJson(local.qCurrentState.instance_data)#"/> <cfset local.instanceData="#deserializeJson(local.qCurrentState.instance_data)#"/>
<cfif structKeyExists(instanceData,"vaultUrl")> <cfif structKeyExists(local.instanceData,"vaultUrl")>
<cfset vaultUrl=instanceData.vaultUrl/> <!--- v001 ---> <cfset vaultUrl=local.instanceData.vaultUrl/> <!--- v001 --->
<cfelseif structKeyExists(instanceData,"vault")> <cfelseif structKeyExists(local.instanceData,"vault")>
<cfset vaultUrl=instanceData.vault.Url/><!--- v002 ---> <cfset vaultUrl=local.instanceData.vault.Url/><!--- v002 --->
</cfif> </cfif>
<cfhttp method="post" <cfhttp method="post"
@@ -342,13 +343,13 @@
<!--- *** костыль для перехода от формата v001 к v002 ---> <!--- *** костыль для перехода от формата v001 к v002 --->
<cfif structKeyExists(instanceData,"vault") AND structKeyExists(instanceData.vault,"fields")> <cfif structKeyExists(local.instanceData,"vault") AND structKeyExists(local.instanceData.vault,"fields")>
<cfset "local.tempVaultData" = #deserializeJson(cred.filecontent).data.data#/> <cfset "local.tempVaultData" = #deserializeJson(cred.filecontent).data.data#/>
<cfset "local.vaultData" = #structNew("linked")#/> <cfset "local.vaultData" = #structNew("linked")#/>
<!--- <cfset "out.vaultData" = #local.tempVaultData#/> ---> <!--- <cfset "out.vaultData" = #local.tempVaultData#/> --->
<cfloop collection=#instanceData.vault.fields# index="i"> <cfloop collection=#local.instanceData.vault.fields# index="i">
<cfset var fld=instanceData.vault.fields[i]/> <cfset var fld=local.instanceData.vault.fields[i]/>
<cfset local.vaultData[fld] = local.tempVaultData[fld]/> <cfset local.vaultData[fld] = local.tempVaultData[fld]/>
</cfloop> </cfloop>
<cfelse> <cfelse>
@@ -361,9 +362,9 @@
</cftry> </cftry>
<cftry> <cftry>
<cfif structKeyExists(instanceData,"subusers")> <cfif structKeyExists(local.instanceData,"subusers")>
<cfloop collection=#instanceData.subusers# item="i"> <cfloop collection=#local.instanceData.subusers# item="i">
<cfset vaultUrl=#instanceData.subusers[i].vaultUrl#/> <cfset vaultUrl=#local.instanceData.subusers[i].vaultUrl#/>
<cfhttp method="get" <cfhttp method="get"
url="#vaultUrl#" url="#vaultUrl#"
timeout="3" timeout="3"
@@ -374,10 +375,10 @@
<cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/> <cfhttpparam type="HEADER" name="User-Agent" value="#request.USER_AGENT#"/>
</cfhttp> </cfhttp>
<!--- <cfdump var=#deserializeJson(cred.filecontent)#/> ---> <!--- <cfdump var=#deserializeJson(cred.filecontent)#/> --->
<cfset "local.vaultData.subusers[i].userName"=#instanceData.subusers[i].userName#/> <cfset "local.vaultData.subusers[i].userName"=#local.instanceData.subusers[i].userName#/>
<cfset "local.vaultData.subusers[i].subUserAccess"=#instanceData.subusers[i].subUserAccess#/> <cfset "local.vaultData.subusers[i].subUserAccess"=#local.instanceData.subusers[i].subUserAccess#/>
<cfset "local.vaultData.subusers[i].vaultData"=#deserializeJson(cred.filecontent).data.data#/> <cfset "local.vaultData.subusers[i].vaultData"=#deserializeJson(cred.filecontent).data.data#/>
<!--- #instanceData.subusers[i].userName# (#instanceData.subusers[i].subUserAccess#) <!--- #local.instanceData.subusers[i].userName# (#local.instanceData.subusers[i].subUserAccess#)
<cfdump var=#deserializeJson(cred.filecontent).data.data#/> ---> <cfdump var=#deserializeJson(cred.filecontent).data.data#/> --->
</cfloop> </cfloop>
</cfif> </cfif>