diff --git a/v1/Application.cfc b/v1/Application.cfc index 6a93a04..a98f3b6 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -51,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="svc-api"; - variables.framework.docs.APIVersion="0.149"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.150"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; @@ -255,7 +255,8 @@ if (prefix.status_code NEQ 200) { //writedump(this.iamServiceUrl); //writedump(resp); - return representationOf( {"iamServiceUrl"=this.iamServiceUrl, "idpResponse"=resp} ).withStatus(500); + var iamStatusCode = (isValid("integer", prefix.status_code)) ? val(prefix.status_code) : 500; + return representationOf( {"iamServiceUrl"=this.iamServiceUrl, "idpResponse"=resp} ).withStatus(iamStatusCode); //abort; //throw("IDP response not OK"); } @@ -279,7 +280,7 @@ return representationOf( {"exception"=e, "idpResponse"=result} ); } - var usrCustomerInfo=getUsrCustomerInfo(idpUserData.userInfo.contactId); + var usrCustomerInfo=getUsrCustomerInfo(idpUserData.userInfo.contactId, idpUserData.userInfo.companyId); if (lCase(arguments.cfc) EQ 'user') { if (structIsEmpty(usrCustomerInfo)) return representationOf("User information not found").withStatus(404); @@ -392,6 +393,7 @@ + @@ -399,30 +401,41 @@ - + + + select z.contragent_id, c.contragent_id, c.contract_id, s.specification_id + from contragent z + join contract c on (z.contragent_id=c.contragent_id) + join specification s on (c.contract_id=s.contract_id) + where z.external_uid= + order by s.specification_id desc + limit 1; + + + + select u.usr_id, c.contragent_id, c.contract_id, s.specification_id from usr u join contract c on (u.contragent_id=c.contragent_id) join specification s on (c.contract_id=s.contract_id) - where idp_usr_uid= - order by specification_id desc + where u.idp_usr_uid= + order by s.specification_id desc limit 1; - + + - - - - - + + - +