Big refactor, ProviderAPI looks better.

2 files changed, 68 insertions, 69 deletions

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
index c405d06f..7fc5150b 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ConfigurationWizard.java
@@ -571,7 +571,7 @@ implements ProviderListFragment.Callbacks, NewProviderDialogInterface, ProviderD
 	@Override

 	public void login() {

 		Intent ask_login = new Intent();

-		ask_login.putExtra(LogInDialog.VERB, LogInDialog.VERB);

+		ask_login.putExtra(LogInDialog.TAG, LogInDialog.TAG);
 		setResult(RESULT_OK, ask_login);

 		setting_up_provider = false;

 		finish();

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index f51099a3..93014dc9 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -93,8 +93,6 @@ public class ProviderAPI extends IntentService {
     PARAMETERS = "parameters",
     RESULT_KEY = "result",
     RECEIVER_KEY = "receiver",
-    SESSION_ID_COOKIE_KEY = "session_id_cookie_key",
-    SESSION_ID_KEY = "session_id",
     ERRORS = "errors",
     UPDATE_PROGRESSBAR = "update_progressbar",
     CURRENT_PROGRESS = "current_progress",
@@ -127,6 +125,7 @@ public class ProviderAPI extends IntentService {
     private static boolean last_danger_on = false;
     private static boolean setting_up_provider = true;
     private static SharedPreferences preferences;
+    private static String provider_api_url;
     
     public static void stop() {
     	setting_up_provider = false;
@@ -174,7 +173,7 @@ public class ProviderAPI extends IntentService {
 				}
 			}
 		} else if (action.equalsIgnoreCase(SRP_REGISTER)) {
-		    Bundle session_id_bundle = tryToRegisterWithSRP(parameters);
+		    Bundle session_id_bundle = tryToRegister(parameters);
 		    if(session_id_bundle.getBoolean(RESULT_KEY)) {
 			receiver.send(SRP_REGISTRATION_SUCCESSFUL, session_id_bundle);
 		    } else {
@@ -188,7 +187,7 @@ public class ProviderAPI extends IntentService {
 					receiver.send(SRP_AUTHENTICATION_FAILED, session_id_bundle);
 				}
 		} else if (action.equalsIgnoreCase(LOG_OUT)) {
-				if(logOut(parameters)) {
+				if(logOut()) {
 					receiver.send(LOGOUT_SUCCESSFUL, Bundle.EMPTY);
 				} else {
 					receiver.send(LOGOUT_FAILED, Bundle.EMPTY);
@@ -202,44 +201,45 @@ public class ProviderAPI extends IntentService {
 		}
 	}
 
-    private Bundle tryToRegisterWithSRP(Bundle task) {
+    private Bundle tryToRegister(Bundle task) {
 	Bundle session_id_bundle = new Bundle();
 	int progress = 0;
 		
-	String username = (String) task.get(LogInDialog.USERNAME);
-	String password = (String) task.get(LogInDialog.PASSWORD);
-	String authentication_server = (String) task.get(Provider.API_URL);
+	String username = (String) task.get(SessionDialogInterface.USERNAME);
+	String password = (String) task.get(SessionDialogInterface.PASSWORD);
+	
 	if(validUserLoginData(username, password)) {
-	    session_id_bundle = registerWithSRP(username, password, authentication_server);
+	    session_id_bundle = register(username, password);
 	    broadcast_progress(progress++);
 	} else {
 	    if(!wellFormedPassword(password)) {
 		session_id_bundle.putBoolean(RESULT_KEY, false);
-		session_id_bundle.putString(LogInDialog.USERNAME, username);
-		session_id_bundle.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+		session_id_bundle.putString(SessionDialogInterface.USERNAME, username);
+		session_id_bundle.putBoolean(SessionDialogInterface.PASSWORD_INVALID_LENGTH, true);
 	    }
 	    if(username.isEmpty()) {
 		session_id_bundle.putBoolean(RESULT_KEY, false);
-		session_id_bundle.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		session_id_bundle.putBoolean(SessionDialogInterface.USERNAME_MISSING, true);
 	    }
 	}
 		
 	return session_id_bundle;
     }
 
-    private Bundle registerWithSRP(String username, String password, String server) {	
+    private Bundle register(String username, String password) {	
 	LeapSRPSession client = new LeapSRPSession(username, password);
 	byte[] salt = client.calculateNewSalt();
 	
 	BigInteger password_verifier = client.calculateV(username, password, salt);
-	JSONObject api_result = sendNewUserDataToSRPServer(server, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
+	
+	JSONObject api_result = sendNewUserDataToSRPServer(provider_api_url, username, new BigInteger(1, salt).toString(16), password_verifier.toString(16));
 	
 	Bundle result = new Bundle();
 	if(api_result.has(ERRORS))
 	    result = authFailedNotification(api_result, username);
 	else {
-	    result.putString(LogInDialog.USERNAME, username);
-	    result.putString(LogInDialog.PASSWORD, password);
+	    result.putString(SessionDialogInterface.USERNAME, username);
+	    result.putString(SessionDialogInterface.PASSWORD, password);
 	    result.putBoolean(RESULT_KEY, true);
 	}
 
@@ -251,26 +251,24 @@ public class ProviderAPI extends IntentService {
 	 * @param task containing: username, password and api url. 
 	 * @return a bundle with a boolean value mapped to a key named RESULT_KEY, and which is true if authentication was successful. 
 	 */
-	private Bundle tryToAuthenticateBySRP(Bundle task) {
+	private Bundle tryToAuthenticate(Bundle task) {
 	    Bundle result = new Bundle();
 	    int progress = 0;
 		
-	    String username = (String) task.get(LogInDialog.USERNAME);
-	    String password = (String) task.get(LogInDialog.PASSWORD);
-	    if(validUserLoginData(username, password)) {
-		String server = (String) task.get(Provider.API_URL);
-
-		result = authenticate(username, password, server);
+	    String username = (String) task.get(SessionDialogInterface.USERNAME);
+	    String password = (String) task.get(SessionDialogInterface.PASSWORD);
+	    if(validUserLoginData(username, password)) {		
+		result = authenticate(username, password);
 		broadcast_progress(progress++);
 	    } else {
 		if(!wellFormedPassword(password)) {
 		    result.putBoolean(RESULT_KEY, false);
-		    result.putString(LogInDialog.USERNAME, username);
-		    result.putBoolean(LogInDialog.PASSWORD_INVALID_LENGTH, true);
+		    result.putString(SessionDialogInterface.USERNAME, username);
+		    result.putBoolean(SessionDialogInterface.PASSWORD_INVALID_LENGTH, true);
 		}
 		if(username.isEmpty()) {
 		    result.putBoolean(RESULT_KEY, false);
-		    result.putBoolean(LogInDialog.USERNAME_MISSING, true);
+		    result.putBoolean(SessionDialogInterface.USERNAME_MISSING, true);
 		}
 	    }
 		
@@ -278,19 +276,19 @@ public class ProviderAPI extends IntentService {
 	}
 
 
-    private Bundle authenticate(String username, String password, String server) {
+    private Bundle authenticate(String username, String password) {
 	Bundle result = new Bundle();
 	
 	LeapSRPSession client = new LeapSRPSession(username, password);
 	byte[] A = client.exponential();
 	
-	JSONObject step_result = sendAToSRPServer(server, username, new BigInteger(1, A).toString(16));
+	JSONObject step_result = sendAToSRPServer(provider_api_url, username, new BigInteger(1, A).toString(16));
 	try {
 	    String salt = step_result.getString(LeapSRPSession.SALT);
 	    byte[] Bbytes = new BigInteger(step_result.getString("B"), 16).toByteArray();
 	    byte[] M1 = client.response(new BigInteger(salt, 16).toByteArray(), Bbytes);
 	    if(M1 != null) {
-		step_result = sendM1ToSRPServer(server, username, M1);
+		step_result = sendM1ToSRPServer(provider_api_url, username, M1);
 		setTokenIfAvailable(step_result);
 		byte[] M2 = new BigInteger(step_result.getString(LeapSRPSession.M2), 16).toByteArray();
 		if(client.verify(M2)) {
@@ -300,7 +298,7 @@ public class ProviderAPI extends IntentService {
 		}
 	    } else {
 		result.putBoolean(RESULT_KEY, false);
-		result.putString(LogInDialog.USERNAME, username);
+		result.putString(SessionDialogInterface.USERNAME, username);
 		result.putString(getResources().getString(R.string.user_message), getResources().getString(R.string.error_srp_math_error_user_message));
 	    }
 	} catch (JSONException e) {
@@ -331,7 +329,7 @@ public class ProviderAPI extends IntentService {
 	} catch(JSONException e) {}
 	
 	if(!username.isEmpty())
-	    user_notification_bundle.putString(LogInDialog.USERNAME, username);
+	    user_notification_bundle.putString(SessionDialogInterface.USERNAME, username);
 	user_notification_bundle.putBoolean(RESULT_KEY, false);
 
 	return user_notification_bundle;
@@ -619,6 +617,7 @@ public class ProviderAPI extends IntentService {
 
 			try {
 				JSONObject provider_json = new JSONObject(provider_dot_json_string);
+				provider_api_url = provider_json.getString(Provider.API_URL) + "/" + provider_json.getString(Provider.API_VERSION);
 				String name = provider_json.getString(Provider.NAME);
 				//TODO setProviderName(name);
 
@@ -860,46 +859,46 @@ public class ProviderAPI extends IntentService {
 	 * @param task containing api url from which the user will log out
 	 * @return true if there were no exceptions
 	 */
-	private boolean logOut(Bundle task) {
-		try {
-			String delete_url = task.getString(Provider.API_URL) + "/logout";
-			int progress = 0;
+    private boolean logOut() {
+	try {
+	    String delete_url = provider_api_url + "/logout";
+	    int progress = 0;
 
-			HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
-			urlConnection.setRequestMethod("DELETE");
-			urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
+	    HttpsURLConnection urlConnection = (HttpsURLConnection)new URL(delete_url).openConnection();
+	    urlConnection.setRequestMethod("DELETE");
+	    urlConnection.setSSLSocketFactory(getProviderSSLSocketFactory());
 
-			int responseCode = urlConnection.getResponseCode();
-			broadcast_progress(progress++);
-			LeapSRPSession.setToken("");
-			Log.d(TAG, Integer.toString(responseCode));
-		} catch (ClientProtocolException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (IndexOutOfBoundsException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return false;
-		} catch (KeyManagementException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (KeyStoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (NoSuchAlgorithmException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (CertificateException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return true;
+	    int responseCode = urlConnection.getResponseCode();
+	    broadcast_progress(progress++);
+	    LeapSRPSession.setToken("");
+	    Log.d(TAG, Integer.toString(responseCode));
+	} catch (ClientProtocolException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (IndexOutOfBoundsException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (IOException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	    return false;
+	} catch (KeyManagementException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (KeyStoreException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (NoSuchAlgorithmException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
+	} catch (CertificateException e) {
+	    // TODO Auto-generated catch block
+	    e.printStackTrace();
 	}
+	return true;
+    }
 
     private boolean updateVpnCertificate() {
 	getNewCert();