Merge pull request #4 from tailoredmedia/bugfix/3_crypto_maybe_empty

Fix onSuccess with cryptoObject not emitting cryptoObject

Author: FlowMo7

app/build.gradle

@@ -26,7 +26,7 @@ dependencies {
 
     implementation project(':biometricauth')
 
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
 }

app/src/main/java/com/tailoredapps/biometricsample/MainActivity.kt

@@ -1,6 +1,10 @@
 package com.tailoredapps.biometricsample
 
+import android.annotation.TargetApi
+import android.os.Build
 import android.os.Bundle
+import android.security.keystore.KeyGenParameterSpec
+import android.security.keystore.KeyProperties
 import android.support.v7.app.AppCompatActivity
 import android.util.Log
 import android.widget.Button
@@ -9,26 +13,50 @@ import com.tailoredapps.biometricauth.BiometricAuth
 import com.tailoredapps.biometricauth.BiometricAuthenticationCancelledException
 import com.tailoredapps.biometricauth.BiometricAuthenticationException
 import io.reactivex.android.schedulers.AndroidSchedulers
+import java.io.IOException
+import java.security.*
+import java.security.cert.CertificateException
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.NoSuchPaddingException
+import javax.crypto.SecretKey
+
 
 class MainActivity : AppCompatActivity() {
 
     companion object {
         private const val LOG_TAG = "MainActivity"
     }
 
-    private val biometricAuth: BiometricAuth by lazy { BiometricAuth.create(this) }
+    private val cryptoManager: CryptoManager by lazy {
+        CryptoManager()
+    }
+
+    private val biometricAuth: BiometricAuth by lazy {
+        BiometricAuth.create(this)
+    }
 
-    private val button: Button by lazy { findViewById<Button>(R.id.button) }
+    private val btnAuthenticate: Button by lazy { findViewById<Button>(R.id.btn_authenticate) }
+    private val btnAuthenticateWithCrypto: Button by lazy { findViewById<Button>(R.id.btn_authenticate_with_crypto) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        button.setOnClickListener {
+        btnAuthenticate.setOnClickListener {
             testAuthenticate()
         }
+
+        btnAuthenticateWithCrypto.setOnClickListener {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+                Toast.makeText(this, "KeyGenerator only available on >= Marshmallow", Toast.LENGTH_SHORT).show()
+            } else {
+                testAuthenticateWithCrypto()
+            }
+        }
     }
 
+
     private fun testAuthenticate() {
         if (biometricAuth.hasFingerprintHardware.not()) {
             Toast.makeText(this, "Devices provides no fingerprint hardware", Toast.LENGTH_SHORT).show()
@@ -65,4 +93,114 @@ class MainActivity : AppCompatActivity() {
                     )
         }
     }
+
+
+    @TargetApi(Build.VERSION_CODES.M)
+    private fun testAuthenticateWithCrypto() {
+        if (biometricAuth.hasFingerprintHardware.not()) {
+            Toast.makeText(this, "Devices provides no fingerprint hardware", Toast.LENGTH_SHORT).show()
+        } else if (biometricAuth.hasFingerprintsEnrolled.not()) {
+            Toast.makeText(this, "No fingerprints enrolled", Toast.LENGTH_SHORT).show()
+        } else {
+            biometricAuth.authenticate(
+                    cryptoObject = BiometricAuth.Crypto(cryptoManager.cipher),
+                    title = "Please authenticate",
+                    subtitle = "Using 'Awesome Feature' requires your authentication.",
+                    description = "'Awesome Feature' exposes data private to you, which is why you need to authenticate.",
+                    negativeButtonText = "Cancel",
+                    prompt = "Touch the fingerprint sensor",
+                    notRecognizedErrorText = "Not recognized"
+            )
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(
+                            {
+                                Toast.makeText(this, "Success!", Toast.LENGTH_SHORT).show()
+                                Log.d(LOG_TAG, "onSuccess()")
+                            },
+                            { throwable ->
+                                when (throwable) {
+                                    is BiometricAuthenticationException -> {
+                                        Toast.makeText(this, "Error: ${throwable.errorString}", Toast.LENGTH_SHORT).show()
+                                        Log.e(LOG_TAG, "BiometricAuthenticationException(${throwable.errorMessageId}, '${throwable.errorString}')", throwable)
+                                    }
+                                    is BiometricAuthenticationCancelledException -> {
+                                        Toast.makeText(this, "Cancelled", Toast.LENGTH_SHORT).show()
+                                        Log.d(LOG_TAG, "onError(BiometricAuthenticationCancelledException)")
+                                    }
+                                    else -> Log.e(LOG_TAG, "onError()", throwable)
+                                }
+                            }
+                    )
+        }
+    }
+
+
+    private class CryptoManager {
+
+        companion object {
+            private const val KEY_NAME = "test-key"
+        }
+
+        private var keyStore: KeyStore? = null
+        private var keyGenerator: KeyGenerator? = null
+
+
+        val cipher: Cipher by lazy {
+            generateKey()
+            initCipher()
+        }
+
+
+        @TargetApi(Build.VERSION_CODES.M)
+        private fun generateKey() {
+            try {
+                keyStore = KeyStore.getInstance("AndroidKeyStore").also { keyStore ->
+                    keyStore.load(null)
+                }
+
+                keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore").also { keyGenerator ->
+                    keyGenerator?.init(KeyGenParameterSpec.Builder(KEY_NAME, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+                            .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                            .setUserAuthenticationRequired(true)
+                            .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7)
+                            .build())
+
+                    keyGenerator?.generateKey()
+                }
+            } catch (e: KeyStoreException) {
+                e.printStackTrace()
+            } catch (e: NoSuchAlgorithmException) {
+                e.printStackTrace()
+            } catch (e: NoSuchProviderException) {
+                e.printStackTrace()
+            } catch (e: InvalidAlgorithmParameterException) {
+                e.printStackTrace()
+            } catch (e: CertificateException) {
+                e.printStackTrace()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+
+
+        @TargetApi(Build.VERSION_CODES.M)
+        private fun initCipher(): Cipher {
+            try {
+                val cipher = Cipher.getInstance(
+                        KeyProperties.KEY_ALGORITHM_AES + "/"
+                                + KeyProperties.BLOCK_MODE_CBC + "/"
+                                + KeyProperties.ENCRYPTION_PADDING_PKCS7)
+
+                keyStore!!.load(null)
+                val key = keyStore!!.getKey(KEY_NAME, null) as SecretKey
+                cipher.init(Cipher.ENCRYPT_MODE, key)
+                return cipher
+            } catch (e: NoSuchAlgorithmException) {
+                throw RuntimeException("Failed to init cipher", e)
+            } catch (e: NoSuchPaddingException) {
+                throw RuntimeException("Failed to init cipher", e)
+            }
+        }
+    }
+
 }

app/src/main/res/layout/activity_main.xml

@@ -7,13 +7,26 @@
     tools:context=".MainActivity">
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/btn_authenticate"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="6dp"
         android:text="Authenticate"
+        app:layout_constraintBottom_toTopOf="@+id/btn_authenticate_with_crypto"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <Button
+        android:id="@+id/btn_authenticate_with_crypto"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:text="Authenticate with Crypto"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/btn_authenticate" />
 
 </android.support.constraint.ConstraintLayout>

biometricauth/build.gradle

@@ -24,13 +24,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    api 'com.android.support:appcompat-v7:28.0.0'
+    api 'com.android.support:design:28.0.0'
+    api 'com.android.support.constraint:constraint-layout:1.1.3'
 
 
-    api 'io.reactivex.rxjava2:rxjava:2.2.6'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    api 'io.reactivex.rxjava2:rxjava:2.2.9'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
 }
 
@@ -69,6 +69,18 @@ install {
                 url siteUrl
             }
         }
+
+        pom.withXml {
+            def dependenciesNode = asNode().appendNode('dependencies')
+
+            //Add all declared 'api' dependencies to the pom.xml
+            configurations.api.allDependencies.withType(ModuleDependency) { ModuleDependency dp ->
+                def dependencyNode = dependenciesNode.appendNode('dependency')
+                dependencyNode.appendNode('groupId', dp.group)
+                dependencyNode.appendNode('artifactId', dp.name)
+                dependencyNode.appendNode('version', dp.version)
+            }
+        }
     }
 }
 

biometricauth/src/main/java/com/tailoredapps/biometricauth/delegate/AuthenticationEvent.kt

@@ -62,6 +62,8 @@ sealed class AuthenticationEvent {
      *
      * This event signals the end of the process, as the authentication has succeeded.
      * No further events will be sent.
+     *
+     * @param crypto The crypto-object, if set in the request
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     data class Success(

biometricauth/src/main/java/com/tailoredapps/biometricauth/delegate/marshmallow/MarshmallowFingerprintDialog.kt

@@ -153,7 +153,11 @@ class MarshmallowFingerprintDialog : BottomSheetDialogFragment() {
                     .subscribe(
                             { event ->
                                 if (event is AuthenticationEvent.Success) {
-                                    emitter?.onComplete()
+                                    if(event.crypto != null) {
+                                        emitter?.onSuccess(event.crypto)
+                                    } else {
+                                        emitter?.onComplete()
+                                    }
                                 } else if (event is AuthenticationEvent.Error) {
                                     if (event.messageId == 5) {  //"Fingerprint operation cancelled."
                                         emitter?.onCancel()

build.gradle

@@ -27,20 +27,20 @@ ext {
 }
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.31'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-rc03'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
 
         //for publishing:
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17'
+        classpath 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files