From: kenstir Date: Mon, 25 Nov 2013 04:55:49 +0000 (-0500) Subject: removed files that were renamed X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f576c4f1bf4ee030d728bdefd32634d0b11288bd;p=working%2FEvergreen.git removed files that were renamed --- diff --git a/Open-ILS/src/Android/src/org/evergreen_ils/auth/Authenticator.java b/Open-ILS/src/Android/src/org/evergreen_ils/auth/Authenticator.java deleted file mode 100644 index db0b242bed..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen_ils/auth/Authenticator.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.evergreen_ils.auth; - -import android.accounts.AbstractAccountAuthenticator; -import android.accounts.Account; -import android.accounts.AccountAuthenticatorResponse; -import android.accounts.AccountManager; -import android.accounts.NetworkErrorException; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; - -public class Authenticator extends AbstractAccountAuthenticator { - - private final String TAG = "eg.auth"; - private Context context; - - public Authenticator(Context context) { - super(context); - this.context = context; - } - - @Override - public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { - Log.d(TAG, "addaccount "+accountType+" "+authTokenType); - final Intent intent = new Intent(context, AuthenticatorActivity.class); - intent.putExtra(Const.AUTHTOKEN_TYPE, authTokenType); - intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); - - Bundle result = new Bundle(); - result.putParcelable(AccountManager.KEY_INTENT, intent); - return result; - } - - @Override - public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { - Log.d(TAG, "getAuthToken "+account.name); - - // If the caller requested an authToken type we don't support, then - // return an error - if (!authTokenType.equals(Const.AUTHTOKEN_TYPE)) { - final Bundle result = new Bundle(); - result.putString(AccountManager.KEY_ERROR_MESSAGE, "invalid authTokenType"); - return result; - } - - final AccountManager am = AccountManager.get(context); - String authToken = am.peekAuthToken(account, authTokenType); - Log.d(TAG, "peekAuthToken returned " + authToken); - if (TextUtils.isEmpty(authToken)) { - final String password = am.getPassword(account); - if (password != null) { - try { - Log.d(TAG, "attempting to sign in with existing password"); - authToken = EvergreenAuthenticate.signIn(context, account.name, password); - } catch (Exception e) { - Log.d(TAG, "caught exception "+e.getMessage()); - final Bundle result = new Bundle(); - result.putString(AccountManager.KEY_ERROR_MESSAGE, e.getMessage()); - return result; - } - } - } - - // If we get an authToken - we return it - if (!TextUtils.isEmpty(authToken)) { - final Bundle result = new Bundle(); - result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name); - result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type); - result.putString(AccountManager.KEY_AUTHTOKEN, authToken); - return result; - } - - // If we get here, then we couldn't access the user's password - so we - // need to re-prompt them for their credentials. We do that by creating - // an intent to display our AuthenticatorActivity. - final Intent intent = new Intent(context, AuthenticatorActivity.class); - intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); - intent.putExtra(AuthenticatorActivity.ARG_ACCOUNT_TYPE, account.type); - intent.putExtra(AuthenticatorActivity.ARG_AUTH_TYPE, authTokenType); - intent.putExtra(AuthenticatorActivity.ARG_ACCOUNT_NAME, account.name); - final Bundle bundle = new Bundle(); - bundle.putParcelable(AccountManager.KEY_INTENT, intent); - return bundle; - } - - @Override - public String getAuthTokenLabel(String authTokenType) { - return Const.AUTHTOKEN_TYPE_LABEL; - } - - @Override - public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException { - final Bundle result = new Bundle(); - result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false); - return result; - } - - @Override - public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) { - return null; - } - - @Override - public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) throws NetworkErrorException { - return null; - } - - @Override - public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { - return null; - } -} diff --git a/Open-ILS/src/Android/src/org/evergreen_ils/auth/EvergreenAuthenticate.java b/Open-ILS/src/Android/src/org/evergreen_ils/auth/EvergreenAuthenticate.java deleted file mode 100644 index 4b00b08069..0000000000 --- a/Open-ILS/src/Android/src/org/evergreen_ils/auth/EvergreenAuthenticate.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.evergreen_ils.auth; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; - -import org.evergreen.android.R; -import org.opensrf.Method; -import org.opensrf.net.http.GatewayRequest; -import org.opensrf.net.http.HttpConnection; -import org.opensrf.net.http.HttpRequest; - -import android.content.Context; -import android.text.TextUtils; -import android.util.Log; - -public class EvergreenAuthenticate { - private final static String TAG = "eg.auth"; - public final static String SERVICE_AUTH = "open-ils.auth"; - public final static String METHOD_AUTH_INIT = "open-ils.auth.authenticate.init"; - public final static String METHOD_AUTH_COMPLETE = "open-ils.auth.authenticate.complete"; - - private static String md5(String s) { - try { - 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 ""; - } - - public static Object doRequest(HttpConnection conn, String service, String methodName, Object[] params) throws Exception { - Method method = new Method(methodName); - - Log.d(TAG, "doRequest Method :" + methodName + ":"); - for (int i = 0; i < params.length; i++) { - method.addParam(params[i]); - Log.d(TAG, "Param " + i + ": " + params[i]); - } - - // sync request - HttpRequest req = new GatewayRequest(conn, service, method).send(); - Object resp; - - while ((resp = req.recv()) != null) { - Log.d(TAG, "Sync Response: " + resp); - Object response = (Object) resp; - return response; - } - return null; - } - - @SuppressWarnings("unchecked") - public static String signIn(Context context, String username, String password) throws Exception { - Log.d(TAG, "signIn "+username); - - HttpConnection conn = new HttpConnection(context.getString(R.string.ou_gateway_url)); - - // step 1: get seed - Object resp = doRequest(conn, SERVICE_AUTH, METHOD_AUTH_INIT, new Object[] { username }); - if (resp == null) - throw new Exception("Unable to contact login service"); - String seed = resp.toString(); - - // step 2: complete auth with seed + password - HashMap complexParam = new HashMap(); - complexParam.put("type", "opac"); - complexParam.put("username", username); - complexParam.put("password", md5(seed + md5(password))); - resp = doRequest(conn, SERVICE_AUTH, METHOD_AUTH_COMPLETE, new Object[] { complexParam }); - if (resp == null) - throw new Exception("Unable to complete login"); - - // parse response - String textcode = ((Map) resp).get("textcode"); - System.out.println("textcode: " + textcode); - if (textcode.equals("SUCCESS")) { - Object payload = ((Map) resp).get("payload"); - System.out.println("payload: " + payload); - String authtoken = ((Map) payload).get("authtoken"); - System.out.println("authtoken: " + authtoken); - Integer authtime = ((Map) payload).get("authtime"); - System.out.println("authtime: " + authtime); - return authtoken; - } else if (textcode.equals("LOGIN_FAILED")) { - String desc = ((Map) resp).get("desc"); - System.out.println("desc: "+desc); - if (!TextUtils.isEmpty(desc)) { - throw new Exception(desc); - } - } - - throw new Exception("Login failed"); - } -}