From: Bill Erickson <erickson@esilibrary.com>
Date: Mon, 14 Feb 2011 17:36:25 +0000 (-0500)
Subject: added option to open-ils.auth.session.retrieve to return the full cached object,... 
X-Git-Tag: opac-tt-poc-demo2~27^2~5
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b74e977a41ad388463ba1baf44002dcf2f63f133;p=evergreen%2Fequinox.git

added option to open-ils.auth.session.retrieve to return the full cached object, which includes the auth time (cache timeout) of the cached user object
---

diff --git a/Open-ILS/src/c-apps/oils_auth.c b/Open-ILS/src/c-apps/oils_auth.c
index eb20fb7118..4e7b20b11e 100644
--- a/Open-ILS/src/c-apps/oils_auth.c
+++ b/Open-ILS/src/c-apps/oils_auth.c
@@ -807,8 +807,17 @@ int oilsAuthResetTimeout( osrfMethodContext* ctx ) {
 
 int oilsAuthSessionRetrieve( osrfMethodContext* ctx ) {
 	OSRF_METHOD_VERIFY_CONTEXT(ctx);
+    bool returnFull = false;
 
 	const char* authToken = jsonObjectGetString( jsonObjectGetIndex(ctx->params, 0));
+
+    if(ctx->params->size > 1) {
+        // caller wants full cached object, with authtime, etc.
+        const char* rt = jsonObjectGetString(jsonObjectGetIndex(ctx->params, 1));
+        if(rt && strcmp(rt, "0") != 0) 
+            returnFull = true;
+    }
+
 	jsonObject* cacheObj = NULL;
 	oilsEvent* evt = NULL;
 
@@ -828,7 +837,10 @@ int oilsAuthSessionRetrieve( osrfMethodContext* ctx ) {
 			cacheObj = osrfCacheGetObject( key );
 			if(cacheObj) {
 				// Return a copy of the cached user object
-				osrfAppRespondComplete( ctx, jsonObjectGetKeyConst( cacheObj, "userobj"));
+                if(returnFull)
+				    osrfAppRespondComplete( ctx, cacheObj);
+                else
+				    osrfAppRespondComplete( ctx, jsonObjectGetKeyConst( cacheObj, "userobj"));
 				jsonObjectFree(cacheObj);
 			} else {
 				// Auth token is invalid or expired