diff --git a/v1/Application.cfc b/v1/Application.cfc index 1324e5e..fc4947b 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -19,6 +19,7 @@ + @@ -51,7 +52,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="svc-api"; - variables.framework.docs.APIVersion="0.178"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.179"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; @@ -284,6 +285,8 @@ var usrCustomerInfo=getUsrCustomerInfo(idpUserData.userInfo.contactId, idpUserData.userInfo.companyId); + //dump(idpUserData);dump(usrCustomerInfo);abort; + if (lCase(arguments.cfc) EQ 'user') { if (structIsEmpty(usrCustomerInfo)) return representationOf("User information not found").withStatus(404); } @@ -294,6 +297,9 @@ arguments.requestArguments.contragentId=-1; //Integer arguments.requestArguments.contractId=-1; //Integer arguments.requestArguments.specificationId=-1; //Integer + arguments.requestArguments.isImpersonated=false; + arguments.requestArguments.clientID=""; + arguments.requestArguments.login=""; return true; } @@ -305,6 +311,15 @@ arguments.requestArguments.contragentId=usrCustomerInfo.contragentId; //Integer arguments.requestArguments.contractId=usrCustomerInfo.contractId; //Integer arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //Integer + try { + arguments.requestArguments.isImpersonated=usrCustomerInfo.impersonation.is_impersonated; + arguments.requestArguments.clientID=usrCustomerInfo.clientID; + arguments.requestArguments.login=usrCustomerInfo.login; + } catch (e) { + arguments.requestArguments.isImpersonated=false; // так себе решение, надо было бы NULL + arguments.requestArguments.clientID=""; + arguments.requestArguments.login=""; + } return true; diff --git a/v1/resources/vault_record.cfc b/v1/resources/vault_record.cfc index acaed6c..ef08bbf 100644 --- a/v1/resources/vault_record.cfc +++ b/v1/resources/vault_record.cfc @@ -56,9 +56,9 @@ - + - + @@ -120,6 +120,16 @@ + + @@ -127,6 +137,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file