From c1f66fc4580438b8432309e208843ff089c3cf8f Mon Sep 17 00:00:00 2001
From: drizea <danielrizea27@gmail.com>
Date: Wed, 6 Jun 2012 00:06:37 +0300
Subject: [PATCH] OPAC my account summary retrieve function added

---
 .../android/accountAccess/AccountAccess.class      | Bin 0 -> 5419 bytes
 .../android/searchCatalog/SearchCatalog.class      | Bin 10666 -> 10661 bytes
 .../android/accountAccess/AccountAccess.java       | 221 +++++++++++++++++++++
 3 files changed, 221 insertions(+)
 create mode 100644 Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class
 create mode 100644 Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/accountAccess/AccountAccess.class
new file mode 100644
index 0000000000000000000000000000000000000000..66bf99fa5567672278a4f51a2d53403e267c4868
GIT binary patch
literal 5419
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
Qi1%$eB!s-h^2Dt700&}v)Bpeg

literal 0
HcmV?d00001

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalog.class
index 2f1626077c140c604c468b295d04f0daf685ac4c..f171162b37c5c684e72c4355842a1500f9952725 100644
GIT binary patch
delta 294
zcmX|*yDvj=7>3`6UP+KNCOtT9j!PQJ2@;ERH;B+kIvOews~B7oNkwD-Ew&DvqHaw}
zN2~BhSV%;O!Gy`Lm6*Qw9p2~ps<|LndvfE?3aeA%$Gp4uluRR)HQ%W@*6TCrC_7yw
zap)(_09kuy=_QZH5<{#o%qkg*`0O)InF%UP@@D%NQ_4s>P<Ioq4Q<+H6Nicj#rWh%
zJ!(^e7Xm73SCU7LIZ;Rj^=V7n3NPrEX-=uyFCVna8Rv?ysNgT@&MKEJCaPBz80Er(
v9r;{xr8t8cqoxmau&1?FicvPMmvF3{Yb$T<x%uBWntL<v`Q+<GZzS{!5-&il

delta 315
zcmX|*%`1Ze9LK*Od*?tc2U)a74`Zo?;-tiJQFc?i*}*}Slecyxa(XWA_IR1MF?Mtn
z|He+MB?sjsex{s$-*3PAd_R7!oU7E6v4%qGkofkR$rld2nll~h3D=nSKAZ*Ct8)Vp
zig6M+^pT>US-XpLlgFjNAgc_qMw&e`95F_TaW0wQ-TD`kN=rIc=kJ6zwPno`CkhKi
z`J|*SwJA;$pHl^tpw1cR3Tj!s+SZOjMLjXY1!Z%6)xP1c6lO{OU(z#E6butlLn{n(
zZD2<kZn#wpSEE$)rgjdr(MnMp&2q=ReXHg(Vq+~89!#Z0<ME$XQ^0Uu*3FQw?z*Yq
E53mPBLI3~&

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
new file mode 100644
index 0000000000..ba0ca39e9f
--- /dev/null
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
@@ -0,0 +1,221 @@
+
+package org.evergreen.android.accountAccess;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.opensrf.Method;
+import org.opensrf.net.http.GatewayRequest;
+import org.opensrf.net.http.HttpConnection;
+import org.opensrf.net.http.HttpRequest;
+
+/**
+ * The Class AuthenticateUser.
+ */
+public class AccountAccess {
+
+	/** The SERVICE. */
+	public static String SERVICE = "open-ils.auth";
+
+	/** The METHOD Auth init  */
+	public static String METHOD_AUTH_INIT = "open-ils.auth.authenticate.init";
+
+	/** The METHOD Auth complete */
+	public static String METHOD_AUTH_COMPLETE = "open-ils.auth.authenticate.complete";
+	
+	/** The METHOD Auth session retrieve */
+	public static String METHOD_AUTH_SESSION_RETRV = "open-ils.auth.session.retrieve";
+
+	/** The conn. */
+	public HttpConnection conn;
+
+	/** The http address. */
+	public String httpAddress = "http://ulysses.calvin.edu";
+
+	/** The TAG. */
+	public String TAG = "AuthenticareUser";
+	
+	/** The auth token. 
+	 *  Sent with every request that needs authentication
+	 * */
+	private String authToken = null;
+	
+	private Integer authTime = null;
+	
+	//for demo purpose
+	/** The user name. */
+	private String userName = "staff";
+
+	/** The password. */
+	private String password = "demo123";
+	
+	/**
+	 * Instantiates a new authenticate user.
+	 *
+	 * @param httpAddress the http address
+	 */
+	public AccountAccess(String httpAddress) {
+
+		this.httpAddress = httpAddress;
+
+		try {
+			// configure the connection
+			
+			System.out.println("Connection with " + httpAddress);
+			conn = new HttpConnection(httpAddress + "/osrf-gateway-v1");
+
+		} catch (Exception e) {
+			System.err.println("Exception in establishing connection "
+					+ e.getMessage());
+		}
+
+	}
+
+	/**
+	 * Md5.
+	 *
+	 * @param s the s
+	 * @return the string
+	 */
+	private String md5(String s) {
+	    try {
+	        // Create MD5 Hash
+	        MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+	        digest.update(s.getBytes());
+	        byte messageDigest[] = digest.digest();
+
+	        // Create Hex String
+	        StringBuffer hexString = new StringBuffer();
+	        for (int i=0; i<messageDigest.length; i++){
+		        String hex = Integer.toHexString(0xFF & messageDigest[i]);
+		        if (hex.length() == 1) {
+		            // could use a for loop, but we're only dealing with a single byte
+		            hexString.append('0');
+		        }
+		        hexString.append(hex);
+	        }
+	        return hexString.toString();
+	        
+	    } catch (NoSuchAlgorithmException e) {
+	        e.printStackTrace();
+	    }
+	    
+	    return "";
+	}
+	
+	/**
+	 * Authenticate.
+	 */
+	public void authenticate(){
+		
+		String seed = authenticateInit();
+		
+		authenticateComplete(seed);
+	}
+
+	/**
+	 * Gets the account summary.
+	 *
+	 * @return the account summary
+	 */
+	public void getAccountSummary(){
+		
+		Method method = new Method(METHOD_AUTH_SESSION_RETRV);
+
+		method.addParam(authToken);
+
+		//sync request
+		HttpRequest req = new GatewayRequest(conn, SERVICE, method).send();
+		Object resp;
+
+		while ((resp = req.recv()) != null) {
+			System.out.println("Sync Response: " + resp);
+			
+		}
+	}
+	/**
+	 * Authenticate init.
+	 * @return seed for phase 2 of login
+	 */
+	private String authenticateInit() {
+
+		Method method = new Method(METHOD_AUTH_INIT);
+
+		method.addParam(userName);
+
+		// sync test
+		HttpRequest req = new GatewayRequest(conn, SERVICE, method).send();
+		Object resp;
+		
+		String seed = null;
+		
+		while ((resp = req.recv()) != null) {
+			System.out.println("Sync Response: " + resp);
+			seed = resp.toString();
+		}
+		
+		System.out.println("Seed " + seed);
+		
+		return seed;
+	}
+	
+	
+	/**
+	 * Authenticate complete.
+	 * Phase 2 of login process
+	 * Application send's username and hash to confirm login
+	 * @param seed the seed
+	 */
+	private void authenticateComplete(String seed) {
+		
+		//calculate hash to pass to server for authentication process phase 2
+		//seed = "b18a9063e0c6f49dfe7a854cc6ab5775";
+		String hash = md5(seed+md5(password));
+		System.out.println("Hash " + hash);
+		
+		Method method = new Method(METHOD_AUTH_COMPLETE);
+		
+		HashMap<String,String> complexParam = new HashMap<String, String>();
+		
+		
+		complexParam.put("username", userName);
+		complexParam.put("password", hash);
+
+		
+		method.addParam(complexParam);
+		System.out.println("Compelx param " + complexParam);
+		
+		// sync test
+		HttpRequest req = new GatewayRequest(conn, SERVICE, method).send();
+		Object resp;
+
+		
+		while ((resp = req.recv()) != null) {
+			System.out.println("Sync Response: " + resp);
+			
+			String queryResult = ((Map<String,String>) resp).get("textcode");
+			 
+			System.out.println("Result " + queryResult);
+			
+			if(queryResult.equals("SUCCESS")){
+				Object payload = ((Map<String,String>) resp).get("payload");
+				authToken = ((Map<String,String>)payload).get("authtoken");
+				try{
+					System.out.println(((Map<String,Integer>)payload).get("authtoken"));
+					authTime = ((Map<String,Integer>)payload).get("authtime");
+					
+				}catch(Exception e){
+					System.err.println("Error in parsing authtime " + e.getMessage());
+				}
+				System.out.println();
+			}
+		}
+		
+		
+	}
+
+	
+
+}
-- 
2.11.0