health.cfm

e.cfm

@@ -1 +0,0 @@
-<cfquery>select *</cfquery>

v1/Application.cfc

@@ -71,7 +71,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.010";
+		variables.framework.docs.APIVersion="0.011";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
@@ -164,7 +164,8 @@
 		//}
 
 		//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;
+		if (uCase(arguments.verb) EQ 'OPTIONS') return true;
+		if (lCase(arguments.cfc) EQ 'err') return true;
 	
 		var auth="";
 		if (structKeyExists(headers,"Authorization")) {
@@ -178,13 +179,18 @@
 		httpService.addParam(type = "HEADER", name = "Authorization",  value = "#auth#"); //passthrough	
 		var resp = httpService.send();
 		var result = resp.getPrefix().filecontent;
-		//writeDump(result); abort;		
+		//writeDump(result); abort;	
-		var idpUserData=deserializeJson(result);		
+		try {	
-		arguments.requestArguments.companyUid=idpUserData.companyId;
+			var idpUserData=deserializeJson(result);	
-		arguments.requestArguments.usrUid=idpUserData.contactId;//userId;	//GUID!
+		
+			arguments.requestArguments.companyUid=idpUserData.companyId;
+			arguments.requestArguments.usrUid=idpUserData.contactId;//userId;	//GUID!
+		} catch (e) {
+			return representationOf( {"exception"=e, "idpResponse"=result} );
+		}
 
 		var usrCustomerInfo=getUsrCustomerInfo(idpUserData.contactId);
-		if (structIsEmpty(usrCustomerInfo)) return representationOf("Cannot find default specification for current user #result#").withStatus(422);
+		if (structIsEmpty(usrCustomerInfo)) return representationOf("Cannot find default specification for current user #result#").withStatus(422); //это создает довольно много лишних движений при отладке
 		arguments.requestArguments.usrId=usrCustomerInfo.usrId; //Integer!
 		arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //Integer
 	

v1/resources/notification_ls.cfc

@@ -55,7 +55,7 @@
 					<m:field>n.descr</m:field>
 					<m:field>n.contragent_id</m:field>
 					<m:field>k.external_uid</m:field>
-					<m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field>
+					<!--- <m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field> --->
 					<m:field>to_char(n.dt_show_from, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_from</m:field>
 					<m:field>to_char(n.dt_show_to, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_to</m:field>
 	<!--- 				<m:field>to_char(n.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>

v1/resources/user.cfc

@@ -50,6 +50,7 @@
 					<m:field cfSqlType="CF_SQL_INTEGER">u.usr_id</m:field>
 					<m:field>u.login</m:field>
 					<m:field>k.contragent_id</m:field>
+					<m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field>
 					<m:field>k.external_uid::text as external_uid</m:field>
 					<m:field>k.contragent</m:field>
 				</m:field_set>