Merge pull request #39 from Onegini/develop

Develop

Author: Robert Szuba

app/build.gradle

@@ -19,18 +19,20 @@ apply plugin: 'me.tatarka.retrolambda'
 
 allprojects {
   apply plugin: 'maven'
-
   repositories {
     mavenLocal()
     mavenCentral()
-    if(project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) {
+    if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password')) {
       maven {
         url "https://repo.onegini.com/artifactory/public"
         credentials {
           username artifactory_user
           password artifactory_password
         }
       }
+    } else {
+      throw new InvalidUserDataException("You must configure the 'artifactory_user' and 'artifactory_password' properties in your project before you can " +
+          "build it.")
     }
   }
 }
@@ -48,8 +50,8 @@ android {
     applicationId "com.onegini.mobile.exampleapp"
     minSdkVersion 16
     targetSdkVersion 23
-    versionCode 3
-    versionName "2.0.0"
+    versionCode 4
+    versionName "2.1.0"
     multiDexEnabled true
   }
   buildTypes {
@@ -59,37 +61,24 @@ android {
     }
   }
   dexOptions {
-    incremental true
     javaMaxHeapSize "4g"
   }
 }
 
 dependencies {
   // Onegini SDK
-  compile 'com.onegini.mobile.sdk.android:onegini-sdk:6.00.01:release@aar'
-
-  // Ocra 100.00.00
-  compile 'com.onegini.misc:og-ocra:100.00.00'
+  compile('com.onegini.mobile.sdk.android:onegini-sdk:6.01.00@aar') {
+    transitive = true
+  }
 
   // Google Support
   compile 'com.android.support:appcompat-v7:23.3.0'
   compile 'com.android.support:cardview-v7:23.3.0'
   compile 'com.android.support:recyclerview-v7:23.3.0'
 
-  // Http Client
-  compile 'com.squareup.okhttp:okhttp:2.4.0'
-  compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
-  // Rest Client
-  compile 'com.squareup.retrofit:retrofit:1.9.0'
   // Google cloud messaging (GCM)
-  compile 'com.google.android.gms:play-services-base:9.6.1'
   compile 'com.google.android.gms:play-services-gcm:9.6.1'
-  // Spongy castle
-  compile 'com.madgag.spongycastle:core:1.54.0.0'
-  compile 'com.madgag.spongycastle:prov:1.54.0.0'
-  compile 'com.madgag.spongycastle:pg:1.54.0.0'
-  compile 'com.madgag.spongycastle:pkix:1.54.0.0'
-  compile 'com.nimbusds:nimbus-jose-jwt:3.6'
+
   // Support for multidex
   compile 'com.android.support:multidex:1.0.1'
   // DI for views

app/src/main/AndroidManifest.xml

@@ -17,21 +17,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.onegini.mobile.exampleapp">
 
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-    <permission
-        android:name="com.onegini.mobile.exampleapp.permission.C2D_MESSAGE"
-        android:protectionLevel="signature"/>
     <uses-permission android:name="org.fidoalliance.uaf.permissions.FIDO_CLIENT"/>
-    <uses-permission android:name="com.onegini.mobile.exampleapp.permission.C2D_MESSAGE"/>
 
     <application
         android:name="android.support.multidex.MultiDexApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+
         <activity
             android:name=".view.activity.SplashScreenActivity"
             android:screenOrientation="portrait">
@@ -92,20 +90,31 @@
             android:parentActivityName=".view.activity.DashboardActivity"
             android:screenOrientation="portrait"/>
 
+        <service
+            android:name=".network.gcm.GCMListenerService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".network.gcm.GCMInstanceIDListenerService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.android.gms.iid.InstanceID"/>
+            </intent-filter>
+        </service>
+
         <receiver
-            android:name=".network.gcm.GCMBroadcastReceiver"
+            android:name="com.google.android.gms.gcm.GcmReceiver"
+            android:exported="true"
             android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
-
                 <category android:name="com.onegini.mobile.exampleapp"/>
-
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
             </intent-filter>
         </receiver>
 
-        <service android:name=".network.gcm.GCMIntentService"/>
-
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version"/>

app/src/main/java/com/onegini/mobile/exampleapp/Constants.java

@@ -18,6 +18,6 @@
 public interface Constants {
   String[] DEFAULT_SCOPES = { "read" };
   String NEW_LINE = "\n";
-  String SPACE = " ";
   String GCM_SENDER_ID = "586427927998";
+  String GCM_REGISTRATION_COMPLETE = "gmc_registration_complete";
 }

app/src/main/java/com/onegini/mobile/exampleapp/OneginiConfigModel.java

@@ -18,16 +18,16 @@
 import android.os.Build;
 import com.onegini.mobile.sdk.android.model.OneginiClientConfigModel;
 
+@SuppressWarnings("unused")
 public class OneginiConfigModel implements OneginiClientConfigModel {
 
   private final String appIdentifier = "ExampleApp";
   private final String appPlatform = "android";
   private final String redirectionUri = "oneginiexample://loginsuccess";
-  private final String appVersion = "2.0.0";
+  private final String appVersion = "2.1.0";
   private final String baseURL = "https://demo-msp.onegini.com";
   private final String resourceBaseURL = "https://demo-msp.onegini.com/resources";
   private final String keystoreHash = "910638c3e6c17ec9ab2a74969abab06b34470d29c21d8ad8a65af243a1ccb69f";
-  private final int maxPinFailures = 3;
 
   @Override
   public String getAppIdentifier() {
@@ -79,11 +79,6 @@ public boolean shouldGetIdToken() {
     return false;
   }
 
-  @Override
-  public int getMaxPinFailures() {
-    return maxPinFailures;
-  }
-
   @Override
   public String toString() {
     return "ConfigModel{" +
@@ -92,7 +87,6 @@ public String toString() {
         ", redirectionUri='" + redirectionUri + "'" +
         ", appVersion='" + appVersion + "'" +
         ", baseURL='" + baseURL + "'" +
-        ", maxPinFailures='" + maxPinFailures + "'" +
         ", resourceBaseURL='" + resourceBaseURL + "'" +
         "}";
   }

app/src/main/java/com/onegini/mobile/exampleapp/network/gcm/GCMBroadcastReceiver.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2016 Onegini B.V.
+ *
+ * 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.onegini.mobile.exampleapp.network.gcm;
+
+import com.google.android.gms.iid.InstanceIDListenerService;
+import com.onegini.mobile.exampleapp.OneginiSDK;
+import com.onegini.mobile.exampleapp.storage.SettingsStorage;
+import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
+import com.onegini.mobile.sdk.android.handlers.OneginiMobileAuthenticationEnrollmentHandler;
+import com.onegini.mobile.sdk.android.handlers.error.OneginiMobileAuthenticationEnrollmentError;
+import com.onegini.mobile.sdk.android.model.entity.UserProfile;
+
+public class GCMInstanceIDListenerService extends InstanceIDListenerService {
+
+  /**
+   * Called if InstanceID token is updated. This may occur if the security of the previous token had been compromised. This call is initiated by the InstanceID
+   * provider.
+   */
+  @Override
+  public void onTokenRefresh() {
+    final OneginiMobileAuthenticationEnrollmentHandler mobileAuthenticationEnrollmentHandler = new OneginiMobileAuthenticationEnrollmentHandler() {
+      @Override
+      public void onSuccess() {
+        setMobileAuthenticationEnabled(true);
+      }
+
+      @Override
+      public void onError(final OneginiMobileAuthenticationEnrollmentError error) {
+        @OneginiMobileAuthenticationEnrollmentError.MobileAuthenticationEnrollmentErrorType final int errorType = error.getErrorType();
+        // This method is called when a mobile authentication enrollment error occurs, for example when the device is deregistered
+        if (errorType == OneginiMobileAuthenticationEnrollmentError.DEVICE_DEREGISTERED) {
+          new DeregistrationUtil(GCMInstanceIDListenerService.this).onDeviceDeregistered();
+        }
+        setMobileAuthenticationEnabled(false);
+      }
+    };
+    final GCMRegistrationService gcmRegistrationService = new GCMRegistrationService(this);
+    gcmRegistrationService.registerGCMService(mobileAuthenticationEnrollmentHandler);
+  }
+
+  private void setMobileAuthenticationEnabled(final boolean isEnabled) {
+    UserProfile authenticatedUserProfile = OneginiSDK.getOneginiClient(this).getUserClient().getAuthenticatedUserProfile();
+    if (authenticatedUserProfile == null) {
+      return;
+    }
+
+    final SettingsStorage settingsStorage = new SettingsStorage(GCMInstanceIDListenerService.this);
+    settingsStorage.setMobileAuthenticationEnabled(authenticatedUserProfile, isEnabled);
+  }
+}

app/src/main/java/com/onegini/mobile/exampleapp/network/gcm/GCMInstanceIDListenerService.java

@@ -17,14 +17,12 @@
 
 import java.util.Set;
 
-import android.app.IntentService;
-import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
+import com.google.android.gms.gcm.GcmListenerService;
 import com.onegini.mobile.exampleapp.OneginiSDK;
-import com.onegini.mobile.exampleapp.storage.SettingsStorage;
-import com.onegini.mobile.exampleapp.storage.UserStorage;
+import com.onegini.mobile.exampleapp.util.DeregistrationUtil;
 import com.onegini.mobile.sdk.android.client.OneginiClient;
 import com.onegini.mobile.sdk.android.exception.OneginiInitializationException;
 import com.onegini.mobile.sdk.android.handlers.OneginiInitializationHandler;
@@ -33,30 +31,24 @@
 import com.onegini.mobile.sdk.android.handlers.error.OneginiMobileAuthenticationError;
 import com.onegini.mobile.sdk.android.model.entity.UserProfile;
 
-public class GCMIntentService extends IntentService {
+public class GCMListenerService extends GcmListenerService {
 
-  private static final String TAG = GCMIntentService.class.getSimpleName();
+  private static final String TAG = GCMListenerService.class.getSimpleName();
 
-  public GCMIntentService() {
-    super(TAG);
-  }
 
   @Override
-  protected void onHandleIntent(final Intent intent) {
-    final Bundle extras = intent.getExtras();
-    if (!extras.isEmpty()) {
+  public void onMessageReceived(String from, Bundle data) {
+    if (!data.isEmpty()) {
       Log.i(TAG, "Push message received");
 
       try {
-        handleMobileAuthenticationRequest(extras);
+        handleMobileAuthenticationRequest(data);
       } catch (OneginiInitializationException exception) {
         // Onegini SDK hasn't been started yet so we have to do it
         // before handling the mobile authentication request
-        setupOneginiSDK(extras);
+        setupOneginiSDK(data);
       }
     }
-    // Release the wake lock provided by the WakefulBroadcastReceiver.
-    GCMBroadcastReceiver.completeWakefulIntent(intent);
   }
 
   private void setupOneginiSDK(final Bundle extras) {
@@ -73,7 +65,11 @@ public void onSuccess(final Set<UserProfile> removedUserProfiles) {
 
       @Override
       public void onError(final OneginiInitializationError error) {
-        Toast.makeText(GCMIntentService.this, error.getErrorDescription(), Toast.LENGTH_LONG).show();
+        @OneginiInitializationError.InitializationErrorType final int errorType = error.getErrorType();
+        if (errorType == OneginiInitializationError.DEVICE_DEREGISTERED) {
+          new DeregistrationUtil(getApplicationContext()).onDeviceDeregistered();
+        }
+        Toast.makeText(GCMListenerService.this, error.getErrorDescription(), Toast.LENGTH_LONG).show();
       }
     });
   }
@@ -82,25 +78,28 @@ private void handleMobileAuthenticationRequest(final Bundle extras) {
     OneginiSDK.getOneginiClient(this).getUserClient().handleMobileAuthenticationRequest(extras, new OneginiMobileAuthenticationHandler() {
       @Override
       public void onSuccess() {
-        Toast.makeText(GCMIntentService.this, "Mobile authentication success", Toast.LENGTH_SHORT).show();
+        Toast.makeText(GCMListenerService.this, "Mobile authentication success", Toast.LENGTH_SHORT).show();
       }
 
       @Override
       public void onError(final OneginiMobileAuthenticationError oneginiMobileAuthenticationError) {
-        Toast.makeText(GCMIntentService.this, oneginiMobileAuthenticationError.getErrorDescription(), Toast.LENGTH_SHORT).show();
-        if (oneginiMobileAuthenticationError.getErrorType() == OneginiMobileAuthenticationError.USER_DEREGISTERED) {
-          new SettingsStorage(GCMIntentService.this).setMobileAuthenticationEnabled(false);
-        } else if (oneginiMobileAuthenticationError.getErrorType() == OneginiMobileAuthenticationError.ACTION_CANCELED) {
-          // the user denied incoming mobile authentication request
+        Toast.makeText(GCMListenerService.this, oneginiMobileAuthenticationError.getErrorDescription(), Toast.LENGTH_SHORT).show();
+        @OneginiMobileAuthenticationError.MobileAuthenticationEnrollmentErrorType final int errorType = oneginiMobileAuthenticationError.getErrorType();
+        if (errorType == OneginiMobileAuthenticationError.USER_DEREGISTERED) {
+          // the user was deregister, for example he provided a wrong PIN for too many times. You can handle the deregistration here, but since this application
+          // supports multiple profiles we handle it when the user tries to login the next time because we don't know which user profile was deregistered at
+          // this point.
+        } else if (errorType == OneginiMobileAuthenticationError.ACTION_CANCELED) {
+          Toast.makeText(GCMListenerService.this, "The user cancelled the mobile authentication request", Toast.LENGTH_LONG).show();
         }
       }
     });
   }
 
   private void removeUserProfiles(final Set<UserProfile> removedUserProfiles, final Bundle extras) {
-    final UserStorage userStorage = new UserStorage(this);
+    final DeregistrationUtil deregistrationUtil = new DeregistrationUtil(this);
     for (final UserProfile userProfile : removedUserProfiles) {
-      userStorage.removeUser(userProfile);
+      deregistrationUtil.onUserDeregistered(userProfile);
     }
     handleMobileAuthenticationRequest(extras);
   }