Merge pull request #119 from vase4kin/dev

Release 1.2.9
vase4kin · Apr 5, 2018 · 5e90ef0 · 5e90ef0
2 parents 073a4d1 + ac12c83
commit 5e90ef0
Show file tree

Hide file tree

Showing 47 changed files with 776 additions and 341 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![License](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Circle CI](https://circleci.com/gh/vase4kin/TeamCityApp/tree/master.svg?style=shield)](https://circleci.com/gh/vase4kin/TeamCityApp/tree/master)
 [![codecov](https://codecov.io/gh/vase4kin/TeamCityApp/branch/master/graph/badge.svg)](https://codecov.io/gh/vase4kin/TeamCityApp)
-[![Release](https://img.shields.io/badge/release-1.2.8-blue.svg)](https://github.com/vase4kin/TeamCityApp/releases/latest)
+[![Release](https://img.shields.io/badge/release-1.2.9-blue.svg)](https://github.com/vase4kin/TeamCityApp/releases/latest)
 
 ```
                                                                      

diff --git a/...t/java/com/github/vase4kin/teamcityapp/account/create/view/CreateAccountActivityTest.java b/...t/java/com/github/vase4kin/teamcityapp/account/create/view/CreateAccountActivityTest.java
@@ -73,6 +73,7 @@
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_AUTH;
 import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE;
+import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE_UNSAFE;
 import static com.github.vase4kin.teamcityapp.dagger.modules.Mocks.URL;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -109,6 +110,10 @@ public void setComponent(AppComponent appComponent) {
     @Mock
     private OkHttpClient mClientBase;
 
+    @Named(CLIENT_BASE_UNSAFE)
+    @Mock
+    private OkHttpClient unsafeOkHttpClient;
+
     @Named(CLIENT_AUTH)
     @Mock
     private OkHttpClient mClientAuth;
@@ -126,6 +131,7 @@ public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getAppInjector().sharedUserStorage().clearAll();
         when(mClientBase.newCall(Matchers.any(Request.class))).thenReturn(mCall);
+        when(unsafeOkHttpClient.newCall(Matchers.any(Request.class))).thenReturn(mCall);
         mActivityRule.launchActivity(null);
     }
 
@@ -165,6 +171,49 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         SharedUserStorage storageUtils = SharedUserStorage.init(mActivityRule.getActivity(), null);
         assertThat(storageUtils.hasGuestAccountWithUrl(URL), is(true));
         assertThat(storageUtils.getActiveUser().getTeamcityUrl(), is(URL));
+        assertThat(storageUtils.getActiveUser().isSslDisabled(), is(false));
+    }
+
+    /**
+     * Verifies that user can be logged in as guest user with correct account url ignoring ssl
+     */
+    @Test
+    public void testUserCanCreateGuestUserAccountWithCorrectUrlIgnoringSsl() throws Throwable {
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                mCallbackArgumentCaptor.getValue().onResponse(
+                        mCall,
+                        new Response.Builder()
+                                .request(new Request.Builder().url(URL).build())
+                                .protocol(Protocol.HTTP_1_0)
+                                .code(200)
+                                .message("")
+                                .build());
+                return null;
+            }
+        }).when(mCall).enqueue(mCallbackArgumentCaptor.capture());
+
+        onView(withId(R.id.teamcity_url)).perform(typeText(INPUT_URL), closeSoftKeyboard());
+        onView(withId(R.id.guest_user_switch)).perform(click());
+        onView(withId(R.id.disable_ssl_switch)).perform(click());
+        onView(withText(R.string.warning_ssl_dialog_content)).check(matches(isDisplayed()));
+        onView(withText(R.string.dialog_ok_title)).perform(click());
+        onView(withId(R.id.action_create)).perform(click());
+
+        intended(allOf(
+                hasComponent(RootProjectsActivity.class.getName()),
+                hasFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_SINGLE_TOP),
+                hasExtras(allOf(
+                        hasEntry(equalTo(BundleExtractorValues.IS_NEW_ACCOUNT_CREATED), equalTo(true)),
+                        hasEntry(equalTo(BundleExtractorValues.IS_REQUIRED_TO_RELOAD), equalTo(true)))),
+                toPackage("com.github.vase4kin.teamcityapp.mock.debug")));
+
+        SharedUserStorage storageUtils = SharedUserStorage.init(mActivityRule.getActivity(), null);
+        assertThat(storageUtils.hasGuestAccountWithUrl(URL), is(true));
+        assertThat(storageUtils.getActiveUser().getTeamcityUrl(), is(URL));
+        assertThat(storageUtils.getActiveUser().isSslDisabled(), is(true));
     }
 
     /**

diff --git a/...roidTest/java/com/github/vase4kin/teamcityapp/artifact/view/ArtifactListFragmentTest.java b/...roidTest/java/com/github/vase4kin/teamcityapp/artifact/view/ArtifactListFragmentTest.java
@@ -127,7 +127,7 @@ public static void disableOnboarding() {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
         ConditionWatcher.setTimeoutLimit(TIMEOUT);
     }
 

diff --git a/...ndroidTest/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListActivityTest.java b/...ndroidTest/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListActivityTest.java
@@ -112,7 +112,7 @@ public static void disableOnboarding() {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
     }
 
     @Test

diff --git a/app/src/androidTest/java/com/github/vase4kin/teamcityapp/drawer/DrawerTest.java b/app/src/androidTest/java/com/github/vase4kin/teamcityapp/drawer/DrawerTest.java
@@ -85,7 +85,7 @@ public static void disableOnboarding() {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
         mActivityRule.launchActivity(null);
     }
 

diff --git a/...est/java/com/github/vase4kin/teamcityapp/filter_builds/view/FilterBuildsActivityTest.java b/...est/java/com/github/vase4kin/teamcityapp/filter_builds/view/FilterBuildsActivityTest.java
@@ -100,7 +100,7 @@ public static void disableOnboarding() {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
         when(mTeamCityService.listBuilds(anyString(), anyString())).thenReturn(Observable.just(new Builds(0, Collections.<Build>emptyList())));
     }
 

diff --git a/.../github/vase4kin/teamcityapp/filter_builds/view/FilterBuildsBranchesAutoCompleteTest.java b/.../github/vase4kin/teamcityapp/filter_builds/view/FilterBuildsBranchesAutoCompleteTest.java
@@ -92,7 +92,7 @@ public void setComponent(RestApiComponent restApiComponent) {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
     }
 
     @Test

diff --git a/app/src/androidTest/java/com/github/vase4kin/teamcityapp/login/view/LoginActivityTest.java b/app/src/androidTest/java/com/github/vase4kin/teamcityapp/login/view/LoginActivityTest.java
@@ -69,6 +69,7 @@
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_AUTH;
 import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE;
+import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE_UNSAFE;
 import static com.github.vase4kin.teamcityapp.dagger.modules.Mocks.URL;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -104,7 +105,11 @@ public void setComponent(AppComponent appComponent) {
 
     @Named(CLIENT_BASE)
     @Mock
-    private OkHttpClient mClientBase;
+    private OkHttpClient okHttpClient;
+
+    @Named(CLIENT_BASE_UNSAFE)
+    @Mock
+    private OkHttpClient unsafeOkHttpClient;
 
     @Named(CLIENT_AUTH)
     @Mock
@@ -120,7 +125,8 @@ public void setComponent(AppComponent appComponent) {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getAppInjector().sharedUserStorage().clearAll();
-        when(mClientBase.newCall(Matchers.any(Request.class))).thenReturn(mCall);
+        when(okHttpClient.newCall(Matchers.any(Request.class))).thenReturn(mCall);
+        when(unsafeOkHttpClient.newCall(Matchers.any(Request.class))).thenReturn(mCall);
         mActivityRule.launchActivity(null);
     }
 
@@ -158,6 +164,47 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         SharedUserStorage storageUtils = app.getRestApiInjector().sharedUserStorage();
         assertThat(storageUtils.hasGuestAccountWithUrl(savedUrl), is(true));
         assertThat(storageUtils.getActiveUser().getTeamcityUrl(), is(savedUrl));
+        assertThat(storageUtils.getActiveUser().isSslDisabled(), is(false));
+    }
+
+    /**
+     * Verifies that user can be logged in as guest user with correct account url ignoring ssl
+     */
+    @Test
+    public void testUserCanCreateGuestUserAccountWithCorrectUrlIgnoringSsl() {
+        final String urlWithPath = "https://teamcity.com/server";
+        String savedUrl = urlWithPath.concat("/");
+        doAnswer(new Answer() {
+            @Override
+            public Object answer(InvocationOnMock invocation) throws Throwable {
+                mCallbackArgumentCaptor.getValue().onResponse(
+                        mCall,
+                        new Response.Builder()
+                                .request(new Request.Builder().url(urlWithPath).build())
+                                .protocol(Protocol.HTTP_1_0)
+                                .message(MESSAGE_EMPTY)
+                                .code(200)
+                                .build());
+                return null;
+            }
+        }).when(mCall).enqueue(mCallbackArgumentCaptor.capture());
+
+        onView(withId(R.id.teamcity_url)).perform(typeText(urlWithPath.replace("https://", "")), closeSoftKeyboard());
+        onView(withId(R.id.guest_user_switch)).perform(click());
+        onView(withId(R.id.disable_ssl_switch)).perform(click());
+        onView(withText(R.string.warning_ssl_dialog_content)).check(matches(isDisplayed()));
+        onView(withText(R.string.dialog_ok_title)).perform(click());
+        onView(withId(R.id.btn_login)).perform(click());
+
+        intended(allOf(
+                hasComponent(RootProjectsActivity.class.getName()),
+                hasExtras(hasEntry(equalTo(BundleExtractorValues.IS_NEW_ACCOUNT_CREATED), equalTo(true)))));
+
+        TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
+        SharedUserStorage storageUtils = app.getRestApiInjector().sharedUserStorage();
+        assertThat(storageUtils.hasGuestAccountWithUrl(savedUrl), is(true));
+        assertThat(storageUtils.getActiveUser().getTeamcityUrl(), is(savedUrl));
+        assertThat(storageUtils.getActiveUser().isSslDisabled(), is(true));
     }
 
     /**

diff --git a/.../androidTest/java/com/github/vase4kin/teamcityapp/root/view/RootProjectsActivityTest.java b/.../androidTest/java/com/github/vase4kin/teamcityapp/root/view/RootProjectsActivityTest.java
@@ -91,7 +91,7 @@ public static void disableOnboarding() {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getAppInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
     }
 
     @Test

diff --git a/.../androidTest/java/com/github/vase4kin/teamcityapp/runbuild/view/RunBuildActivityTest.java b/.../androidTest/java/com/github/vase4kin/teamcityapp/runbuild/view/RunBuildActivityTest.java
@@ -118,7 +118,7 @@ public void setComponent(RestApiComponent restApiComponent) {
     public void setUp() {
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
         app.getRestApiInjector().sharedUserStorage().clearAll();
-        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getRestApiInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
     }
 
     @Test

diff --git a/app/src/androidTest/java/com/github/vase4kin/teamcityapp/splash/view/SplashActivityTest.java b/app/src/androidTest/java/com/github/vase4kin/teamcityapp/splash/view/SplashActivityTest.java
@@ -79,7 +79,7 @@ public void setUp() {
     public void testUserNavigatesToRootProjectsActivityIgnored() throws Exception {
         // Prepate data
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
-        app.getAppInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getAppInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
 
         // Launch activity
         mActivityRule.launchActivity(null);
@@ -112,7 +112,7 @@ public void testUserNavigatesToLoginActivityIgnored() throws Exception {
     public void testUserNavigatesToRootProjectsActivity() throws Exception {
         // Prepate data
         TeamCityApplication app = (TeamCityApplication) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
-        app.getAppInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL);
+        app.getAppInjector().sharedUserStorage().saveGuestUserAccountAndSetItAsActive(Mocks.URL, false);
 
         // Launch activity
         mActivityRule.launchActivity(null);

diff --git a/.../main/java/com/github/vase4kin/teamcityapp/account/create/dagger/CreateAccountModule.java b/.../main/java/com/github/vase4kin/teamcityapp/account/create/dagger/CreateAccountModule.java
@@ -45,6 +45,7 @@
 import okhttp3.OkHttpClient;
 
 import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE;
+import static com.github.vase4kin.teamcityapp.dagger.modules.AppModule.CLIENT_BASE_UNSAFE;
 
 @Module
 public class CreateAccountModule {
@@ -63,9 +64,10 @@ CreateAccountView providesCreateAccountView() {
     @Provides
     CreateAccountDataManager providesCreateAccountDataManager(Context context,
                                                               @Named(CLIENT_BASE) OkHttpClient okHttpClient,
+                                                              @Named(CLIENT_BASE_UNSAFE) OkHttpClient unsafeOkHttpClient,
                                                               SharedUserStorage sharedUserStorage,
                                                               UrlFormatter urlFormatter) {
-        return new CreateAccountDataManagerImpl(context, okHttpClient, sharedUserStorage, urlFormatter);
+        return new CreateAccountDataManagerImpl(context, okHttpClient, unsafeOkHttpClient, sharedUserStorage, urlFormatter);
     }
 
     @Provides

diff --git a/...in/java/com/github/vase4kin/teamcityapp/account/create/data/CreateAccountDataManager.java b/...in/java/com/github/vase4kin/teamcityapp/account/create/data/CreateAccountDataManager.java
@@ -30,33 +30,47 @@ public interface CreateAccountDataManager {
      * @param url      - TeamCity server url
      * @param userName - Username
      * @param password - Password
+     * @param isSslDisabled - ssl state
      */
-    void authUser(@NonNull CustomOnLoadingListener<String> listener, String url, String userName, String password);
+    void authUser(@NonNull CustomOnLoadingListener<String> listener,
+                  String url,
+                  String userName,
+                  String password,
+                  boolean isSslDisabled);
 
     /**
      * Server guest auth
      *
      * @param listener - to receive callbacks on {@link com.github.vase4kin.teamcityapp.account.create.presenter.CreateAccountPresenterImpl}
      * @param url      - TeamCity server url
+     * @param isSslDisabled - ssl state
      */
-    void authGuestUser(@NonNull CustomOnLoadingListener<String> listener, String url);
+    void authGuestUser(@NonNull CustomOnLoadingListener<String> listener,
+                       String url,
+                       boolean isSslDisabled);
 
     /**
      * Save user account in the local storage
      *
      * @param url - TeamCity server url
      * @param userName - User name
      * @param password - Password
+     * @param isSslDisabled - ssl state
      * @param listener to receive data save callbacks§
      */
-    void saveNewUserAccount(String serverUrl, String userName, String password, OnLoadingListener<String> listener);
+    void saveNewUserAccount(String serverUrl,
+                            String userName,
+                            String password,
+                            boolean isSslDisabled,
+                            OnLoadingListener<String> listener);
 
     /**
      * Save guest user account in the local storage
      *
      * @param url - TeamCity server url
+     * @param isSslDisabled - ssl state
      */
-    void saveGuestUserAccount(String url);
+    void saveGuestUserAccount(String url, boolean isSslDisabled);
 
     /**
      * Init {@link com.github.vase4kin.teamcityapp.dagger.components.RestApiComponent}