From 89864fde82eb804c2bcb82f6139e99ff54ce5765 Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Thu, 25 May 2017 18:11:26 +0300
Subject: [PATCH 1/8] Added login using RoP flow API

---
 app/src/main/AndroidManifest.xml              |  6 ++
 .../appid/MainActivity.java                   | 75 +++++++++++++------
 .../appid/SignInActivity.java                 | 48 ++++++++++++
 app/src/main/res/layout/activity_main.xml     | 20 ++++-
 app/src/main/res/layout/sign_in.xml           | 67 +++++++++++++++++
 app/src/main/res/values/sign_in_strings.xml   | 11 +++
 .../ibm/bluemix/appid/android/api/AppID.java  | 34 ++++++++-
 .../AuthorizationManager.java                 | 20 ++++-
 .../AuthorizationUIManager.java               | 15 +---
 .../ChromeTabActivity.java                    | 10 +--
 .../internal/tokenmanager/TokenManager.java   | 47 +++++++++++-
 11 files changed, 303 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/java/com/ibm/mobilefirstplatform/appid/SignInActivity.java
 create mode 100644 app/src/main/res/layout/sign_in.xml
 create mode 100644 app/src/main/res/values/sign_in_strings.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c7250e4..788ba0c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".SignInActivity"
+            android:label="@string/title_activity_login"
+            android:theme="@android:style/Theme.Holo.Dialog"
+            android:windowSoftInputMode="adjustResize|stateVisible" >
+        </activity>
         <activity
             android:name=".TokensActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
index dcf5201..eeb06bf 100644
--- a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -44,6 +44,35 @@ public class MainActivity extends AppCompatActivity {
     private AccessToken identifiedAccessToken;
     private AccessToken useThisToken;
 
+    public final static int LOGIN_SUBMITTED = 2;
+    public final static int LOGIN_CANCEL = 3;
+
+    private AuthorizationListener authorizationListener = new AuthorizationListener() {
+        @Override
+        public void onAuthorizationFailure(AuthorizationException exception) {
+            logger.info("onAuthorizationFailure: " + exception.getMessage());
+            showResponse(exception.getMessage());
+            hideProgress();
+        }
+
+        @Override
+        public void onAuthorizationCanceled() {
+            logger.info("onAuthorizationCanceled");
+            hideProgress();
+        }
+
+        @Override
+        public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+            logger.info("onAuthorizationSuccess");
+            logger.info("access_token: " + accessToken.getRaw());
+            logger.info("id_token: " + identityToken.getRaw());
+            logger.info("access_token isExpired: " + accessToken.isExpired());
+            logger.info("id_token isExpired: " + identityToken.isExpired());
+            identifiedAccessToken = accessToken;
+            extractAndDisplayDataFromIdentityToken(identityToken);
+        }
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         logger.setLogLevel(Logger.LEVEL.DEBUG);
@@ -96,30 +125,30 @@ public void onLoginClick(View v) {
         logger.debug("onLoginClick");
         showProgress();
         LoginWidget loginWidget = appId.getLoginWidget();
-        loginWidget.launch(this, new AuthorizationListener() {
-            @Override
-            public void onAuthorizationFailure(AuthorizationException exception) {
-                logger.info("onAuthorizationFailure");
-                hideProgress();
-            }
+        loginWidget.launch(this, authorizationListener, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
+    }
 
-            @Override
-            public void onAuthorizationCanceled() {
-                logger.info("onAuthorizationCanceled");
-                hideProgress();
-            }
+    public void onGetTokenUsingRoP(View v) {
+        logger.debug("onGetTokenUsingRoP");
+        showResponse("");
+        showProgress();
+        Intent inent;
+        inent = new Intent(getApplicationContext(), SignInActivity.class);
+        startActivityForResult(inent, LOGIN_SUBMITTED);
+    }
 
-            @Override
-            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
-                logger.info("onAuthorizationSuccess");
-                logger.info("access_token: " + accessToken.getRaw());
-                logger.info("id_token: " + identityToken.getRaw());
-                logger.info("access_token isExpired: " + accessToken.isExpired());
-                logger.info("id_token isExpired: " + identityToken.isExpired());
-                identifiedAccessToken = accessToken;
-                extractAndDisplayDataFromIdentityToken(identityToken);
-            }
-        });
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if(resultCode == LOGIN_CANCEL) {
+            hideProgress();
+            logger.info("onGetTokenUsingRoP canceled");
+            return;
+        }
+        if (resultCode == LOGIN_SUBMITTED && data != null) {
+            String username = data.getStringExtra("username");
+            String password = data.getStringExtra("password");
+            appId.loginWithCredentials(getApplicationContext(), username, password, authorizationListener);
+        }
     }
 
     public void onProtectedRequestClick(View v) {
@@ -301,6 +330,7 @@ public void run() {
                 findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
                 findViewById(R.id.loadingPanel).bringToFront();
                 findViewById(R.id.loginButton).setEnabled(false);
+                findViewById(R.id.ropButton).setEnabled(false);
                 findViewById(R.id.protectedRequestButton).setEnabled(false);
                 findViewById(R.id.deleteAttribute).setEnabled(false);
                 findViewById(R.id.anonloginButton).setEnabled(false);
@@ -320,6 +350,7 @@ private void hideProgress() {
             public void run() {
                 findViewById(R.id.loadingPanel).setVisibility(View.GONE);
                 findViewById(R.id.loginButton).setEnabled(true);
+                findViewById(R.id.ropButton).setEnabled(true);
                 findViewById(R.id.protectedRequestButton).setEnabled(true);
                 findViewById(R.id.deleteAttribute).setEnabled(true);
                 findViewById(R.id.anonloginButton).setEnabled(true);
diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/SignInActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/SignInActivity.java
new file mode 100644
index 0000000..21002dd
--- /dev/null
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/SignInActivity.java
@@ -0,0 +1,48 @@
+package com.ibm.mobilefirstplatform.appid;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.AutoCompleteTextView;
+import android.widget.EditText;
+
+import static com.ibm.mobilefirstplatform.appid.MainActivity.LOGIN_CANCEL;
+import static com.ibm.mobilefirstplatform.appid.MainActivity.LOGIN_SUBMITTED;
+
+/**
+ * A login screen that offers login via userName/password.
+ */
+
+public class SignInActivity extends Activity {
+    // UI references.
+    private AutoCompleteTextView muserNameView;
+    private EditText mPasswordView;
+    private View mLoginFormView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.sign_in);
+        // Set up the login form.
+        muserNameView = (AutoCompleteTextView) findViewById(R.id.userName);
+        mPasswordView = (EditText) findViewById(R.id.password);
+        mLoginFormView = findViewById(R.id.login_form);
+    }
+
+    public void attemptLogin(View v) {
+        String userName = muserNameView.getText().toString();
+        String password = mPasswordView.getText().toString();
+        Intent inent = new Intent();
+        inent.putExtra("username",userName);
+        inent.putExtra("password", password);
+        setResult(LOGIN_SUBMITTED, inent);
+        finish();
+    }
+
+    public void cancelLogin(View v){
+        Intent inent = new Intent();
+        setResult(LOGIN_CANCEL, inent);
+        finish();
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3ea5757..a2773bf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -54,7 +54,21 @@
                 android:layout_below="@+id/profilePic"
                 android:layout_weight="1"
                 android:onClick="onAnonLoginClick"
-                android:text="Use Anonymously" />
+                android:text="Use Anonymously"
+                android:textSize="12sp" />
+
+            <Button
+                android:id="@+id/ropButton"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_below="@+id/name"
+                android:layout_weight="1"
+                android:onClick="onGetTokenUsingRoP"
+                android:text="Get tokens with RoP"
+                android:textAllCaps="false" />
 
             <Button
                 android:id="@+id/loginButton"
@@ -76,7 +90,9 @@
                 android:layout_below="@+id/orText"
                 android:layout_weight="1"
                 android:onClick="onProtectedRequestClick"
-                android:text="Protected Resource Request" />
+                android:text="Protected Resource Request"
+                android:textAllCaps="false"
+                android:textSize="12sp" />
         </LinearLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/sign_in.xml b/app/src/main/res/layout/sign_in.xml
new file mode 100644
index 0000000..080e87b
--- /dev/null
+++ b/app/src/main/res/layout/sign_in.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <!--
+      ~     Copyright 2015 IBM Corp.
+      ~     Licensed under the Apache License, Version 2.0 (the "License");
+      ~     you may not use this file except in compliance with the License.
+      ~     You may obtain a copy of the License at
+      ~     http://www.apache.org/licenses/LICENSE-2.0
+      ~     Unless required by applicable law or agreed to in writing, software
+      ~     distributed under the License is distributed on an "AS IS" BASIS,
+      ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      ~     See the License for the specific language governing permissions and
+      ~     limitations under the License.
+      -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+android:layout_height="match_parent" android:gravity="center_horizontal"
+android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"
+android:paddingLeft="@dimen/activity_horizontal_margin"
+android:paddingRight="@dimen/activity_horizontal_margin"
+android:paddingTop="@dimen/activity_vertical_margin">
+
+<!-- Login progress -->
+<ProgressBar android:id="@+id/login_progress" style="?android:attr/progressBarStyleLarge"
+    android:layout_width="wrap_content" android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp" android:visibility="gone" />
+
+<ScrollView android:id="@+id/login_form" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="false">
+
+    <LinearLayout android:id="@+id/email_login_form" android:layout_width="match_parent"
+        android:layout_height="wrap_content" android:orientation="vertical">
+
+        <AutoCompleteTextView android:id="@+id/userName" android:layout_width="match_parent"
+            android:layout_height="wrap_content" android:hint="@string/prompt_email"
+            android:inputType="textEmailAddress" android:maxLines="1" />
+
+        <EditText android:id="@+id/password" android:layout_width="match_parent"
+            android:layout_height="wrap_content" android:hint="@string/prompt_password"
+            android:imeActionId="@+id/login"
+            android:imeActionLabel="@string/action_sign_in_short"
+            android:imeOptions="actionUnspecified" android:inputType="textPassword"
+            android:maxLines="1" android:singleLine="true" />
+
+        <Button android:id="@+id/email_sign_in_button" style="?android:textAppearanceSmall"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" android:text="@string/action_sign_in"
+            android:textStyle="bold"
+            android:onClick="attemptLogin" />
+
+        <Button
+            style="?android:textAppearanceSmall"
+            android:id="@+id/cancelButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="cancel"
+            android:textStyle="bold"
+            android:onClick="cancelLogin"
+            android:layout_gravity="center_horizontal" />
+
+    </LinearLayout>
+</ScrollView>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/values/sign_in_strings.xml b/app/src/main/res/values/sign_in_strings.xml
new file mode 100644
index 0000000..fc6a7c0
--- /dev/null
+++ b/app/src/main/res/values/sign_in_strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="title_activity_login">Sign in</string>
+    <!-- Strings related to login -->
+    <string name="prompt_email">User Name</string>
+    <string name="prompt_password">Password</string>
+    <string name="action_sign_in">Sign in</string>
+    <string name="action_sign_in_short">Sign in</string>
+
+</resources>
\ No newline at end of file
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
index 7216e05..964f671 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
@@ -41,7 +41,9 @@ public class AppID {
     public final static String REGION_UK = ".eu-gb.bluemix.net";
     public final static String REGION_SYDNEY = ".au-syd.bluemix.net";
 
-    // TODO: document
+	/**
+	 * @return The AppID instance.
+	 */
 	@NonNull
 	public static synchronized AppID getInstance(){
 		if (null == instance) {
@@ -56,7 +58,12 @@ public static synchronized AppID getInstance(){
 
 	private AppID(){}
 
-	// TODO: document
+	/**
+	 * @param context
+	 * @param tenantId
+	 * @param bluemixRegion
+	 * @return The AppID instance tenantId.
+	 */
 	@NonNull
 	public AppID initialize (@NonNull Context context, @NonNull String tenantId, @NonNull String bluemixRegion) {
 		this.tenantId = tenantId;
@@ -68,7 +75,7 @@ public AppID initialize (@NonNull Context context, @NonNull String tenantId, @No
 	}
 
     /**
-     * @return The AppID instance tenantId
+     * @return The AppID instance tenantId.
      */
 	@NonNull
     public String getTenantId() {
@@ -89,14 +96,20 @@ public String getBluemixRegionSuffix() {
         return this.bluemixRegionSuffix;
     }
 
+	/**
+	 * @return the login widget
+	 */
 	@NonNull
-	public LoginWidget getLoginWidget(){
+	public LoginWidget getLoginWidget() {
 		if (null == this.loginWidget){
 			throw new RuntimeException("AppID is not initialized. Use .initialize() first.");
 		}
 		return this.loginWidget;
 	}
 
+	/**
+	 * @return the OAuth Manager
+	 */
 	@NonNull
 	protected OAuthManager getOAuthManager(){
 		if (null == this.oAuthManager){
@@ -105,6 +118,9 @@ protected OAuthManager getOAuthManager(){
 		return this.oAuthManager;
 	}
 
+	/**
+	 * @return the User Attribute Manager
+	 */
 	@NonNull
 	public UserAttributeManager getUserAttributeManager(){
 		if (null == this.userAttributeManager){
@@ -124,6 +140,16 @@ public void loginAnonymously(@NotNull Context context, String accessToken, @NotN
 	public void loginAnonymously(@NotNull Context context,  String accessToken, boolean allowCreateNewAnonymousUser, @NotNull AuthorizationListener authorizationListener){
 		oAuthManager.getAuthorizationManager().loginAnonymously(context, accessToken, allowCreateNewAnonymousUser, authorizationListener);
 	}
+	/**
+	 * Obtain token using Resource owner Password (RoP).
+	 *
+	 * @param username the resource owner username
+	 * @param password the resource owner password
+	 * @param listener the response listener
+	 */
+	public void loginWithCredentials(@NotNull Context context, @NotNull String username, @NotNull String password, @NotNull AuthorizationListener listener) {
+		oAuthManager.getAuthorizationManager().loginWithCredentials(context, username, password, listener);
+	}
 
 
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
index 95383df..f1bc19a 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
@@ -154,7 +154,7 @@ public void loginAnonymously(final Context context, final String accessTokenStri
 			@Override
 			public void onRegistrationFailure (RegistrationStatus error) {
 				logger.error(error.getDescription());
-				authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+                authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
 			}
 
 			@Override
@@ -167,4 +167,22 @@ public void onRegistrationSuccess () {
 	public void setAppIDRequestFactory(AppIDRequestFactory appIDRequestFactory) {
 		this.appIDRequestFactory = appIDRequestFactory;
 	}
+
+	public void loginWithCredentials(final Context context, final String username, final String password, final AuthorizationListener authorizationListener) {
+		registrationManager.ensureRegistered(context, new RegistrationListener() {
+			@Override
+			public void onRegistrationFailure (RegistrationStatus error) {
+				logger.error(error.getDescription());
+				authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+			}
+
+			@Override
+			public void onRegistrationSuccess () {
+				oAuthManager.getTokenManager().obtainTokens(username, password, authorizationListener);
+			}
+		});
+	}
+
+
+
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
index 36308e6..4eff6c8 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
@@ -82,20 +82,7 @@ public void launch(final Activity activity) {
         // (There might be a browser other than Chrome that support Chrome tabs)
 
         if (getPackageNameToUse(context) == null || !isChromeTabSupported) {
-            // Use WebView ,Authorization request with a Webview will be blocked on April 20, 2017
-//            logger.debug("Launching WebViewActivity");
-//            try {
-//                Intent intent = new Intent(context, WebViewActivity.class);
-//                intent.putExtra(EXTRA_AUTH_FLOW_CONTEXT_GUID, authFlowContextGuid);
-//                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                intent.putExtra(EXTRA_URL, serverUrl);
-//                intent.putExtra(EXTRA_REDIRECT_URL, redirectUrl);
-//                context.startActivity(intent);
-//            } catch (ActivityNotFoundException e) {
-//                logger.error("Activity not found", e);
-//                authorizationListener.onAuthorizationFailure(new AuthorizationException(e.getMessage()));
-//            }
-            authorizationListener.onAuthorizationFailure(new AuthorizationException("Can NOT find installed browser that support Chrome tabs on the device."));
+            authorizationListener.onAuthorizationFailure(new AuthorizationException("Could NOT find installed browser that support Chrome tabs on the device."));
         } else {
             // Use Chrome tabs
             logger.debug("Launching ChromeTabActivity");
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
index 5676aa7..5c93ee8 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/ChromeTabActivity.java
@@ -72,11 +72,6 @@ public void onCreate(Bundle savedInstanceBundle) {
             customTabsIntent.intent.setPackage(AuthorizationUIManager.getPackageNameToUse(this.getApplicationContext()));
             customTabsIntent.intent.addFlags(PendingIntent.FLAG_ONE_SHOT);
 
-            //This will launch the chrome tab
-            Uri uri = Uri.parse(serverUrl);
-            logger.debug("launching custom tab with url: " + uri.toString());
-            customTabsIntent.launchUrl(this, uri);
-
             broadcastReceiver = new BroadcastReceiver() {
                 @Override
                 public void onReceive(Context context, Intent intent) {
@@ -87,6 +82,11 @@ public void onReceive(Context context, Intent intent) {
             IntentFilter intentFilter = new IntentFilter(INTENT_GOT_HTTP_REDIRECT);
             LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter);
 
+            //This will launch the chrome tab
+            Uri uri = Uri.parse(serverUrl);
+            logger.debug("launching custom tab with url: " + uri.toString());
+            customTabsIntent.launchUrl(this, uri);
+
         } else {
             //if we launch after authorization completed
             finish();
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index c0c943b..613789f 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -28,6 +28,7 @@
 import com.ibm.bluemix.appid.android.internal.tokens.IdentityTokenImpl;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.internal.ResponseImpl;
 import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
 
 import org.json.JSONException;
@@ -54,14 +55,16 @@ public class TokenManager {
 	private final static String CODE = "code";
 	private final static String REDIRECT_URI = "redirect_uri";
 	private final static String AUTHORIZATION_HEADER = "Authorization";
-
+    private final static String USERNAME = "username";
+    private final static String PASSWORD = "password";
+    private final static String GRANT_TYPE_PASSWORD = "password";
+    private final static String ERROR_DESCRIPTION= "error_description";
 
 	public TokenManager (OAuthManager oAuthManager) {
 		this.appId = oAuthManager.getAppId();
 		this.registrationManager = oAuthManager.getRegistrationManager();
 	}
 
-
 	public void obtainTokens (String code, final AuthorizationListener listener) {
 		logger.debug("obtainTokens");
 		String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
@@ -98,6 +101,46 @@ public void onSuccess (Response response) {
 		});
 	}
 
+	public void obtainTokens (String username, String password, final AuthorizationListener listener) {
+		logger.debug("obtainTokens - with resource owner password");
+        String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
+        String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
+
+        AppIDRequest request = new AppIDRequest(tokenUrl, "POST");
+
+        try {
+            request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
+        } catch (Exception e) {
+            logger.error("Failed to create authentication header", e);
+            return;
+        }
+
+        HashMap<String, String> formParams = new HashMap<>();
+        formParams.put(USERNAME, username);
+        formParams.put(PASSWORD, password);
+        formParams.put(GRANT_TYPE, GRANT_TYPE_PASSWORD);
+
+        request.send(formParams, new ResponseListener() {
+            @Override
+            public void onFailure (Response response, Throwable t, JSONObject extendedInfo) {
+                logger.error("Failed to retrieve tokens from authorization server", t);
+                String error_description = "";
+                try {
+                    error_description = ((ResponseImpl) response).getResponseJSON().getString(ERROR_DESCRIPTION);
+                    listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + error_description));
+                } catch (Exception e) {
+                    logger.error("Failed to retrieve tokens: " + e.getMessage());
+                    listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
+                }
+
+            }
+
+            @Override
+            public void onSuccess (Response response) {
+                extractTokens(response, listener);
+            }
+        });
+	}
 
 	private String createAuthenticationHeader (String clientId) throws Exception {
 		PrivateKey privateKey = registrationManager.getPrivateKey();

From 871ea3a3abca739a11a1ee4b1cbb4b4c3d87827a Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Tue, 30 May 2017 17:37:25 +0300
Subject: [PATCH 2/8] code refactor + readme update + added some test

---
 README.md                                     |  18 +-
 .../appid/MainActivity.java                   |  83 ++++++---
 lib/src/main/AndroidManifest.xml              |   5 -
 .../ibm/bluemix/appid/android/api/AppID.java  |   7 +-
 .../android/api/AuthorizationListener.java    |   7 +-
 .../android/api/TokenResponseListener.java    |  22 +++
 .../AuthorizationManager.java                 |   7 +-
 .../authorizationmanager/WebViewActivity.java | 134 --------------
 .../internal/tokenmanager/TokenManager.java   |  13 +-
 .../bluemix/appid/android/api/AppID_Test.java |  20 ++
 .../AuthorizationManager_Test.java            | 173 ++++++++++++++++++
 11 files changed, 301 insertions(+), 188 deletions(-)
 create mode 100644 lib/src/main/java/com/ibm/bluemix/appid/android/api/TokenResponseListener.java
 delete mode 100755 lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/WebViewActivity.java
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java

diff --git a/README.md b/README.md
index 6c6eb4d..bd59d0d 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,23 @@ loginWidget.launch(this, new AuthorizationListener() {
 The Login widget default configuration use Facebook and Google as authentication options.
 If you configure only one of them the login widget will NOT launch and the user will be redirect to the configured idp authentication screen.
     
-
+### Login using Resource Owner Password
+You can obtain access token and id token by supplying the end user's username and the end user's password.
+```java
+AppID.getInstance().obtainTokensWithROP(getApplicationContext(), username, password, 
+        new TokenResponseListener() {
+        @Override
+         public void onAuthorizationFailure (AuthorizationException exception) {
+            //Exception occurred
+         }
+                                                                                             
+         @Override
+         public void onAuthorizationSuccess (AccessToken accessToken, IdentityToken identityToken) {
+           //User authenticated
+         }
+        });
+```
+ 
 ### Anonymous Login
 ```java
 AppID.getInstance().loginAnonymously(getApplicationContext(), new AuthorizationListener() {
diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
index eeb06bf..501e430 100644
--- a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -17,6 +17,7 @@
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
 import com.ibm.bluemix.appid.android.api.AuthorizationListener;
 import com.ibm.bluemix.appid.android.api.LoginWidget;
+import com.ibm.bluemix.appid.android.api.TokenResponseListener;
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
 import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
 import com.ibm.bluemix.appid.android.api.userattributes.UserAttributeResponseListener;
@@ -33,8 +34,8 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private final static String tenantId = "AppID_tenantId";
-    private final static String region = AppID.REGION_US_SOUTH; //AppID.REGION_UK ,AppID.REGION_SYDNEY
+    private final static String tenantId = "2a4f6d7d-de46-4d0d-b5ca-8002c1034ab4";//"AppID_tenantId";
+    private final static String region = ".stage1.mybluemix.net";//AppID.REGION_US_SOUTH; //AppID.REGION_UK ,AppID.REGION_SYDNEY
     private final static String protectedUrl = "protected_URL";
 
     private final static Logger logger = Logger.getLogger(MainActivity.class.getName());
@@ -47,32 +48,6 @@ public class MainActivity extends AppCompatActivity {
     public final static int LOGIN_SUBMITTED = 2;
     public final static int LOGIN_CANCEL = 3;
 
-    private AuthorizationListener authorizationListener = new AuthorizationListener() {
-        @Override
-        public void onAuthorizationFailure(AuthorizationException exception) {
-            logger.info("onAuthorizationFailure: " + exception.getMessage());
-            showResponse(exception.getMessage());
-            hideProgress();
-        }
-
-        @Override
-        public void onAuthorizationCanceled() {
-            logger.info("onAuthorizationCanceled");
-            hideProgress();
-        }
-
-        @Override
-        public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
-            logger.info("onAuthorizationSuccess");
-            logger.info("access_token: " + accessToken.getRaw());
-            logger.info("id_token: " + identityToken.getRaw());
-            logger.info("access_token isExpired: " + accessToken.isExpired());
-            logger.info("id_token isExpired: " + identityToken.isExpired());
-            identifiedAccessToken = accessToken;
-            extractAndDisplayDataFromIdentityToken(identityToken);
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         logger.setLogLevel(Logger.LEVEL.DEBUG);
@@ -83,10 +58,16 @@ protected void onCreate(Bundle savedInstanceState) {
         bmsClient.initialize(this, region);
         // Initialize AppID SDK
         appId = AppID.getInstance();
+
+        //uncomment to run locally
+//        appId.overrideOAuthServerHost = "http://10.0.2.2:6001/oauth/v3/";
+//        appId.overrideUserProfilesHost = "http://10.0.2.2:9080/user";
+
         appId.initialize(this, tenantId, region);
         // Add integration with BMSClient. Optional.
         this.appIDAuthorizationManager = new AppIDAuthorizationManager(this.appId);
         bmsClient.setAuthorizationManager(appIDAuthorizationManager);
+
     }
 
     public void onAnonLoginClick(View v) {
@@ -125,7 +106,31 @@ public void onLoginClick(View v) {
         logger.debug("onLoginClick");
         showProgress();
         LoginWidget loginWidget = appId.getLoginWidget();
-        loginWidget.launch(this, authorizationListener, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
+        loginWidget.launch(this, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                logger.info("onAuthorizationFailure: " + exception.getMessage());
+                showResponse(exception.getMessage());
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                logger.info("onAuthorizationCanceled");
+                hideProgress();
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                logger.info("onAuthorizationSuccess");
+                logger.info("access_token: " + accessToken.getRaw());
+                logger.info("id_token: " + identityToken.getRaw());
+                logger.info("access_token isExpired: " + accessToken.isExpired());
+                logger.info("id_token isExpired: " + identityToken.isExpired());
+                identifiedAccessToken = accessToken;
+                extractAndDisplayDataFromIdentityToken(identityToken);
+            }
+        }, anonymousAccessToken != null ? anonymousAccessToken.getRaw() : null);
     }
 
     public void onGetTokenUsingRoP(View v) {
@@ -147,7 +152,25 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == LOGIN_SUBMITTED && data != null) {
             String username = data.getStringExtra("username");
             String password = data.getStringExtra("password");
-            appId.loginWithCredentials(getApplicationContext(), username, password, authorizationListener);
+            appId.obtainTokensWithROP(getApplicationContext(), username, password, new TokenResponseListener() {
+                @Override
+                public void onAuthorizationFailure(AuthorizationException exception) {
+                    logger.info("onAuthorizationFailure: " + exception.getMessage());
+                    showResponse(exception.getMessage());
+                    hideProgress();
+                }
+
+                @Override
+                public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                    logger.info("onAuthorizationSuccess");
+                    logger.info("access_token: " + accessToken.getRaw());
+                    logger.info("id_token: " + identityToken.getRaw());
+                    logger.info("access_token isExpired: " + accessToken.isExpired());
+                    logger.info("id_token isExpired: " + identityToken.isExpired());
+                    identifiedAccessToken = accessToken;
+                    extractAndDisplayDataFromIdentityToken(identityToken);
+                }
+            });
         }
     }
 
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index 092a956..78c93f9 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -8,11 +8,6 @@
             android:allowBackup="true"
             android:supportsRtl="true">
 
-        <activity
-                android:name="com.ibm.bluemix.appid.android.internal.authorizationmanager.WebViewActivity"
-                android:theme="@style/Theme.AppCompat.NoActionBar">
-        </activity>
-
         <activity android:name="com.ibm.bluemix.appid.android.internal.authorizationmanager.ChromeTabActivity">
             <intent-filter>
                 <action android:name="${appIdRedirectScheme}.POST_AUTHORIZATION_INTENT" />
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
index 964f671..b5eb43e 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
@@ -40,6 +40,7 @@ public class AppID {
     public final static String REGION_US_SOUTH = ".ng.bluemix.net";
     public final static String REGION_UK = ".eu-gb.bluemix.net";
     public final static String REGION_SYDNEY = ".au-syd.bluemix.net";
+	public final static String REGION_GERMANY = ".eu-de.bluemix.net";
 
 	/**
 	 * @return The AppID instance.
@@ -145,10 +146,10 @@ public void loginAnonymously(@NotNull Context context,  String accessToken, bool
 	 *
 	 * @param username the resource owner username
 	 * @param password the resource owner password
-	 * @param listener the response listener
+	 * @param tokenResponseListener the token response listener
 	 */
-	public void loginWithCredentials(@NotNull Context context, @NotNull String username, @NotNull String password, @NotNull AuthorizationListener listener) {
-		oAuthManager.getAuthorizationManager().loginWithCredentials(context, username, password, listener);
+	public void obtainTokensWithROP(@NotNull Context context, @NotNull String username, @NotNull String password, @NotNull TokenResponseListener tokenResponseListener) {
+		oAuthManager.getAuthorizationManager().obtainTokensWithROP(context, username, password, tokenResponseListener);
 	}
 
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AuthorizationListener.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AuthorizationListener.java
index ae1b1ee..e94e158 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AuthorizationListener.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AuthorizationListener.java
@@ -13,11 +13,6 @@
 
 package com.ibm.bluemix.appid.android.api;
 
-import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
-import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
-
-public interface AuthorizationListener {
-	void onAuthorizationFailure(AuthorizationException exception);
+public interface AuthorizationListener extends TokenResponseListener{
 	void onAuthorizationCanceled();
-	void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken);
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/TokenResponseListener.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/TokenResponseListener.java
new file mode 100644
index 0000000..c435a54
--- /dev/null
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/TokenResponseListener.java
@@ -0,0 +1,22 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+
+package com.ibm.bluemix.appid.android.api;
+
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
+
+public interface TokenResponseListener {
+    void onAuthorizationFailure(AuthorizationException exception);
+    void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken);
+}
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
index f1bc19a..239003d 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
@@ -20,6 +20,7 @@
 import com.ibm.bluemix.appid.android.api.AppID;
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
 import com.ibm.bluemix.appid.android.api.AuthorizationListener;
+import com.ibm.bluemix.appid.android.api.TokenResponseListener;
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
 import com.ibm.bluemix.appid.android.internal.config.Config;
@@ -168,17 +169,17 @@ public void setAppIDRequestFactory(AppIDRequestFactory appIDRequestFactory) {
 		this.appIDRequestFactory = appIDRequestFactory;
 	}
 
-	public void loginWithCredentials(final Context context, final String username, final String password, final AuthorizationListener authorizationListener) {
+	public void obtainTokensWithROP(final Context context, final String username, final String password, final TokenResponseListener tokenResponseListener) {
 		registrationManager.ensureRegistered(context, new RegistrationListener() {
 			@Override
 			public void onRegistrationFailure (RegistrationStatus error) {
 				logger.error(error.getDescription());
-				authorizationListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
+				tokenResponseListener.onAuthorizationFailure(new AuthorizationException(error.getDescription()));
 			}
 
 			@Override
 			public void onRegistrationSuccess () {
-				oAuthManager.getTokenManager().obtainTokens(username, password, authorizationListener);
+				oAuthManager.getTokenManager().obtainTokens(username, password, tokenResponseListener);
 			}
 		});
 	}
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/WebViewActivity.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/WebViewActivity.java
deleted file mode 100755
index 123f0a9..0000000
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/WebViewActivity.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-	Copyright 2017 IBM Corp.
-	Licensed under the Apache License, Version 2.0 (the "License");
-	you may not use this file except in compliance with the License.
-	You may obtain a copy of the License at
-	http://www.apache.org/licenses/LICENSE-2.0
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
-*/
-
-
-package com.ibm.bluemix.appid.android.internal.authorizationmanager;
-
-import android.net.Uri;
-import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.ViewGroup;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-
-import com.ibm.bluemix.appid.android.api.AuthorizationException;
-import com.ibm.bluemix.appid.android.api.AuthorizationListener;
-import com.ibm.bluemix.appid.android.internal.OAuthManager;
-import com.ibm.mobilefirstplatform.appid_clientsdk_android.R;
-import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
-
-public class WebViewActivity extends AppCompatActivity {
-
-    private AuthorizationListener authorizationListener;
-    private OAuthManager oAuthManager;
-    private String redirectUrl;
-
-    private static final Logger logger = Logger.getLogger(Logger.INTERNAL_PREFIX + WebViewActivity.class.getName());
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        logger.debug("onCreate");
-        setContentView(R.layout.activity_web_view);
-        WebView webView = (WebView) findViewById(R.id.webView1);
-        webView.getSettings().setJavaScriptEnabled(true);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            webView.setWebViewClient(new WebViewClientNewAPI());
-        }else{
-            webView.setWebViewClient(new WebViewClientOldAPI());
-        }
-        webView.clearCache(true);
-
-        String serverUrl = getIntent().getStringExtra(AuthorizationUIManager.EXTRA_URL);
-        this.redirectUrl = getIntent().getStringExtra(AuthorizationUIManager.EXTRA_REDIRECT_URL);
-
-        String authFlowContextGuid = getIntent().getStringExtra(AuthorizationUIManager.EXTRA_AUTH_FLOW_CONTEXT_GUID);
-        AuthorizationFlowContext ctx = AuthorizationFlowContextStore.remove(authFlowContextGuid);
-
-        this.oAuthManager = ctx.getOAuthManager();
-        this.authorizationListener = ctx.getAuthorizationListener();
-
-        logger.debug("serverUrl: " + serverUrl);
-        logger.debug("redirectUrl: " + redirectUrl);
-
-        if (authorizationListener == null || serverUrl == null || this.redirectUrl == null){
-            logger.error("Failed to retrieve one of the following: authorizationListener, serverUrl, redirectUrl");
-            finish();
-        } else {
-            webView.loadUrl(serverUrl);
-        }
-    }
-
-    //override here in order to avoid window leaks
-    @Override
-    public void finish() {
-        ViewGroup view = (ViewGroup) getWindow().getDecorView();
-        view.removeAllViews();
-        super.finish();
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-        authorizationListener.onAuthorizationCanceled();
-    }
-
-    private class WebViewClientOldAPI extends WebViewClient {
-        @Override
-        public boolean shouldOverrideUrlLoading(final WebView view, String url) {
-            Uri uri = Uri.parse(url);
-            loadUri(view, uri);
-            return true;
-        }
-    }
-
-    private class WebViewClientNewAPI extends WebViewClient {
-        @RequiresApi (api = Build.VERSION_CODES.LOLLIPOP)
-        @Override
-        public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
-            Uri uri = request.getUrl();
-            loadUri(view, uri);
-            return true;
-        }
-    }
-
-    private void loadUri(WebView view, Uri uri) {
-        String url = uri.toString();
-        String code = uri.getQueryParameter("code");
-        String error = uri.getQueryParameter("error");
-        if (url.startsWith(redirectUrl) && code != null) {
-            logger.debug("Grant code received from authorization server.");
-            finish();
-            oAuthManager.getTokenManager().obtainTokens(code, authorizationListener);
-
-        } else if (url.startsWith(redirectUrl) && error != null){
-            String errorCode = uri.getQueryParameter("error_code");
-            String errorDescription = uri.getQueryParameter("error_description");
-            logger.error("error: " + error);
-            logger.error("errorCode: " + errorCode);
-            logger.error("errorDescription: " + errorDescription);
-            authorizationListener.onAuthorizationFailure(new AuthorizationException("Failed to obtain access and identity tokens"));
-            finish();
-        } else {
-            //when working locally uncomment this 'if' (replacing localhost with 10.0.2.2)
-            //  if(AppID.overrideOAuthServerHost != null && uri.getHost().equals("localhost")) {
-            //when working locally replacing localhost with 10.0.2.2
-            //       url = AppID.overrideOAuthServerHost.replace("/oauth/v3/","") + url.substring(21, url.length());
-            //    }
-            view.loadUrl(url);
-        }
-    }
-}
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index 613789f..433f4a9 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -18,6 +18,7 @@
 import com.ibm.bluemix.appid.android.api.AppID;
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
 import com.ibm.bluemix.appid.android.api.AuthorizationListener;
+import com.ibm.bluemix.appid.android.api.TokenResponseListener;
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
 import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
@@ -101,7 +102,7 @@ public void onSuccess (Response response) {
 		});
 	}
 
-	public void obtainTokens (String username, String password, final AuthorizationListener listener) {
+	public void obtainTokens (String username, String password, final TokenResponseListener listener) {
 		logger.debug("obtainTokens - with resource owner password");
         String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
         String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
@@ -156,7 +157,7 @@ private String createAuthenticationHeader (String clientId) throws Exception {
 	 *
 	 * @param response response that contain the token
 	 */
-	private void extractTokens (Response response, AuthorizationListener authorizationListener) {
+	private void extractTokens (Response response, TokenResponseListener tokenResponseListener) {
 		String accessTokenString;
 		String idTokenString;
 		AccessToken accessToken;
@@ -170,7 +171,7 @@ private void extractTokens (Response response, AuthorizationListener authorizati
 			idTokenString = responseJSON.getString("id_token");
 		} catch (JSONException e){
 			logger.error("Failed to parse server response", e);
-			authorizationListener.onAuthorizationFailure(new AuthorizationException("Failed to parse server response"));
+			tokenResponseListener.onAuthorizationFailure(new AuthorizationException("Failed to parse server response"));
 			return;
 		}
 
@@ -178,7 +179,7 @@ private void extractTokens (Response response, AuthorizationListener authorizati
 			accessToken = new AccessTokenImpl(accessTokenString);
 		} catch (RuntimeException e){
 			logger.error("Failed to parse access_token", e);
-			authorizationListener.onAuthorizationFailure(new AuthorizationException("Failed to parse access_token"));
+			tokenResponseListener.onAuthorizationFailure(new AuthorizationException("Failed to parse access_token"));
 			return;
 		}
 
@@ -187,14 +188,14 @@ private void extractTokens (Response response, AuthorizationListener authorizati
 		} catch (RuntimeException e){
 			clearStoredTokens();
 			logger.error("Failed to parse id_token", e);
-			authorizationListener.onAuthorizationFailure(new AuthorizationException("Failed to parse id_token"));
+			tokenResponseListener.onAuthorizationFailure(new AuthorizationException("Failed to parse id_token"));
 			return;
 		}
 
 		latestAccessToken = accessToken;
 		latestIdentityToken = identityToken;
 
-		authorizationListener.onAuthorizationSuccess(accessToken, identityToken);
+		tokenResponseListener.onAuthorizationSuccess(accessToken, identityToken);
 	}
 
 	public AccessToken getLatestAccessToken () {
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
index 3676a9a..dcb38a0 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppID_Test.java
@@ -127,5 +127,25 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
 		appId.loginAnonymously(RuntimeEnvironment.application, "access_token", listener);
 		appId.loginAnonymously(RuntimeEnvironment.application, "access_token", false, listener);
 	}
+
+	@Test
+	public void test03_loginUsingRoP(){
+        this.appId.initialize(RuntimeEnvironment.application, testTenantId, testRegion);
+
+        TokenResponseListener listener = new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertThat(exception.getMessage().equals(RegistrationStatus.FAILED_TO_REGISTER.getDescription()));
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assert(false);
+            }
+        };
+
+        appId.obtainTokensWithROP(RuntimeEnvironment.application, "testUsername", "testPassword", listener);
+
+	}
 }
 
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
new file mode 100644
index 0000000..08f2e85
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
@@ -0,0 +1,173 @@
+package com.ibm.bluemix.appid.android.internal.authorizationmanager;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.test.mock.MockContext;
+
+import com.ibm.bluemix.appid.android.api.AppID;
+import com.ibm.bluemix.appid.android.api.AuthorizationException;
+import com.ibm.bluemix.appid.android.api.TokenResponseListener;
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
+import com.ibm.bluemix.appid.android.internal.OAuthManager;
+import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationListener;
+import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationManager;
+import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationStatus;
+import com.ibm.bluemix.appid.android.internal.tokenmanager.TokenManager;
+import com.ibm.bluemix.appid.android.internal.tokens.AccessTokenImpl;
+import com.ibm.bluemix.appid.android.internal.tokens.IdentityTokenImpl;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
+import com.ibm.mobilefirstplatform.appid_clientsdk_android.BuildConfig;
+
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+//import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.modules.junit4.PowerMockRunner;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.doAnswer;
+
+//@RunWith(MockitoJUnitRunner.class)
+@RunWith(PowerMockRunner.class)
+//@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@PrepareForTest(AuthorizationUIManager.class)
+//@Config(constants = BuildConfig.class)
+public class AuthorizationManager_Test {
+
+//    @Mock private OAuthManager oAuthManagerMock;
+//    @Mock private RegistrationManager registrationManager;
+//    @Mock private TokenManager tokenManagerMock;
+//    @Mock private AppID appidMock;
+//    @Mock private PackageManager pmMock;
+//    @Mock private Context mockContext;
+    private AuthorizationManager authManager;
+//    private String username = "testUser";
+//    private String password = "testPassword";
+//    RegistrationManager rm;
+//    @Mock Context mc;
+//    private AccessToken expectedAccessToken = null;//new AccessTokenImpl(Consts.ACCESS_TOKEN);
+//    private IdentityToken expectedIdToken = null;//new IdentityTokenImpl(Consts.ID_TOKEN);
+
+
+    @Before
+    public void before(){
+//         rm = Mockito.mock(RegistrationManager.class);
+//        MockitoAnnotations.initMocks(this);
+//        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+//        doAnswer(new Answer<Void>() {
+//                     @Override
+//                     public Void answer(InvocationOnMock invocation) {
+//                         Object[] args = invocation.getArguments();
+//                         TokenResponseListener tokenListener = (TokenResponseListener) args[2];
+//                         tokenListener.onAuthorizationSuccess(expectedAccessToken, expectedIdToken);
+//                         return null;
+//                     }
+//                 }
+//        ).when(tokenManagerMock).obtainTokens(eq(username), eq(password), any(TokenResponseListener.class));
+//
+//        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
+//
+//        when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
+//        when(appidMock.getBluemixRegionSuffix()).thenReturn(".stubPrefix");
+//        when(mockContext.getPackageManager()).thenReturn(pmMock);
+//        when(pmMock.resolveActivity(eq(any(Intent.class)), 0)).thenReturn(null);
+//        when(pmMock.queryIntentActivities(eq(any(Intent.class)), 0)).thenReturn(null);
+
+
+
+//        oAuthManagerMock = Mockito.mock(OAuthManager.class);
+//        appidMock = Mockito.mock(AppID.class);;
+//        registrationManager = Mockito.mock(RegistrationManager.class);
+
+//        MockitoAnnotations.initMocks(this);
+//        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
+//        when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
+//        mc = Mockito.mock(Context.class);
+
+        PowerMockito.mockStatic(AuthorizationUIManager.class);
+        PowerMockito.doNothing().when(AuthorizationUIManager.class);
+//        AuthorizationUIManager.bindCustomTabsService(mc, any(String.class));
+
+//        authManager = new AuthorizationManager(oAuthManagerMock, mc);
+
+
+    }
+
+    @Test
+    public void obtainTokensWithROP_regisrationFailure() {
+
+
+
+
+//        doAnswer(new Answer<Void>() {
+//                    @Override
+//                     public Void answer(InvocationOnMock invocation) {
+//                         Object[] args = invocation.getArguments();
+//                         RegistrationListener regListener = (RegistrationListener) args[1];
+//                         regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
+//                         return null;
+//                     }
+//                 }).when(rm).ensureRegistered(null, eq(any(RegistrationListener.class)));
+//
+//
+//
+//        authManager.obtainTokensWithROP(null, username, password, new TokenResponseListener() {
+//            @Override
+//            public void onAuthorizationFailure(AuthorizationException exception) {
+////                assertThat(exception.getMessage().equals(RegistrationStatus.NOT_REGISTRED.getDescription()));
+//            }
+//
+//            @Override
+//            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+////                assert(false);
+//            }
+//        });
+    }
+
+    @Test
+    public void obtainTokensWithROP_regisrationSuccess() {
+//        doAnswer(new Answer<Void>() {
+//                     public Void answer(InvocationOnMock invocation) {
+//                         Object[] args = invocation.getArguments();
+//                         RegistrationListener regListener = (RegistrationListener) args[1];
+//                         regListener.onRegistrationSuccess();
+//                         return null;
+//                     }
+//                 }
+//        ).when(registrationManager).ensureRegistered(RuntimeEnvironment.application, eq(any(RegistrationListener.class)));
+//
+//        authManager.obtainTokensWithROP(RuntimeEnvironment.application, username, password, new TokenResponseListener() {
+//            @Override
+//            public void onAuthorizationFailure(AuthorizationException exception) {
+//                assert(false);
+//            }
+//
+//            @Override
+//            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+//                assertThat(accessToken.getRaw().equals(expectedAccessToken));
+//                assertThat(identityToken.getRaw().equals(expectedIdToken));
+//            }
+//        });
+    }
+}

From 147e6f8a2875b7a94637b5ed31f9dbd9aa670d44 Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Fri, 2 Jun 2017 15:48:40 +0300
Subject: [PATCH 3/8] added unit test for Authorization and Token Managers.

---
 .../appid/MainActivity.java                   |   2 +-
 app/src/main/res/layout/activity_main.xml     |   1 -
 .../ibm/bluemix/appid/android/api/AppID.java  |   2 +-
 .../AuthorizationManager.java                 |  23 +-
 .../internal/tokenmanager/TokenManager.java   |  19 +-
 .../ibm/bluemix/appid/android/TestSuite.java  |   6 +-
 .../AuthorizationManager_Test.java            | 439 ++++++++++++-----
 .../tokenmanager/TokenManager_Test.java       | 443 ++++++++++++++++++
 8 files changed, 799 insertions(+), 136 deletions(-)
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java

diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
index 501e430..eeb2608 100644
--- a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -34,7 +34,7 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private final static String tenantId = "2a4f6d7d-de46-4d0d-b5ca-8002c1034ab4";//"AppID_tenantId";
+    private final static String tenantId = "0b0132c0-9931-478d-b809-27908f014503";//"AppID_tenantId";
     private final static String region = ".stage1.mybluemix.net";//AppID.REGION_US_SOUTH; //AppID.REGION_UK ,AppID.REGION_SYDNEY
     private final static String protectedUrl = "protected_URL";
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2773bf..984e70a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,7 +32,6 @@
                 android:layout_width="100dp"
                 android:layout_height="30dp"
                 android:layout_alignParentStart="true"
-                android:layout_below="@+id/profilePic"
                 android:layout_marginTop="15dp"
                 android:onClick="onTokensClick"
                 android:text="Tokens"
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
index b5eb43e..8f74678 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/AppID.java
@@ -34,7 +34,7 @@ public class AppID {
 	private OAuthManager oAuthManager;
 	private UserAttributeManager userAttributeManager;
 
-    public static String overrideOAuthServerHost = null; //when use place the assiment before calling the AppID initialize function
+    public static String overrideOAuthServerHost = null; //when use place the assignment before calling the AppID initialize function
 	public static String overrideUserProfilesHost = null;
 
     public final static String REGION_US_SOUTH = ".ng.bluemix.net";
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
index 239003d..9d34ac4 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager.java
@@ -60,7 +60,11 @@ public class AuthorizationManager {
 
 	private final static Logger logger = Logger.getLogger(Logger.INTERNAL_PREFIX + AuthorizationManager.class.getName());
 
-	// TODO: document
+    /**
+     * @param oAuthManager
+     * @param ctx the Context that will be bind to the custom chrome tab.
+     * The AuthorizationManager constructor.
+     */
 	public AuthorizationManager (final OAuthManager oAuthManager, final Context ctx) {
 		this.oAuthManager = oAuthManager;
 		this.appId = oAuthManager.getAppId();
@@ -69,8 +73,10 @@ public AuthorizationManager (final OAuthManager oAuthManager, final Context ctx)
 		AuthorizationUIManager.bindCustomTabsService(ctx, serverUrl);
 	}
 
-	// TODO: document
-	public String getAuthorizationUrl(String idpName, AccessToken accessToken) {
+    /**
+     * @return The Authorization endpoint url.
+     */
+	private String getAuthorizationUrl(String idpName, AccessToken accessToken) {
 		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 		String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
 
@@ -93,7 +99,12 @@ public void launchAuthorizationUI (final Activity activity, final AuthorizationL
 		launchAuthorizationUI(activity, null, authorizationListener);
 	}
 
-	// TODO: document
+    /**
+     * @param activity the activity to launch the chrome tab on to.
+     * @param accessToken if not null, this access token will be added to the request.
+     * @param authorizationListener the authorization listener of the client.
+     * launch the authorization url in the chrome tab after successful registration.
+     */
 	public void launchAuthorizationUI (final Activity activity, final AccessToken accessToken, final AuthorizationListener authorizationListener){
 		registrationManager.ensureRegistered(activity, new RegistrationListener() {
 			@Override
@@ -112,7 +123,7 @@ public void onRegistrationSuccess () {
 		});
 	}
 
-	public void continueAnonymousLogin (String accessTokenString, boolean allowCreateNewAnonymousUser, final AuthorizationListener listener){
+	private void continueAnonymousLogin (String accessTokenString, boolean allowCreateNewAnonymousUser, final AuthorizationListener listener){
 		AccessToken accessToken;
 		if (accessTokenString == null){
 			accessToken = oAuthManager.getTokenManager().getLatestAccessToken();
@@ -143,7 +154,7 @@ public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 							 String message = (response == null) ? "" : response.getResponseText();
 							 logger.debug("loginAnonymously.Response in onFailure:" + message, t);
 							 message = (t != null) ? t.getLocalizedMessage() : "Authorization request failed.";
-							 message = (extendedInfo !=null) ? message + extendedInfo.toString() : message;
+							 message = (extendedInfo != null) ? message + extendedInfo.toString() : message;
 							 listener.onAuthorizationFailure(new AuthorizationException(message));
 						 }
 					 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index 433f4a9..4ba7d31 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -73,7 +73,7 @@ public void obtainTokens (String code, final AuthorizationListener listener) {
 		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 		String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
 
-		AppIDRequest request = new AppIDRequest(tokenUrl, "POST");
+		AppIDRequest request = setRequest(tokenUrl, "POST");
 
 		try {
 			request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
@@ -102,12 +102,17 @@ public void onSuccess (Response response) {
 		});
 	}
 
+	//for testing purpose
+    AppIDRequest setRequest(String url, String method) {
+		return new AppIDRequest(url, method);
+	}
+
 	public void obtainTokens (String username, String password, final TokenResponseListener listener) {
 		logger.debug("obtainTokens - with resource owner password");
         String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
         String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 
-        AppIDRequest request = new AppIDRequest(tokenUrl, "POST");
+        AppIDRequest request = setRequest(tokenUrl, "POST");
 
         try {
             request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
@@ -127,13 +132,13 @@ public void onFailure (Response response, Throwable t, JSONObject extendedInfo)
                 logger.error("Failed to retrieve tokens from authorization server", t);
                 String error_description = "";
                 try {
-                    error_description = ((ResponseImpl) response).getResponseJSON().getString(ERROR_DESCRIPTION);
+					JSONObject responseJSON = new JSONObject(response.getResponseText());
+					error_description = responseJSON.getString(ERROR_DESCRIPTION);
                     listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + error_description));
                 } catch (Exception e) {
-                    logger.error("Failed to retrieve tokens: " + e.getMessage());
-                    listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
+                    logger.error("Failed to parse server response", e);
+                    listener.onAuthorizationFailure(new AuthorizationException("Failed to parse server response."));
                 }
-
             }
 
             @Override
@@ -169,7 +174,7 @@ private void extractTokens (Response response, TokenResponseListener tokenRespon
 			JSONObject responseJSON = new JSONObject(response.getResponseText());
 			accessTokenString = responseJSON.getString("access_token");
 			idTokenString = responseJSON.getString("id_token");
-		} catch (JSONException e){
+		} catch (Exception e){
 			logger.error("Failed to parse server response", e);
 			tokenResponseListener.onAuthorizationFailure(new AuthorizationException("Failed to parse server response"));
 			return;
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java b/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
index 4621744..8dd27a1 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
@@ -21,9 +21,11 @@
 import com.ibm.bluemix.appid.android.api.tokens.IdentityToken_Test;
 import com.ibm.bluemix.appid.android.api.tokens.OAuthClient_Test;
 import com.ibm.bluemix.appid.android.api.userattributes.UserAttributesException_Test;
+import com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationManager_Test;
 import com.ibm.bluemix.appid.android.internal.helpers.AuthorizationHeaderHelper_Test;
 import com.ibm.bluemix.appid.android.internal.preferences.JSONPreference_Test;
 import com.ibm.bluemix.appid.android.internal.preferences.StringPreference_Test;
+import com.ibm.bluemix.appid.android.internal.tokenmanager.TokenManager_Test;
 import com.ibm.bluemix.appid.android.internal.tokens.AbstractToken_Test;
 
 import org.junit.runner.RunWith;
@@ -46,6 +48,8 @@
 		AuthorizationHeaderHelper_Test.class,
 		StringPreference_Test.class,
 		JSONPreference_Test.class,
-		Config_Test.class
+		Config_Test.class,
+		AuthorizationManager_Test.class,
+        TokenManager_Test.class
 })
 public class TestSuite {}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
index 08f2e85..4263f40 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
@@ -1,16 +1,19 @@
 package com.ibm.bluemix.appid.android.internal.authorizationmanager;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.test.mock.MockContext;
 
 import com.ibm.bluemix.appid.android.api.AppID;
 import com.ibm.bluemix.appid.android.api.AuthorizationException;
+import com.ibm.bluemix.appid.android.api.AuthorizationListener;
 import com.ibm.bluemix.appid.android.api.TokenResponseListener;
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
 import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
 import com.ibm.bluemix.appid.android.internal.OAuthManager;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequest;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequestFactory;
 import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationListener;
 import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationManager;
 import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationStatus;
@@ -19,6 +22,8 @@
 import com.ibm.bluemix.appid.android.internal.tokens.IdentityTokenImpl;
 import com.ibm.bluemix.appid.android.testing.helpers.Consts;
 import com.ibm.mobilefirstplatform.appid_clientsdk_android.BuildConfig;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 
 import org.junit.Before;
 import org.junit.FixMethodOrder;
@@ -26,148 +31,344 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-//import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.PowerMockRunner;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.doAnswer;
 
-//@RunWith(MockitoJUnitRunner.class)
-@RunWith(PowerMockRunner.class)
-//@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@PrepareForTest(AuthorizationUIManager.class)
-//@Config(constants = BuildConfig.class)
+@RunWith (RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Config (constants = BuildConfig.class)
 public class AuthorizationManager_Test {
 
-//    @Mock private OAuthManager oAuthManagerMock;
-//    @Mock private RegistrationManager registrationManager;
-//    @Mock private TokenManager tokenManagerMock;
-//    @Mock private AppID appidMock;
-//    @Mock private PackageManager pmMock;
-//    @Mock private Context mockContext;
+    @Mock
+    private OAuthManager oAuthManagerMock;
+    @Mock
+    private RegistrationManager registrationManager;
+    @Mock
+    private TokenManager tokenManagerMock;
+    @Mock
+    private AppID appidMock;
+    @Mock
+    private PackageManager pmMock;
+    @Mock
+    private Context mockContext;
+    @Mock
+    private AppIDRequestFactory appIDRequestFactoryMock;
+    @Mock
+    private AppIDRequest mockRequest;
+    @Mock
+    private Activity mockActivity;
     private AuthorizationManager authManager;
-//    private String username = "testUser";
-//    private String password = "testPassword";
-//    RegistrationManager rm;
-//    @Mock Context mc;
-//    private AccessToken expectedAccessToken = null;//new AccessTokenImpl(Consts.ACCESS_TOKEN);
-//    private IdentityToken expectedIdToken = null;//new IdentityTokenImpl(Consts.ID_TOKEN);
+    private String username = "testUser";
+    private String password = "testPassword";
+    private String testError = "Some Error";
+    private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
+    private static final IdentityToken expectedIdToken = new IdentityTokenImpl(Consts.ID_TOKEN);
+
+    private Response testResponse = new Response() {
+        @Override
+        public int getStatus() {
+            return 0;
+        }
+
+        @Override
+        public String getResponseText() {
+            return testError;
+        }
 
+        @Override
+        public byte[] getResponseBytes() {
+            return new byte[0];
+        }
+
+        @Override
+        public Map<String, List<String>> getHeaders() {
+            Map<String, List<String>> map =  new HashMap<String, List<String>>();
+            map.put("Location", new LinkedList<String>());
+            return map;
+        }
+    };
 
     @Before
-    public void before(){
-//         rm = Mockito.mock(RegistrationManager.class);
-//        MockitoAnnotations.initMocks(this);
-//        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
-//        doAnswer(new Answer<Void>() {
-//                     @Override
-//                     public Void answer(InvocationOnMock invocation) {
-//                         Object[] args = invocation.getArguments();
-//                         TokenResponseListener tokenListener = (TokenResponseListener) args[2];
-//                         tokenListener.onAuthorizationSuccess(expectedAccessToken, expectedIdToken);
-//                         return null;
-//                     }
-//                 }
-//        ).when(tokenManagerMock).obtainTokens(eq(username), eq(password), any(TokenResponseListener.class));
-//
-//        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
-//
-//        when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
-//        when(appidMock.getBluemixRegionSuffix()).thenReturn(".stubPrefix");
-//        when(mockContext.getPackageManager()).thenReturn(pmMock);
-//        when(pmMock.resolveActivity(eq(any(Intent.class)), 0)).thenReturn(null);
-//        when(pmMock.queryIntentActivities(eq(any(Intent.class)), 0)).thenReturn(null);
-
-
-
-//        oAuthManagerMock = Mockito.mock(OAuthManager.class);
-//        appidMock = Mockito.mock(AppID.class);;
-//        registrationManager = Mockito.mock(RegistrationManager.class);
-
-//        MockitoAnnotations.initMocks(this);
-//        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
-//        when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
-//        mc = Mockito.mock(Context.class);
-
-        PowerMockito.mockStatic(AuthorizationUIManager.class);
-        PowerMockito.doNothing().when(AuthorizationUIManager.class);
-//        AuthorizationUIManager.bindCustomTabsService(mc, any(String.class));
-
-//        authManager = new AuthorizationManager(oAuthManagerMock, mc);
+    public void before() {
+        MockitoAnnotations.initMocks(this);
+        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
+        when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
+        when(appidMock.getBluemixRegionSuffix()).thenReturn(".stubPrefix");
+        when(mockContext.getPackageManager()).thenReturn(pmMock);
+        when(pmMock.resolveActivity(eq(any(Intent.class)), 0)).thenReturn(null);
+        when(pmMock.queryIntentActivities(eq(any(Intent.class)), 0)).thenReturn(null);
+
+        when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
+        doAnswer(new Answer<Void>() {
+                     @Override
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         TokenResponseListener tokenListener = (TokenResponseListener) args[2];
+                         tokenListener.onAuthorizationSuccess(expectedAccessToken, expectedIdToken);
+                         return null;
+                     }
+                 }
+        ).when(tokenManagerMock).obtainTokens(eq(username), eq(password), any(TokenResponseListener.class));
 
+        doAnswer(new Answer<Void>() {
+                     @Override
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         AuthorizationListener authListener = (AuthorizationListener) args[1];
+                         authListener.onAuthorizationSuccess(expectedAccessToken, expectedIdToken);
+                         return null;
+                     }
+                 }
+        ).when(tokenManagerMock).obtainTokens(anyString(), any(AuthorizationListener.class));
 
+        authManager = new AuthorizationManager(oAuthManagerMock, mockContext);
     }
 
     @Test
-    public void obtainTokensWithROP_regisrationFailure() {
-
-
-
-
-//        doAnswer(new Answer<Void>() {
-//                    @Override
-//                     public Void answer(InvocationOnMock invocation) {
-//                         Object[] args = invocation.getArguments();
-//                         RegistrationListener regListener = (RegistrationListener) args[1];
-//                         regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
-//                         return null;
-//                     }
-//                 }).when(rm).ensureRegistered(null, eq(any(RegistrationListener.class)));
-//
-//
-//
-//        authManager.obtainTokensWithROP(null, username, password, new TokenResponseListener() {
-//            @Override
-//            public void onAuthorizationFailure(AuthorizationException exception) {
-////                assertThat(exception.getMessage().equals(RegistrationStatus.NOT_REGISTRED.getDescription()));
-//            }
-//
-//            @Override
-//            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
-////                assert(false);
-//            }
-//        });
+    public void obtainTokensWithROP_registrationFailure() {
+
+        doAnswer(new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                RegistrationListener regListener = (RegistrationListener) args[1];
+                regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
+                return null;
+            }
+        }).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
+
+
+        authManager.obtainTokensWithROP(mockContext, username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), RegistrationStatus.NOT_REGISTRED.getDescription());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
     }
 
     @Test
-    public void obtainTokensWithROP_regisrationSuccess() {
-//        doAnswer(new Answer<Void>() {
-//                     public Void answer(InvocationOnMock invocation) {
-//                         Object[] args = invocation.getArguments();
-//                         RegistrationListener regListener = (RegistrationListener) args[1];
-//                         regListener.onRegistrationSuccess();
-//                         return null;
-//                     }
-//                 }
-//        ).when(registrationManager).ensureRegistered(RuntimeEnvironment.application, eq(any(RegistrationListener.class)));
-//
-//        authManager.obtainTokensWithROP(RuntimeEnvironment.application, username, password, new TokenResponseListener() {
-//            @Override
-//            public void onAuthorizationFailure(AuthorizationException exception) {
-//                assert(false);
-//            }
-//
-//            @Override
-//            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
-//                assertThat(accessToken.getRaw().equals(expectedAccessToken));
-//                assertThat(identityToken.getRaw().equals(expectedIdToken));
-//            }
-//        });
+    public void obtainTokensWithROP_registrationSuccess() {
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
+
+        authManager.obtainTokensWithROP(mockContext, username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken.getRaw(), expectedAccessToken.getRaw());
+                assertEquals(identityToken.getRaw(), expectedIdToken.getRaw());
+            }
+        });
+    }
+
+    @Test
+    public void loginAnonymously_success() {
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
+
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onSuccess(testResponse);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class));
+
+        authManager.loginAnonymously(mockContext, expectedAccessToken.getRaw(), true, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken.getRaw(), expectedAccessToken.getRaw());
+                assertEquals(identityToken.getRaw(), expectedIdToken.getRaw());
+            }
+        });
+    }
+
+    @Test
+    public void loginAnonymously_failure() {
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
+
+
+        authManager.loginAnonymously(mockContext, expectedAccessToken.getRaw(), true, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), RegistrationStatus.NOT_REGISTRED.getDescription());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void loginAnonymously_requestFailure() {
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockContext), any(RegistrationListener.class));
+
+        authManager.setAppIDRequestFactory(appIDRequestFactoryMock);
+        when(appIDRequestFactoryMock.createRequest(anyString(), anyString())).thenReturn(mockRequest);
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         ResponseListener responseListener = (ResponseListener) args[0];
+                         responseListener.onFailure(null, new Throwable(testError), null);
+                         return null;
+                     }
+                 }
+        ).when(mockRequest).send(any(ResponseListener.class));
+
+        authManager.loginAnonymously(mockContext, expectedAccessToken.getRaw(), true, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), testError);
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchAuthorizationUI_failure(){
+        Activity activity = new Activity();
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationFailure(RegistrationStatus.NOT_REGISTRED);
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(activity), any(RegistrationListener.class));
+
+        authManager.launchAuthorizationUI(activity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), RegistrationStatus.NOT_REGISTRED.getDescription());
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
+    }
+
+    @Test
+    public void launchAuthorizationUI_success(){
+
+        doAnswer(new Answer<Void>() {
+                     public Void answer(InvocationOnMock invocation) {
+                         Object[] args = invocation.getArguments();
+                         RegistrationListener regListener = (RegistrationListener) args[1];
+                         regListener.onRegistrationSuccess();
+                         return null;
+                     }
+                 }
+        ).when(registrationManager).ensureRegistered(eq(mockActivity), any(RegistrationListener.class));
+
+        when(mockActivity.getApplicationContext()).thenReturn(mockContext);
+        authManager.launchAuthorizationUI(mockActivity, new AuthorizationListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+        });
     }
 }
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
new file mode 100644
index 0000000..d0c85ad
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -0,0 +1,443 @@
+package com.ibm.bluemix.appid.android.internal.tokenmanager;
+
+import com.ibm.bluemix.appid.android.api.AppID;
+import com.ibm.bluemix.appid.android.api.AuthorizationException;
+import com.ibm.bluemix.appid.android.api.AuthorizationListener;
+import com.ibm.bluemix.appid.android.api.TokenResponseListener;
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
+import com.ibm.bluemix.appid.android.internal.OAuthManager;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequest;
+import com.ibm.bluemix.appid.android.internal.preferences.JSONPreference;
+import com.ibm.bluemix.appid.android.internal.preferences.PreferenceManager;
+import com.ibm.bluemix.appid.android.internal.registrationmanager.RegistrationManager;
+import com.ibm.bluemix.appid.android.internal.tokens.AccessTokenImpl;
+import com.ibm.bluemix.appid.android.internal.tokens.IdentityTokenImpl;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
+
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.robolectric.RobolectricTestRunner;
+
+import java.math.BigInteger;
+import java.security.Signature;
+import java.security.interfaces.RSAPrivateKey;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
+
+/**
+ * Created by rotembr on 01/06/2017.
+ */
+@RunWith(RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@PrepareForTest(Signature.class)
+public class TokenManager_Test {
+
+    @Mock
+    private PreferenceManager pmMock;
+    @Mock
+    private OAuthManager oAuthManagerMock;
+    @Mock
+    private AppID appidMock;
+    @Mock
+    private AppIDRequest stubRequest;
+    @Mock
+    private JSONPreference JSONPreferenceMock;
+
+    private TokenManager spyTokenManager;
+    private String username = "testUser";
+    private String password = "testPassword";
+    private String stubClientId = "00001111-1111-1111-1111-123456789012";
+    private String stubRedirectUri = "http://stub";
+    private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
+    private static final IdentityToken expectedIdToken = new IdentityTokenImpl(Consts.ID_TOKEN);
+    private Response testReponse;
+
+    @Before
+    public void before() {
+        MockitoAnnotations.initMocks(this);
+        when(oAuthManagerMock.getAppId()).thenReturn(appidMock);
+        when(oAuthManagerMock.getPreferenceManager()).thenReturn(pmMock);
+        RegistrationManager registrationManager = new RegistrationManager(oAuthManagerMock);
+        RegistrationManager spyRm = Mockito.spy(registrationManager);
+        doReturn(stubClientId).when(spyRm).getRegistrationDataString(anyString());
+        doReturn(stubRedirectUri).when(spyRm).getRegistrationDataString(anyString(), eq(0));
+        doReturn(new RSAPrivateKey() {
+            @Override
+            public BigInteger getPrivateExponent() {
+                return new BigInteger("57791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb1", 16);
+            }
+
+            @Override
+            public String getAlgorithm() {
+                return "RSA256";
+            }
+
+            @Override
+            public String getFormat() {
+                return "UTF8";
+            }
+
+            @Override
+            public byte[] getEncoded() {
+                return new byte[0];
+            }
+
+            @Override
+            public BigInteger getModulus() {
+                return new BigInteger("57791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb157791d5430d593164082036ad8b29fb1", 16);
+            }
+        }).when(spyRm).getPrivateKey();
+        when(oAuthManagerMock.getRegistrationManager()).thenReturn(spyRm);
+        TokenManager tokenManager = new TokenManager(oAuthManagerMock);
+        spyTokenManager = Mockito.spy(tokenManager);
+        when(spyTokenManager.setRequest(anyString(), anyString())).thenReturn(stubRequest);
+        doNothing().when(stubRequest).addHeader(anyString(), anyString());
+    }
+
+    @Test
+    public void obtainTokensRop_success() {
+
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"access_token\": " + expectedAccessToken.getRaw() +", " +
+                        "\"id_token\":" + expectedIdToken.getRaw() + "}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[1];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
+
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken.getRaw(), expectedAccessToken.getRaw());
+                assertEquals(identityToken.getRaw(), expectedIdToken.getRaw());
+            }
+        });
+    }
+
+    @Test
+    public void obtainTokensRop_failure() {
+
+        final String testDescription = "test description error123";
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 400;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"error_code\": \"some-oauth2-error\" , \"error_description\": \"" + testDescription + "\" }";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[1];
+                responseListener.onFailure(testReponse ,null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
+
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to retrieve tokens: " + testDescription);
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+        //test the exceprion parsing
+        testReponse = null;
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to parse server response." );
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+    }
+
+    @Test
+    public void obtainTokensRop_failures_in_parsing_response() {
+        //bad response
+        testReponse = null;
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[1];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
+
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to parse server response");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+        //bad access token
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"access_token\": " + "\"bad access token\"" + ", " +
+                        "\"id_token\":" + expectedIdToken.getRaw() + "}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to parse access_token");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+        //bad id token
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"access_token\": " + expectedAccessToken.getRaw() + ", " +
+                        "\"id_token\":" + "\"bad Id token\"" + "}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to parse id_token");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+    }
+
+
+
+    @Test
+    public void obtainTokens_Authorization_Code_success() {
+
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"access_token\": " + expectedAccessToken.getRaw() +", " +
+                        "\"id_token\":" + expectedIdToken.getRaw() + "}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[1];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
+
+        spyTokenManager.obtainTokens("Some Code", new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken.getRaw(), expectedAccessToken.getRaw());
+                assertEquals(identityToken.getRaw(), expectedIdToken.getRaw());
+            }
+        });
+    }
+
+    @Test
+    public void obtainTokens_Authorization_Code_failure() {
+
+        testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"access_token\": " + expectedAccessToken.getRaw() +", " +
+                        "\"id_token\":" + expectedIdToken.getRaw() + "}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[1];
+                responseListener.onFailure(null, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(Map.class), any(ResponseListener.class));
+
+        spyTokenManager.obtainTokens("Some Code", new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Failed to retrieve tokens");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+
+            }
+        });
+    }
+}

From 8dcf0faeb111094c73aa422651d351f8fe3fb5ac Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Fri, 2 Jun 2017 15:54:08 +0300
Subject: [PATCH 4/8] hiding the Rop section

---
 README.md                                              |  4 ++--
 .../ibm/mobilefirstplatform/appid/MainActivity.java    | 10 ++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index bd59d0d..a8a428d 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ loginWidget.launch(this, new AuthorizationListener() {
 
 The Login widget default configuration use Facebook and Google as authentication options.
 If you configure only one of them the login widget will NOT launch and the user will be redirect to the configured idp authentication screen.
-    
+<!--
 ### Login using Resource Owner Password
 You can obtain access token and id token by supplying the end user's username and the end user's password.
 ```java
@@ -97,7 +97,7 @@ AppID.getInstance().obtainTokensWithROP(getApplicationContext(), username, passw
          }
         });
 ```
- 
+ -->
 ### Anonymous Login
 ```java
 AppID.getInstance().loginAnonymously(getApplicationContext(), new AuthorizationListener() {
diff --git a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
index eeb2608..4b9fc94 100644
--- a/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
+++ b/app/src/main/java/com/ibm/mobilefirstplatform/appid/MainActivity.java
@@ -34,8 +34,8 @@
 
 public class MainActivity extends AppCompatActivity {
 
-    private final static String tenantId = "0b0132c0-9931-478d-b809-27908f014503";//"AppID_tenantId";
-    private final static String region = ".stage1.mybluemix.net";//AppID.REGION_US_SOUTH; //AppID.REGION_UK ,AppID.REGION_SYDNEY
+    private final static String tenantId = "AppID_tenantId";
+    private final static String region = AppID.REGION_US_SOUTH; //AppID.REGION_UK ,AppID.REGION_SYDNEY
     private final static String protectedUrl = "protected_URL";
 
     private final static Logger logger = Logger.getLogger(MainActivity.class.getName());
@@ -58,16 +58,10 @@ protected void onCreate(Bundle savedInstanceState) {
         bmsClient.initialize(this, region);
         // Initialize AppID SDK
         appId = AppID.getInstance();
-
-        //uncomment to run locally
-//        appId.overrideOAuthServerHost = "http://10.0.2.2:6001/oauth/v3/";
-//        appId.overrideUserProfilesHost = "http://10.0.2.2:9080/user";
-
         appId.initialize(this, tenantId, region);
         // Add integration with BMSClient. Optional.
         this.appIDAuthorizationManager = new AppIDAuthorizationManager(this.appId);
         bmsClient.setAuthorizationManager(appIDAuthorizationManager);
-
     }
 
     public void onAnonLoginClick(View v) {

From 486ab20c955d3d6b13f9b606922e4a25bbddb712 Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Fri, 2 Jun 2017 16:05:44 +0300
Subject: [PATCH 5/8] small refactor

---
 .../appid/android/internal/tokenmanager/TokenManager.java | 8 +++-----
 .../android/internal/tokenmanager/TokenManager_Test.java  | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index 4ba7d31..40b3a29 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -29,10 +29,8 @@
 import com.ibm.bluemix.appid.android.internal.tokens.IdentityTokenImpl;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
 import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
-import com.ibm.mobilefirstplatform.clientsdk.android.core.internal.ResponseImpl;
 import com.ibm.mobilefirstplatform.clientsdk.android.logger.api.Logger;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.security.PrivateKey;
@@ -73,7 +71,7 @@ public void obtainTokens (String code, final AuthorizationListener listener) {
 		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 		String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
 
-		AppIDRequest request = setRequest(tokenUrl, "POST");
+		AppIDRequest request = createAppIDRequest(tokenUrl, "POST");
 
 		try {
 			request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
@@ -103,7 +101,7 @@ public void onSuccess (Response response) {
 	}
 
 	//for testing purpose
-    AppIDRequest setRequest(String url, String method) {
+    AppIDRequest createAppIDRequest(String url, String method) {
 		return new AppIDRequest(url, method);
 	}
 
@@ -112,7 +110,7 @@ public void obtainTokens (String username, String password, final TokenResponseL
         String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
         String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 
-        AppIDRequest request = setRequest(tokenUrl, "POST");
+        AppIDRequest request = createAppIDRequest(tokenUrl, "POST");
 
         try {
             request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
index d0c85ad..7f1e59c 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -112,7 +112,7 @@ public BigInteger getModulus() {
         when(oAuthManagerMock.getRegistrationManager()).thenReturn(spyRm);
         TokenManager tokenManager = new TokenManager(oAuthManagerMock);
         spyTokenManager = Mockito.spy(tokenManager);
-        when(spyTokenManager.setRequest(anyString(), anyString())).thenReturn(stubRequest);
+        when(spyTokenManager.createAppIDRequest(anyString(), anyString())).thenReturn(stubRequest);
         doNothing().when(stubRequest).addHeader(anyString(), anyString());
     }
 

From 191a5e06d45a1a75163d763f2777f310607bcc97 Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Fri, 2 Jun 2017 18:13:51 +0300
Subject: [PATCH 6/8] small code refactor

---
 .../internal/tokenmanager/TokenManager.java   | 75 +++++++------------
 .../tokenmanager/TokenManager_Test.java       |  4 +-
 2 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index 40b3a29..9084332 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -66,11 +66,27 @@ public TokenManager (OAuthManager oAuthManager) {
 
 	public void obtainTokens (String code, final AuthorizationListener listener) {
 		logger.debug("obtainTokens");
-		String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
-
 		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
 		String redirectUri = registrationManager.getRegistrationDataString(RegistrationManager.REDIRECT_URIS, 0);
 
+		HashMap<String, String> formParams = new HashMap<>();
+		formParams.put(CODE, code);
+		formParams.put(CLIENT_ID, clientId);
+		formParams.put(GRANT_TYPE, GRANT_TYPE_AUTH_CODE);
+		formParams.put(REDIRECT_URI, redirectUri);
+
+		retrieveTokens(formParams, listener);
+	}
+
+	//for testing purpose
+    AppIDRequest createAppIDRequest(String url, String method) {
+		return new AppIDRequest(url, method);
+	}
+
+	private void retrieveTokens(HashMap<String, String> formParams, final TokenResponseListener listener) {
+		String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
+		String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
+
 		AppIDRequest request = createAppIDRequest(tokenUrl, "POST");
 
 		try {
@@ -80,17 +96,19 @@ public void obtainTokens (String code, final AuthorizationListener listener) {
 			return;
 		}
 
-		HashMap<String, String> formParams = new HashMap<>();
-		formParams.put(CODE, code);
-		formParams.put(CLIENT_ID, clientId);
-		formParams.put(GRANT_TYPE, GRANT_TYPE_AUTH_CODE);
-		formParams.put(REDIRECT_URI, redirectUri);
-
 		request.send(formParams, new ResponseListener() {
 			@Override
 			public void onFailure (Response response, Throwable t, JSONObject extendedInfo) {
 				logger.error("Failed to retrieve tokens from authorization server", t);
-				listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
+				String error_description = "";
+				try {
+					JSONObject responseJSON = new JSONObject(response.getResponseText());
+					error_description = responseJSON.getString(ERROR_DESCRIPTION);
+					listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + error_description));
+				} catch (Exception e) {
+					logger.error("Failed to retrieve tokens from authorization server", t);
+					listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
+				}
 			}
 
 			@Override
@@ -100,50 +118,15 @@ public void onSuccess (Response response) {
 		});
 	}
 
-	//for testing purpose
-    AppIDRequest createAppIDRequest(String url, String method) {
-		return new AppIDRequest(url, method);
-	}
-
 	public void obtainTokens (String username, String password, final TokenResponseListener listener) {
 		logger.debug("obtainTokens - with resource owner password");
-        String tokenUrl = Config.getOAuthServerUrl(appId) + OAUTH_TOKEN_PATH;
-        String clientId = registrationManager.getRegistrationDataString(RegistrationManager.CLIENT_ID);
-
-        AppIDRequest request = createAppIDRequest(tokenUrl, "POST");
 
-        try {
-            request.addHeader(AUTHORIZATION_HEADER, createAuthenticationHeader(clientId));
-        } catch (Exception e) {
-            logger.error("Failed to create authentication header", e);
-            return;
-        }
-
-        HashMap<String, String> formParams = new HashMap<>();
+		HashMap<String, String> formParams = new HashMap<>();
         formParams.put(USERNAME, username);
         formParams.put(PASSWORD, password);
         formParams.put(GRANT_TYPE, GRANT_TYPE_PASSWORD);
 
-        request.send(formParams, new ResponseListener() {
-            @Override
-            public void onFailure (Response response, Throwable t, JSONObject extendedInfo) {
-                logger.error("Failed to retrieve tokens from authorization server", t);
-                String error_description = "";
-                try {
-					JSONObject responseJSON = new JSONObject(response.getResponseText());
-					error_description = responseJSON.getString(ERROR_DESCRIPTION);
-                    listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + error_description));
-                } catch (Exception e) {
-                    logger.error("Failed to parse server response", e);
-                    listener.onAuthorizationFailure(new AuthorizationException("Failed to parse server response."));
-                }
-            }
-
-            @Override
-            public void onSuccess (Response response) {
-                extractTokens(response, listener);
-            }
-        });
+		retrieveTokens(formParams, listener);
 	}
 
 	private String createAuthenticationHeader (String clientId) throws Exception {
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
index 7f1e59c..de02b04 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -214,12 +214,12 @@ public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identi
 
             }
         });
-        //test the exceprion parsing
+        //test the exception parsing
         testReponse = null;
         spyTokenManager.obtainTokens(username, password, new TokenResponseListener() {
             @Override
             public void onAuthorizationFailure(AuthorizationException exception) {
-                assertEquals(exception.getMessage(), "Failed to parse server response." );
+                assertEquals(exception.getMessage(), "Failed to retrieve tokens" );
             }
 
             @Override

From 2408e6fe4979d5dbc25c1e8091481bb6954a71fe Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Mon, 5 Jun 2017 15:48:25 +0300
Subject: [PATCH 7/8] fix issue when printing error msg from cloud directory

---
 .../internal/tokenmanager/TokenManager.java      | 16 ++++++++++++----
 .../internal/tokenmanager/TokenManager_Test.java |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
index 9084332..cae0793 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager.java
@@ -58,6 +58,8 @@ public class TokenManager {
     private final static String PASSWORD = "password";
     private final static String GRANT_TYPE_PASSWORD = "password";
     private final static String ERROR_DESCRIPTION= "error_description";
+    private final static String ERROR_CODE= "error";
+    private final static String INVALID_GRANT= "invalid_grant";
 
 	public TokenManager (OAuthManager oAuthManager) {
 		this.appId = oAuthManager.getAppId();
@@ -100,11 +102,17 @@ private void retrieveTokens(HashMap<String, String> formParams, final TokenRespo
 			@Override
 			public void onFailure (Response response, Throwable t, JSONObject extendedInfo) {
 				logger.error("Failed to retrieve tokens from authorization server", t);
-				String error_description = "";
+				String errorDescription = "";
 				try {
-					JSONObject responseJSON = new JSONObject(response.getResponseText());
-					error_description = responseJSON.getString(ERROR_DESCRIPTION);
-					listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + error_description));
+					if (response.getStatus() == 400) {
+                        JSONObject responseJSON = new JSONObject(response.getResponseText());
+                        if (INVALID_GRANT.equals(responseJSON.getString(ERROR_CODE))) {
+                            errorDescription = responseJSON.getString(ERROR_DESCRIPTION);
+                            listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens: " + errorDescription));
+                            return;
+                        }
+                    }
+                    listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
 				} catch (Exception e) {
 					logger.error("Failed to retrieve tokens from authorization server", t);
 					listener.onAuthorizationFailure(new AuthorizationException("Failed to retrieve tokens"));
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
index de02b04..3d944c6 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -178,7 +178,7 @@ public int getStatus() {
 
             @Override
             public String getResponseText() {
-                return "{\"error_code\": \"some-oauth2-error\" , \"error_description\": \"" + testDescription + "\" }";
+                return "{\"error\": \"invalid_grant\" , \"error_description\": \"" + testDescription + "\" }";
             }
 
             @Override

From 1a5c79f1d9f0057713eee3ef10aa159ab7093445 Mon Sep 17 00:00:00 2001
From: rotembr <rotembr@il.ibm.com>
Date: Tue, 6 Jun 2017 21:33:22 +0300
Subject: [PATCH 8/8] added unit test - coverage 82% + some small code changes
 for testing

---
 .../userattributes/UserAttributeManager.java  |   8 +-
 .../UserAttributesException.java              |   5 +
 .../AuthorizationUIManager.java               |  21 +-
 .../UserAttributeManagerImpl.java             |  28 +-
 .../ibm/bluemix/appid/android/TestSuite.java  |  12 +-
 .../api/AppIDAuthorizationManager_Test.java   |  87 +++
 .../AuthorizationManager_Test.java            |  15 +-
 .../AuthorizationUIManager_Test.java          | 203 ++++++
 .../loginwidget/LoginWidgetImpl_Test.java     | 132 ++++
 .../network/AppIDRequestFactory_Test.java     |  30 +
 .../internal/network/AppIDRequest_Test.java   | 124 ++++
 .../tokenmanager/TokenManager_Test.java       |  16 +-
 .../UserAttributeManagerImpl_Test.java        | 684 ++++++++++++++++++
 13 files changed, 1337 insertions(+), 28 deletions(-)
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager_Test.java
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequestFactory_Test.java
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
 create mode 100644 lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java

diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributeManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributeManager.java
index 6f41cf1..777c8a2 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributeManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributeManager.java
@@ -19,14 +19,14 @@
 
 public interface UserAttributeManager {
 	void setAttribute(@NonNull String name, @NonNull String value, UserAttributeResponseListener listener);
-	void setAttribute(@NonNull String name, @NonNull String value, @NonNull AccessToken accessToken, UserAttributeResponseListener listener);
+	void setAttribute(@NonNull String name, @NonNull String value, AccessToken accessToken, UserAttributeResponseListener listener);
 
 	void getAttribute(@NonNull String name, UserAttributeResponseListener listener);
-	void getAttribute(@NonNull String name, @NonNull AccessToken accessToken, UserAttributeResponseListener listener);
+	void getAttribute(@NonNull String name, AccessToken accessToken, UserAttributeResponseListener listener);
 
 	void deleteAttribute(@NonNull String name, UserAttributeResponseListener listener);
-	void deleteAttribute(@NonNull String name, @NonNull AccessToken accessToken, UserAttributeResponseListener listener);
+	void deleteAttribute(@NonNull String name, AccessToken accessToken, UserAttributeResponseListener listener);
 
 	void getAllAttributes(@NonNull UserAttributeResponseListener listener);
-	void getAllAttributes(@NonNull AccessToken accessToken, @NonNull UserAttributeResponseListener listener);
+	void getAllAttributes(AccessToken accessToken, @NonNull UserAttributeResponseListener listener);
 }
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributesException.java b/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributesException.java
index 0d36b34..7083a2d 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributesException.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/api/userattributes/UserAttributesException.java
@@ -30,6 +30,11 @@ public String getDescription(){
 			public String getDescription(){
 				return "Access to attribute is unauthorized";
 			}
+		},
+		JSON_PARSE_ERROR {
+			public String getDescription(){
+				return "Response text is not a valid JSON format";
+			}
 		};
 
 		public abstract String getDescription();
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
index 4eff6c8..db08061 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager.java
@@ -46,9 +46,9 @@ class AuthorizationUIManager {
     private static final String DEV_PACKAGE = "com.chrome.dev";
     private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
     private static final String ACTION_CUSTOM_TABS_CONNECTION = "android.support.customtabs.action.CustomTabsService";
-    public static final String EXTRA_URL = "com.ibm.bluemix.appid.android.URL";
-    public static final String EXTRA_AUTH_FLOW_CONTEXT_GUID = "com.ibm.bluemix.appid.android.AUTH_FLOW_CONTEXT_GUID";
-    public static final String EXTRA_REDIRECT_URL = "com.ibm.bluemix.appid.android.REDIRECT_URL";
+    static final String EXTRA_URL = "com.ibm.bluemix.appid.android.URL";
+    static final String EXTRA_AUTH_FLOW_CONTEXT_GUID = "com.ibm.bluemix.appid.android.AUTH_FLOW_CONTEXT_GUID";
+    static final String EXTRA_REDIRECT_URL = "com.ibm.bluemix.appid.android.REDIRECT_URL";
 
     private static CustomTabsClient mClient;
     private static  CustomTabsSession mCustomTabsSession;
@@ -64,13 +64,18 @@ class AuthorizationUIManager {
     private static boolean isChromeTabSupported = true;
 
     // TODO: document
-    public AuthorizationUIManager(OAuthManager oAuthManager, AuthorizationListener authorizationListener, String serverUrl, String redirectUrl) {
+    AuthorizationUIManager(OAuthManager oAuthManager, AuthorizationListener authorizationListener, String serverUrl, String redirectUrl) {
         this.oAuthManager = oAuthManager;
         this.authorizationListener = authorizationListener;
         this.serverUrl = serverUrl;
         this.redirectUrl = redirectUrl;
     }
 
+    //for testing
+    Intent createChromeTabIntent(Activity activity) {
+        return new Intent(activity, ChromeTabActivity.class);
+    }
+
     public void launch(final Activity activity) {
         final Context context = activity.getApplicationContext();
         String authFlowContextGuid = UUID.randomUUID().toString();
@@ -86,12 +91,11 @@ public void launch(final Activity activity) {
         } else {
             // Use Chrome tabs
             logger.debug("Launching ChromeTabActivity");
-            Intent intent = new Intent(activity, ChromeTabActivity.class);
+            Intent intent = createChromeTabIntent(activity);
             intent.putExtra(EXTRA_AUTH_FLOW_CONTEXT_GUID, authFlowContextGuid);
             intent.putExtra(EXTRA_REDIRECT_URL, redirectUrl);
             intent.putExtra(EXTRA_URL, serverUrl);
             // Open ChromeTabActivity that will open the ChromeTab on top of it
-            intent.putExtra(EXTRA_URL, serverUrl);
             activity.startActivity(intent);
         }
     }
@@ -230,5 +234,10 @@ public void onNavigationEvent(int navigationEvent, Bundle extras) {
         return mCustomTabsSession;
     }
 
+    //for testing
+    void reset_sPackageNameToUse(){
+        sPackageNameToUse = null;
+    }
+
 }
 
diff --git a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
index fa9bede..7927084 100644
--- a/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
+++ b/lib/src/main/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl.java
@@ -45,16 +45,14 @@ public UserAttributeManagerImpl(TokenManager tokenManager){
 
 	@Override
 	public void setAttribute (@NonNull String name, @NonNull String value, UserAttributeResponseListener listener) {
-
 		this.setAttribute(name, value, null, listener);
 	}
 
 	@Override
-	public void setAttribute (@NonNull String name, @NonNull String value, @NonNull AccessToken accessToken, final UserAttributeResponseListener listener) {
-		if(accessToken == null){
+	public void setAttribute (@NonNull String name, @NonNull String value, AccessToken accessToken, final UserAttributeResponseListener listener) {
+		if(accessToken == null) {
 			accessToken = tokenManager.getLatestAccessToken();
 		}
-
 		sendProtectedRequest(AppIDRequest.PUT, name, value, accessToken, listener);
 	}
 
@@ -64,7 +62,7 @@ public void getAttribute (@NonNull String name, UserAttributeResponseListener li
 	}
 
 	@Override
-	public void getAttribute (@NonNull String name, @NonNull AccessToken accessToken, UserAttributeResponseListener listener) {
+	public void getAttribute (@NonNull String name, AccessToken accessToken, UserAttributeResponseListener listener) {
 		if(accessToken == null){
 			accessToken = tokenManager.getLatestAccessToken();
 		}
@@ -77,7 +75,7 @@ public void deleteAttribute (@NonNull String name, UserAttributeResponseListener
 	}
 
 	@Override
-	public void deleteAttribute (@NonNull String name, @NonNull AccessToken accessToken, UserAttributeResponseListener listener) {
+	public void deleteAttribute (@NonNull String name, AccessToken accessToken, UserAttributeResponseListener listener) {
 		if(accessToken == null){
 			accessToken = tokenManager.getLatestAccessToken();
 		}
@@ -90,18 +88,27 @@ public void getAllAttributes(@NonNull UserAttributeResponseListener listener) {
 	}
 
 	@Override
-	public void getAllAttributes(@NonNull AccessToken accessToken, @NonNull UserAttributeResponseListener listener) {
-		if(accessToken == null){
+	public void getAllAttributes(AccessToken accessToken, @NonNull UserAttributeResponseListener listener) {
+		if (accessToken == null) {
 			accessToken = tokenManager.getLatestAccessToken();
 		}
 		sendProtectedRequest(AppIDRequest.GET, null, null, accessToken, listener);
 	}
 
+	//for testing purpose
+	AppIDRequest createAppIDRequest(String url, String method) {
+		return new AppIDRequest(url, method);
+	}
+    //for testing purpose
+    RequestBody createRequestBody(String value) {
+        return RequestBody.create(MediaType.parse("application/json"), value);
+    }
+
 	private void sendProtectedRequest(String method, String name, String value, AccessToken accessToken, final UserAttributeResponseListener listener){
 		String url = Config.getUserProfilesServerUrl(AppID.getInstance()) + USER_PROFILE_ATTRIBUTES_PATH;
 		url = (name == null || name.length() == 0) ? url : url  + '/' + name;
 
-		AppIDRequest req = new AppIDRequest(url, method);
+		AppIDRequest req = createAppIDRequest(url, method);
 
 		ResponseListener resListener = new ResponseListener() {
 			@Override
@@ -111,6 +118,7 @@ public void onSuccess(Response response) {
 				try {
 					listener.onSuccess(new JSONObject(responseText));
 				} catch (JSONException e) {
+					listener.onFailure(new UserAttributesException(UserAttributesException.Error.JSON_PARSE_ERROR));
 					e.printStackTrace();
 				}
 			}
@@ -134,7 +142,7 @@ public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
 		};
 
 		RequestBody requestBody =
-				(value == null || value.length() == 0) ? null : RequestBody.create(MediaType.parse("application/json"), value);
+				(value == null || value.length() == 0) ? null : createRequestBody(value);
 
 		req.send (resListener, requestBody, accessToken);
 	}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java b/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
index 8dd27a1..a0fcb54 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/TestSuite.java
@@ -22,11 +22,16 @@
 import com.ibm.bluemix.appid.android.api.tokens.OAuthClient_Test;
 import com.ibm.bluemix.appid.android.api.userattributes.UserAttributesException_Test;
 import com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationManager_Test;
+import com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationUIManager_Test;
 import com.ibm.bluemix.appid.android.internal.helpers.AuthorizationHeaderHelper_Test;
+import com.ibm.bluemix.appid.android.internal.loginwidget.LoginWidgetImpl_Test;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequestFactory_Test;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequest_Test;
 import com.ibm.bluemix.appid.android.internal.preferences.JSONPreference_Test;
 import com.ibm.bluemix.appid.android.internal.preferences.StringPreference_Test;
 import com.ibm.bluemix.appid.android.internal.tokenmanager.TokenManager_Test;
 import com.ibm.bluemix.appid.android.internal.tokens.AbstractToken_Test;
+import com.ibm.bluemix.appid.android.internal.userattributesmanager.UserAttributeManagerImpl_Test;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -50,6 +55,11 @@
 		JSONPreference_Test.class,
 		Config_Test.class,
 		AuthorizationManager_Test.class,
-        TokenManager_Test.class
+        TokenManager_Test.class,
+		AuthorizationUIManager_Test.class,
+		UserAttributeManagerImpl_Test.class,
+		AppIDRequest_Test.class,
+		AppIDRequestFactory_Test.class,
+		LoginWidgetImpl_Test.class
 })
 public class TestSuite {}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
index e375c6d..f3bb71e 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/api/AppIDAuthorizationManager_Test.java
@@ -13,6 +13,7 @@
 
 package com.ibm.bluemix.appid.android.api;
 
+import android.app.Activity;
 import android.os.Build;
 
 import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
@@ -25,17 +26,23 @@
 import com.ibm.bluemix.appid.android.testing.helpers.Consts;
 import com.ibm.bluemix.appid.android.testing.mocks.HttpURLConnection_Mock;
 import com.ibm.mobilefirstplatform.appid_clientsdk_android.BuildConfig;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
 import com.ibm.mobilefirstplatform.clientsdk.android.security.api.AppIdentity;
 import com.ibm.mobilefirstplatform.clientsdk.android.security.api.DeviceIdentity;
 import com.ibm.mobilefirstplatform.clientsdk.android.security.api.UserIdentity;
 
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.mockito.Mock;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -47,6 +54,7 @@
 import java.util.Map;
 
 
+import static junit.framework.Assert.assertEquals;
 import static org.assertj.core.api.Java6Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -182,4 +190,83 @@ public void testLogout(){
 		appIdAuthManager.logout(RuntimeEnvironment.application, null);
 		verify(tokenManagerMock, times(2)).clearStoredTokens();
 	}
+
+	@Test
+	public void obtainAuthorization_test_onAuthorizationSuccess(){
+		Mockito.doAnswer(new Answer() {
+			@Override
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				Object[] args = invocation.getArguments();
+				AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+				authorizationListener.onAuthorizationSuccess(accessToken,idToken);
+				return null;
+			}
+		}).when(authorizationManagerMock).launchAuthorizationUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+		appIdAuthManager.obtainAuthorization(Mockito.mock(Activity.class), new ResponseListener() {
+			@Override
+			public void onSuccess(Response response) {
+                assertEquals(response, null);
+			}
+
+			@Override
+			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+				fail("should get to onSuccess");
+			}
+		}, null);
+	}
+
+	@Test
+	public void obtainAuthorization_test_onAuthorizationFailure(){
+		Mockito.doAnswer(new Answer() {
+			@Override
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				Object[] args = invocation.getArguments();
+				AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+				authorizationListener.onAuthorizationFailure(new AuthorizationException("test exception"));
+				return null;
+			}
+		}).when(authorizationManagerMock).launchAuthorizationUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+		appIdAuthManager.obtainAuthorization(Mockito.mock(Activity.class), new ResponseListener() {
+			@Override
+			public void onSuccess(Response response) {
+				fail("should get to onFailure");
+			}
+
+			@Override
+			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+				assertEquals(t.getMessage(), "test exception");
+			}
+		}, null);
+	}
+
+	@Test
+	public void obtainAuthorization_test_onAuthorizationCanceled(){
+		Mockito.doAnswer(new Answer() {
+			@Override
+			public Object answer(InvocationOnMock invocation) throws Throwable {
+				Object[] args = invocation.getArguments();
+				AuthorizationListener authorizationListener = (AuthorizationListener) args[1];
+				authorizationListener.onAuthorizationCanceled();
+				return null;
+			}
+		}).when(authorizationManagerMock).launchAuthorizationUI(any(Activity.class), any(AuthorizationListener.class));
+
+
+		appIdAuthManager.obtainAuthorization(Mockito.mock(Activity.class), new ResponseListener() {
+			@Override
+			public void onSuccess(Response response) {
+				fail("should get to onFailure");
+			}
+
+			@Override
+			public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+				assertEquals(t.getMessage(), "Authorization canceled");
+			}
+		}, null);
+	}
+
 }
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
index 4263f40..789b4d9 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationManager_Test.java
@@ -1,8 +1,19 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
 package com.ibm.bluemix.appid.android.internal.authorizationmanager;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.Intent;
 import android.content.pm.PackageManager;
 
 import com.ibm.bluemix.appid.android.api.AppID;
@@ -111,8 +122,6 @@ public void before() {
         when(oAuthManagerMock.getRegistrationManager()).thenReturn(registrationManager);
         when(appidMock.getBluemixRegionSuffix()).thenReturn(".stubPrefix");
         when(mockContext.getPackageManager()).thenReturn(pmMock);
-        when(pmMock.resolveActivity(eq(any(Intent.class)), 0)).thenReturn(null);
-        when(pmMock.queryIntentActivities(eq(any(Intent.class)), 0)).thenReturn(null);
 
         when(oAuthManagerMock.getTokenManager()).thenReturn(tokenManagerMock);
         doAnswer(new Answer<Void>() {
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager_Test.java
new file mode 100644
index 0000000..c18ca82
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/authorizationmanager/AuthorizationUIManager_Test.java
@@ -0,0 +1,203 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+package com.ibm.bluemix.appid.android.internal.authorizationmanager;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+import com.ibm.bluemix.appid.android.api.AuthorizationException;
+import com.ibm.bluemix.appid.android.api.AuthorizationListener;
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
+import com.ibm.bluemix.appid.android.internal.OAuthManager;
+
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationUIManager.EXTRA_REDIRECT_URL;
+import static com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationUIManager.EXTRA_URL;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class AuthorizationUIManager_Test {
+
+    @Mock
+    private Context mockContext;
+    @Mock
+    private OAuthManager mockOAuthManager;
+    @Mock
+    private PackageManager pmMock;
+    @Mock
+    private ResolveInfo resolveInfoMock;
+    @Mock
+    private ResolveInfo resolveInfoMock2;
+    @Mock
+    private ActivityInfo activityInfoMock;
+    @Mock
+    private ActivityInfo activityInfoMock2;
+    @Mock
+    private Activity activityMock;
+
+    private AuthorizationListener authorizationListener;
+    private static final String STABLE_PACKAGE = "com.android.chrome";
+    private static final String BETA_PACKAGE = "com.chrome.beta";
+    private static final String DEV_PACKAGE = "com.chrome.dev";
+    private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
+    private Intent spyIntent = Mockito.spy(new Intent());
+    private AuthorizationUIManager authorizationUIManager;
+    private AuthorizationUIManager authorizationUIManagerSpy;
+    private List<ResolveInfo> resolveInfos;
+
+    @Before
+    public void before(){
+        MockitoAnnotations.initMocks(this);
+        when(mockContext.getPackageManager()).thenReturn(pmMock);
+        resolveInfos = new ArrayList<>();
+        resolveInfoMock.activityInfo = activityInfoMock;
+        activityInfoMock.packageName = "com.android.chrome_test";
+        resolveInfos.add(resolveInfoMock);
+        when(pmMock.queryIntentActivities(any(Intent.class), eq(0))).thenReturn(resolveInfos);
+        when(pmMock.resolveService(any(Intent.class), eq(0))).thenReturn(resolveInfoMock);
+        Mockito.doReturn(mockContext).when(activityMock).getApplicationContext();
+        authorizationListener = new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationFailure");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                assertEquals(exception.getMessage(), "Could NOT find installed browser that support Chrome tabs on the device.");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                fail("should get to onAuthorizationFailure");
+            }
+        };
+        authorizationUIManager = new AuthorizationUIManager(mockOAuthManager, authorizationListener, "https://serverurlTest", "https://redirectTest");
+        authorizationUIManagerSpy = Mockito.spy(authorizationUIManager);
+        Mockito.doReturn(spyIntent).when(authorizationUIManagerSpy).createChromeTabIntent(activityMock);
+        resolveInfoMock2.activityInfo = activityInfoMock2;
+
+    }
+
+    @Test
+    public void launch_test() {
+        Mockito.reset(spyIntent);
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+
+    @Test
+    public void launch_test_LOCAL_PACKAGE() {
+        Mockito.reset(spyIntent);
+        activityInfoMock2.packageName = LOCAL_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+
+    @Test
+    public void launch_test_DEV_PACKAGE() {
+        Mockito.reset(spyIntent);
+        activityInfoMock2.packageName = DEV_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+    @Test
+    public void launch_test_BETA_PACKAGE() {
+        Mockito.reset(spyIntent);
+        activityInfoMock2.packageName = BETA_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+    @Test
+    public void launch_test_STABLE_PACKAGE() {
+        Mockito.reset(spyIntent);
+        activityInfoMock2.packageName = STABLE_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+
+    @Test
+    public void launch_test_hasSpecializedHandlerIntents_test() {
+        Mockito.reset(spyIntent);
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        activityInfoMock2.packageName = STABLE_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        when(pmMock.resolveActivity(any(Intent.class), eq(0))).thenReturn(resolveInfoMock);
+
+        authorizationUIManagerSpy.launch(activityMock);
+        Mockito.verify(spyIntent).putExtra(EXTRA_REDIRECT_URL, "https://redirectTest");
+        Mockito.verify(spyIntent).putExtra(EXTRA_URL, "https://serverurlTest");
+
+    }
+
+    @Test
+    public void launch_test_hasSpecializedHandlerIntents_return_true() {
+        authorizationUIManagerSpy.reset_sPackageNameToUse();
+        activityInfoMock2.packageName = STABLE_PACKAGE;
+        resolveInfos.add(resolveInfoMock2);
+        IntentFilter mockFilter = Mockito.mock(IntentFilter.class);
+        resolveInfoMock2.filter = mockFilter;
+        resolveInfoMock2.activityInfo = Mockito.mock(ActivityInfo.class);
+        when(mockFilter.countDataAuthorities()).thenReturn(3);
+        when(mockFilter.countDataPaths()).thenReturn(3);
+
+        when(pmMock.resolveActivity(any(Intent.class), eq(0))).thenReturn(resolveInfoMock);
+
+        when(pmMock.queryIntentActivities(any(Intent.class), eq(PackageManager.GET_RESOLVED_FILTER))).thenReturn(resolveInfos);
+
+        authorizationUIManagerSpy.launch(activityMock);
+
+
+    }
+}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
new file mode 100644
index 0000000..44a2021
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/loginwidget/LoginWidgetImpl_Test.java
@@ -0,0 +1,132 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+package com.ibm.bluemix.appid.android.internal.loginwidget;
+
+import android.app.Activity;
+
+import com.ibm.bluemix.appid.android.api.AuthorizationException;
+import com.ibm.bluemix.appid.android.api.AuthorizationListener;
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.tokens.IdentityToken;
+import com.ibm.bluemix.appid.android.internal.OAuthManager;
+import com.ibm.bluemix.appid.android.internal.authorizationmanager.AuthorizationManager;
+import com.ibm.bluemix.appid.android.internal.tokenmanager.TokenManager;
+import com.ibm.bluemix.appid.android.internal.tokens.AccessTokenImpl;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
+
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class LoginWidgetImpl_Test {
+
+    @Mock
+    private OAuthManager oAuthManager;
+    @Mock
+    private AuthorizationManager mockAuthManager;
+    @Mock
+    private TokenManager mockTokenManager;
+
+    private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
+    private LoginWidgetImpl loginWidget;
+    @Before
+    public void before(){
+        MockitoAnnotations.initMocks(this);
+        loginWidget = new LoginWidgetImpl(oAuthManager);
+        when(oAuthManager.getAuthorizationManager()).thenReturn(mockAuthManager);
+        when(oAuthManager.getTokenManager()).thenReturn(mockTokenManager);
+        when(mockTokenManager.getLatestAccessToken()).thenReturn(expectedAccessToken);
+    }
+
+    @Test
+    public void launch_test(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AccessToken accessToken = (AccessToken) args[1];
+                AuthorizationListener authorizationListener = (AuthorizationListener) args[2];
+                authorizationListener.onAuthorizationSuccess(accessToken, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchAuthorizationUI(any(Activity.class), any(AccessToken.class),any(AuthorizationListener.class));
+
+
+        loginWidget.launch(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken, expectedAccessToken);
+            }
+        }, null);
+    }
+
+    @Test
+    public void launch_test_with_access_token(){
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                AccessToken accessToken = (AccessToken) args[1];
+                AuthorizationListener authorizationListener = (AuthorizationListener) args[2];
+                authorizationListener.onAuthorizationSuccess(accessToken, null);
+                return null;
+            }
+        }).when(mockAuthManager).launchAuthorizationUI(any(Activity.class), any(AccessToken.class),any(AuthorizationListener.class));
+
+
+        loginWidget.launch(Mockito.mock(Activity.class), new AuthorizationListener() {
+            @Override
+            public void onAuthorizationCanceled() {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationFailure(AuthorizationException exception) {
+                fail("should get to onAuthorizationSuccess");
+            }
+
+            @Override
+            public void onAuthorizationSuccess(AccessToken accessToken, IdentityToken identityToken) {
+                assertEquals(accessToken.getRaw(), expectedAccessToken.getRaw());
+            }
+        }, expectedAccessToken.getRaw());
+    }
+}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequestFactory_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequestFactory_Test.java
new file mode 100644
index 0000000..00c075a
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequestFactory_Test.java
@@ -0,0 +1,30 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+package com.ibm.bluemix.appid.android.internal.network;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+
+public class AppIDRequestFactory_Test {
+
+    private String testUrl = "testUrl";
+    private String testMethod = "testMethod";
+    @Test
+    public void createRequest_test() {
+        AppIDRequestFactory appIDRequestFactory = new AppIDRequestFactory();
+        AppIDRequest appIDRequest = appIDRequestFactory.createRequest(testUrl, testMethod);
+        assertEquals(appIDRequest.getMethod(), testMethod);
+        assertEquals(appIDRequest.getUrl(), testUrl);
+    }
+}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
new file mode 100644
index 0000000..e2fe9ee
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/network/AppIDRequest_Test.java
@@ -0,0 +1,124 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+package com.ibm.bluemix.appid.android.internal.network;
+
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.internal.tokens.AccessTokenImpl;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
+
+import org.json.JSONObject;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+
+@RunWith(RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class AppIDRequest_Test {
+
+    AppIDRequestFactory appIDRequestFactory = new AppIDRequestFactory();
+    AppIDRequest appIDRequest = appIDRequestFactory.createRequest("testUrl", "testMethod");
+    AppIDRequest spyAppIDRequest = Mockito.spy(appIDRequest);
+    private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
+
+    @Test
+    public void send_test(){
+
+        Mockito.doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                String header = (String) args[0];
+                if (!header.equals("Authorization")) {
+                    fail("header is not Authorization");
+                }
+                return null;
+            }
+        }).when(spyAppIDRequest).removeHeaders(anyString());
+
+        Mockito.doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                String header = (String) args[0];
+                String bearerPlusToken = (String) args[1];
+                if (!header.equals("Authorization")) {
+                    fail("header is not Authorization");
+                }
+                if (!bearerPlusToken.equals("Bearer " + expectedAccessToken.getRaw())) {
+                    fail("addHeader params mismatch");
+                }
+                return null;
+            }
+        }).when(spyAppIDRequest).addHeader(anyString(),anyString());
+
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return null;
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        Mockito.doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(spyAppIDRequest).send(any(ResponseListener.class));
+
+
+        spyAppIDRequest.send(new ResponseListener() {
+            @Override
+            public void onSuccess(Response response) {
+                assertEquals(response.getStatus(), 200);
+            }
+
+            @Override
+            public void onFailure(Response response, Throwable t, JSONObject extendedInfo) {
+                fail("should get to onSuccess");
+            }
+        }, null, expectedAccessToken);
+    }
+}
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
index 3d944c6..f664a44 100644
--- a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/tokenmanager/TokenManager_Test.java
@@ -1,3 +1,15 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
 package com.ibm.bluemix.appid.android.internal.tokenmanager;
 
 import com.ibm.bluemix.appid.android.api.AppID;
@@ -46,12 +58,8 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
-/**
- * Created by rotembr on 01/06/2017.
- */
 @RunWith(RobolectricTestRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@PrepareForTest(Signature.class)
 public class TokenManager_Test {
 
     @Mock
diff --git a/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java
new file mode 100644
index 0000000..ecaf5ef
--- /dev/null
+++ b/lib/src/test/java/com/ibm/bluemix/appid/android/internal/userattributesmanager/UserAttributeManagerImpl_Test.java
@@ -0,0 +1,684 @@
+/*
+	Copyright 2017 IBM Corp.
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+*/
+package com.ibm.bluemix.appid.android.internal.userattributesmanager;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.ibm.bluemix.appid.android.api.AppID;
+import com.ibm.bluemix.appid.android.api.tokens.AccessToken;
+import com.ibm.bluemix.appid.android.api.userattributes.UserAttributeResponseListener;
+import com.ibm.bluemix.appid.android.api.userattributes.UserAttributesException;
+import com.ibm.bluemix.appid.android.internal.network.AppIDRequest;
+import com.ibm.bluemix.appid.android.internal.tokenmanager.TokenManager;
+import com.ibm.bluemix.appid.android.internal.tokens.AccessTokenImpl;
+import com.ibm.bluemix.appid.android.testing.helpers.Consts;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.Response;
+import com.ibm.mobilefirstplatform.clientsdk.android.core.api.ResponseListener;
+import com.squareup.okhttp.RequestBody;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+import java.util.Map;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class UserAttributeManagerImpl_Test {
+
+    @Mock
+    private RequestBody stubRequestBody;
+    @Mock
+    private AppIDRequest stubRequest;
+    @Mock
+    private AppIDRequest specificStubRequest;
+    @Mock
+    private TokenManager tokenManagerMock;
+    @Mock
+    private Context mockContext;
+    @Mock
+    private PackageManager pmMock;
+
+    private UserAttributeManagerImpl userAttributeManagerSpy;
+    private static final AccessToken expectedAccessToken = new AccessTokenImpl(Consts.ACCESS_TOKEN);
+
+    @Before
+    public void before(){
+        MockitoAnnotations.initMocks(this);
+        UserAttributeManagerImpl userAttributeManager = new UserAttributeManagerImpl(tokenManagerMock);
+        when(tokenManagerMock.getLatestAccessToken()).thenReturn(expectedAccessToken);
+        userAttributeManagerSpy = Mockito.spy(userAttributeManager);
+        Mockito.doReturn(stubRequest).when(userAttributeManagerSpy).createAppIDRequest(anyString(), anyString());
+        when(mockContext.getApplicationContext()).thenReturn(mockContext);
+        when(mockContext.getPackageManager()).thenReturn(pmMock);
+        AppID.getInstance().initialize(mockContext,"00001111-1111-1111-1111-123456789012",".test");
+    }
+
+    @Test
+    public void getAllAttributes_happy_flow() {
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"age\": 30, \"email\":\"test@ibm.com\"}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                try {
+                    assertEquals(attributes.getInt("age"), 30);
+                    assertEquals(attributes.getString("email"), "test@ibm.com");
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void getAllAttributes_happy_flow_null_response_text() {
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return null;
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                assertEquals(attributes.toString(), "{}");
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void getAllAttributes_happy_flow_empty_response_text() {
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                assertEquals(attributes.toString(), "{}");
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void getAllAttributes_request_failure_json_format() {
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "56";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                fail("should get to onFailure");
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                assertEquals(e.getError(), UserAttributesException.Error.JSON_PARSE_ERROR);
+            }
+        });
+    }
+
+    @Test
+    public void getAllAttributes_request_failure() {
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(null, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                fail("should get to onFailure");
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                assertEquals(e.getError(), UserAttributesException.Error.FAILED_TO_CONNECT);
+            }
+        });
+    }
+
+    @Test
+    public void getAllAttributes_request_failure_401() {
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 401;
+            }
+
+            @Override
+            public String getResponseText() {
+                return null;
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(testReponse, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                fail("should get to onFailure");
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                assertEquals(e.getError(), UserAttributesException.Error.UNAUTHORIZED);
+            }
+        });
+    }
+
+    @Test
+    public void getAllAttributes_request_failure_404() {
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 404;
+            }
+
+            @Override
+            public String getResponseText() {
+                return null;
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(testReponse, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(expectedAccessToken, new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                fail("should get to onFailure");
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                assertEquals(e.getError(), UserAttributesException.Error.NOT_FOUND);
+            }
+        });
+    }
+
+    @Test
+    public void getAllAttributes_happy_flow_no_token_supply() {
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"age\": 30, \"email\":\"test@ibm.com\"}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        userAttributeManagerSpy.getAllAttributes(new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                try {
+                    assertEquals(attributes.getInt("age"), 30);
+                    assertEquals(attributes.getString("email"), "test@ibm.com");
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void setAttribute_no_token_supply() {
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(null, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"name\": \"testName\", \"value\":\"testValue\"}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        Mockito.doReturn(specificStubRequest).when(userAttributeManagerSpy).createAppIDRequest(eq("https://appid-profiles.test/api/v1/attributes/testName"), eq(AppIDRequest.PUT));
+        Mockito.doReturn(stubRequestBody).when(userAttributeManagerSpy).createRequestBody(eq("testValue"));
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                if ((RequestBody)args[1] != stubRequestBody){
+                    responseListener.onFailure(null,null,null);
+                }
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(specificStubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+
+
+        userAttributeManagerSpy.setAttribute("testName","testValue",new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                try {
+                    assertEquals(attributes.getString("name"), "testName");
+                    assertEquals(attributes.getString("value"), "testValue");
+                } catch (JSONException e) {
+                    fail(e.getMessage());
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void getAttribute_no_token_supply() {
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(null, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"name\": \"testName\", \"value\":\"testValue\"}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        Mockito.doReturn(specificStubRequest).when(userAttributeManagerSpy).createAppIDRequest(eq("https://appid-profiles.test/api/v1/attributes/testName"), eq(AppIDRequest.GET));
+        Mockito.doReturn(stubRequestBody).when(userAttributeManagerSpy).createRequestBody((String) eq(null));
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                if ((RequestBody)args[1] != null) {
+                    responseListener.onFailure(null,null,null);
+                }
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(specificStubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+
+        userAttributeManagerSpy.getAttribute("testName",new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                try {
+                    assertEquals(attributes.getString("name"), "testName");
+                    assertEquals(attributes.getString("value"), "testValue");
+                } catch (JSONException e) {
+                    fail(e.getMessage());
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+
+    @Test
+    public void deleteAttribute_no_token_supply() {
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                responseListener.onFailure(null, null, null);
+                return null;
+            }
+        }).when(stubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+        final Response testReponse = new Response() {
+            @Override
+            public int getStatus() {
+                return 200;
+            }
+
+            @Override
+            public String getResponseText() {
+                return "{\"name\": \"testName\", \"value\":\"testValue\"}";
+            }
+
+            @Override
+            public byte[] getResponseBytes() {
+                return new byte[0];
+            }
+
+            @Override
+            public Map<String, List<String>> getHeaders() {
+                return null;
+            }
+        };
+
+        Mockito.doReturn(specificStubRequest).when(userAttributeManagerSpy).createAppIDRequest(eq("https://appid-profiles.test/api/v1/attributes/testName"), eq(AppIDRequest.DELETE));
+        Mockito.doReturn(stubRequestBody).when(userAttributeManagerSpy).createRequestBody((String) eq(null));
+
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                ResponseListener responseListener = (ResponseListener) args[0];
+                if ((RequestBody)args[1] != null) {
+                    responseListener.onFailure(null,null,null);
+                }
+                responseListener.onSuccess(testReponse);
+                return null;
+            }
+        }).when(specificStubRequest).send(any(ResponseListener.class), any(RequestBody.class), eq(expectedAccessToken));
+
+
+        userAttributeManagerSpy.deleteAttribute("testName",new UserAttributeResponseListener() {
+            @Override
+            public void onSuccess(JSONObject attributes) {
+                try {
+                    assertEquals(attributes.getString("name"), "testName");
+                    assertEquals(attributes.getString("value"), "testValue");
+                } catch (JSONException e) {
+                    fail(e.getMessage());
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFailure(UserAttributesException e) {
+                fail("should get to onSuccess");
+            }
+        });
+
+    }
+}