@hanwha-ss1/plugin 0.2.2 → 0.2.4

package/android/build.gradle

@@ -53,6 +53,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core:1.6.0'
+    implementation 'androidx.fragment:fragment:1.3.5'
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"

package/android/src/main/java/com/plugin/bio/Bio.java

@@ -2,7 +2,6 @@ package com.plugin.bio;
 
 import android.app.Activity;
 import android.util.Log;
-import android.view.WindowManager;
 
 
 public class Bio {

package/android/src/main/java/com/plugin/bio/BioAuthManager.java

@@ -3,7 +3,6 @@ package com.plugin.bio;
 import android.Manifest;
 import android.app.Activity;
 import android.app.KeyguardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
@@ -56,13 +55,10 @@ public class BioAuthManager {
     private BiometricPrompt.CryptoObject bioCryptoObject; // over api 28
 
     private boolean canAuthenticate(Activity activity){
-
         Intent intent;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
-        {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             BiometricManager biometricManager = BiometricManager.from(activity);
-            switch (biometricManager.canAuthenticate(BIOMETRIC_STRONG))
-            {
+            switch (biometricManager.canAuthenticate(BIOMETRIC_STRONG)) {
                 case BiometricManager.BIOMETRIC_SUCCESS:
                     Log.d("MY_APP_TAG", "App can authenticate using biometrics.");
                     return true;
@@ -82,36 +78,31 @@ public class BioAuthManager {
                     activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
                     return false;
             }
-        }
-        else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-        {
-            if (!fingerprintManager.isHardwareDetected()) // 지문을 사용할 수 없는 디바이스인 경우
-            {
+        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // 지문을 사용할 수 없는 디바이스인 경우
+            if (!fingerprintManager.isHardwareDetected()) {
                 Log.d("fingerprint", "it is not device that can use fingerprint");
                 return false;
             }
             // 지문 인증 사용을 거부한 경우
-            else if (ContextCompat.checkSelfPermission(activity, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED)
-            {
+            else if (activity.checkSelfPermission(Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED) {
                 Log.d("fingerprint", "permission denied");
                 return false;
             }
-            else if (!keyguardManager.isKeyguardSecure()) // 잠금 화면이 설정되지 않은 경우
-            {
+            // 잠금 화면이 설정되지 않은 경우
+            else if (!keyguardManager.isKeyguardSecure()) {
                 Log.d("fingerprint", "please set lock screen");
                 return false;
             }
-            else if (!fingerprintManager.hasEnrolledFingerprints()) // 등록된 지문이 없는 경우
-            {
+            // 등록된 지문이 없는 경우
+            else if (!fingerprintManager.hasEnrolledFingerprints()) {
                 Log.d("fingerprint", "please enroll fingerprint");
                 intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
                 activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
                 return false;
             }
-
             return true;
         }
-
         return false;
     }
 
@@ -123,9 +114,8 @@ public class BioAuthManager {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             Log.d("bioAuth", "start biometricPrompt");
 
-            if (canAuthenticate(activity))
-            {
-                executor = ContextCompat.getMainExecutor(activity);
+            if (canAuthenticate(activity)) {
+                executor = activity.getMainExecutor();
 
                 biometricPrompt = new BiometricPrompt((FragmentActivity) activity, executor, new BiometricPrompt.AuthenticationCallback() {
                     @Override
@@ -161,7 +151,7 @@ public class BioAuthManager {
                 promptInfo = new BiometricPrompt.PromptInfo.Builder()
                         .setTitle("지문 인증")
                         .setSubtitle("기기에 등록된 지문을 이용하여 지문을 인증해주세요.")
-                        .setDescription("생체 인증 설명")
+//                        .setDescription("생체 인증 설명")
                         // BIOMETRIC_STRONG 은 안드로이드 11 에서 정의한 클래스 3 생체 인식을 사용하는 인증 - 암호회된 키 필요
                         // BIOMETRIC_WEAK 은 안드로이드 11 에서 정의한 클래스 2 생체 인식을 사용하는 인증 - 암호화된 키까지 필요하지는 않음
                         // DEVICE_CREDENTIAL 은 화면 잠금 사용자 인증 정보를 사용하는 인증 - 사용자의 PIN, 패턴 또는 비밀번호
@@ -172,8 +162,7 @@ public class BioAuthManager {
 
                 keyManager.generateKey();
 
-                if (keyManager.cipherInit())
-                {
+                if (keyManager.cipherInit()) {
                     bioCryptoObject = new BiometricPrompt.CryptoObject(keyManager.getCipher());
                     biometricPrompt.authenticate(promptInfo, bioCryptoObject);
                 }
@@ -182,38 +171,19 @@ public class BioAuthManager {
             }
 
         }
-        else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)// api 23 ( ANDROID 6.0 ) 부터 api 28 ( ANDROID 9.0 ) 까지는 fingerprint 사용
-        {
+        // api 23 ( ANDROID 6.0 ) 부터 api 28 ( ANDROID 9.0 ) 까지는 fingerprint 사용
+        else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             Log.d("fingerprint", "fingerprint start");
 
             fingerprintManager = (FingerprintManager) activity.getSystemService(FINGERPRINT_SERVICE);
             keyguardManager = (KeyguardManager) activity.getSystemService(KEYGUARD_SERVICE);
-//            if (!fingerprintManager.isHardwareDetected()) // 지문을 사용할 수 없는 디바이스인 경우
-//            {
-//                Log.d("fingerprint", "it is not device that can use fingerprint");
-//            }
-//            // 지문 인증 사용을 거부한 경우
-//            else if (ContextCompat.checkSelfPermission(context, Manifest.permission.USE_FINGERPRINT) != PackageManager.PERMISSION_GRANTED)
-//            {
-//                Log.d("fingerprint", "permission denied");
-//            }
-//            else if (!keyguardManager.isKeyguardSecure()) // 잠금 화면이 설정되지 않은 경우
-//            {
-//                Log.d("fingerprint", "please set lock screen");
-//            }
-//            else if (!fingerprintManager.hasEnrolledFingerprints()) // 등록된 지문이 없는 경우
-//            {
-//                Log.d("fingerprint", "please enroll fingerprint");
-//            }
-//            else
-            if (canAuthenticate(activity))
-            {
+
+            if (canAuthenticate(activity)) {
                 Log.d("fingerprint", "requirement fingerprint needed all pass");
 
                 keyManager.generateKey();
 
-                if (keyManager.cipherInit())
-                {
+                if (keyManager.cipherInit()) {
 
                     Cipher cipher = keyManager.getCipher();
 
@@ -224,31 +194,40 @@ public class BioAuthManager {
                         public void onAuthenticationError(int errorCode, CharSequence errString) {
                             super.onAuthenticationError(errorCode, errString);
                             Log.d("fingerprint", String.valueOf(errorCode));
+                            if(callback != null) {
+                                callback.onFail(errString.toString());
+                            }
                         }
 
                         @Override
                         public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
                             super.onAuthenticationSucceeded(result);
                             Log.d("fingerprint", "auth success");
-
+                            if(callback != null) {
+                                callback.onSuccess();
+                            }
                         }
 
                         @Override
                         public void onAuthenticationFailed() {
                             super.onAuthenticationFailed();
                             Log.d("fingerprint", "auth failed");
-
+                            if(callback != null) {
+                                callback.onFail("auth failed");
+                            }
                         }
 
                         @Override
                         public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
                             super.onAuthenticationHelp(helpCode, helpString);
                             Log.d("fingerprint", helpString.toString());
+                            if(callback != null) {
+                                callback.onFail(helpString.toString());
+                            }
                         }
 
                     }, null);
                 }
-
             }
         }
     }

package/android/src/main/java/com/plugin/bio/BioPlugin.java

@@ -7,7 +7,7 @@ import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
 
-@CapacitorPlugin(name = "Bio")
+@CapacitorPlugin(name = "Plugin")
 public class BioPlugin extends Plugin{
     private Bio implementation = new Bio();
 
@@ -21,7 +21,7 @@ public class BioPlugin extends Plugin{
     }
 
     @PluginMethod
-    public void authenticate(PluginCall call) {
+    public void auth(PluginCall call) {
         if(implementation == null) {
             implementation = new Bio();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanwha-ss1/plugin",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",