@hanwha-ss1/plugin 0.3.1 → 0.3.2

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

@@ -7,8 +7,8 @@ import android.util.Log;
 public class Bio {
 
     public interface OnBioResult {
-        void onSuccess();
-        void onFail(String error);
+        void onSuccess(int type);
+        void onFail(int error);
     }
 
     public String echo(String value) {

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

@@ -58,7 +58,7 @@ public class BioAuthManager {
         Intent intent;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             BiometricManager biometricManager = BiometricManager.from(activity);
-            switch (biometricManager.canAuthenticate(BIOMETRIC_STRONG)) {
+            switch (biometricManager.canAuthenticate(DEVICE_CREDENTIAL)) {
                 case BiometricManager.BIOMETRIC_SUCCESS:
                     Log.d("MY_APP_TAG", "App can authenticate using biometrics.");
                     return true;
@@ -72,10 +72,10 @@ public class BioAuthManager {
                     // Prompts the user to create credentials that your app accepts.
                     Log.d("MY_APP_TAG", "enrolled biometric doesn't existed. please enroll");
 
-                    intent = new Intent(Settings.ACTION_FINGERPRINT_ENROLL);
-                    intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
-                            BIOMETRIC_STRONG | DEVICE_CREDENTIAL);
-                    activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
+//                    intent = new Intent(Settings.ACTION_FINGERPRINT_ENROLL);
+//                    intent.putExtra(Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
+//                            BIOMETRIC_STRONG | DEVICE_CREDENTIAL);
+//                    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) {
@@ -97,8 +97,8 @@ public class BioAuthManager {
             // 등록된 지문이 없는 경우
             else if (!fingerprintManager.hasEnrolledFingerprints()) {
                 Log.d("fingerprint", "please enroll fingerprint");
-                intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
-                activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
+//                intent = new Intent(Settings.ACTION_SECURITY_SETTINGS);
+//                activity.startActivityForResult(intent, REQUEST_FINGERPRINT_ENROLLMENT_AUTH);
                 return false;
             }
             return true;
@@ -108,127 +108,131 @@ public class BioAuthManager {
 
 
     public void authenticate(Activity activity, Bio.OnBioResult callback) {
-
-        keyManager = KeyManager.getInstance();
-        // api 28 ( ANDROID 9.0 ) 이상은 biometricPrompt 사용
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Log.d("bioAuth", "start biometricPrompt");
-
-            if (canAuthenticate(activity)) {
-                executor = activity.getMainExecutor();
-
-                biometricPrompt = new BiometricPrompt((FragmentActivity) activity, executor, new BiometricPrompt.AuthenticationCallback() {
-                    @Override
-                    public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
-                        super.onAuthenticationError(errorCode, errString);
-                        Log.d("bioAuth", errString.toString());
-                        if(callback != null) {
-                            callback.onFail(errString.toString());
-                        }
-                    }
-
-                    @Override
-                    public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
-                        super.onAuthenticationSucceeded(result);
-                        Log.d("bioAuth", "auth success");
-                        if(callback != null) {
-                            callback.onSuccess();
-                        }
-                    }
-
-                    @Override
-                    public void onAuthenticationFailed() {
-                        super.onAuthenticationFailed();
-                        Log.d("bioAuth", "auth failed");
-                        if(callback != null) {
-                            callback.onFail("auth failed");
-                        }
-                    }
-                });
-
-                // DEVICE_CREDENTIAL 및 BIOMETRIC_STRING | DEVICE_CREDENTIAL 은 안드로이드 10 이하에서 지원되지 않는다.
-                // 안드로이드 10 이하에서 PIN 이나 패턴, 비밀번호가 있는지 확인하려면 KeyguardManager.isDeviceSecure() 함수를 사용할 것
-                promptInfo = new BiometricPrompt.PromptInfo.Builder()
-                        .setTitle("지문 인증")
-                        .setSubtitle("기기에 등록된 지문을 이용하여 지문을 인증해주세요.")
-//                        .setDescription("생체 인증 설명")
-                        // BIOMETRIC_STRONG 은 안드로이드 11 에서 정의한 클래스 3 생체 인식을 사용하는 인증 - 암호회된 키 필요
-                        // BIOMETRIC_WEAK 은 안드로이드 11 에서 정의한 클래스 2 생체 인식을 사용하는 인증 - 암호화된 키까지 필요하지는 않음
-                        // DEVICE_CREDENTIAL 은 화면 잠금 사용자 인증 정보를 사용하는 인증 - 사용자의 PIN, 패턴 또는 비밀번호
-                        .setAllowedAuthenticators(BIOMETRIC_STRONG)
-                        .setConfirmationRequired(false) // 명시적인 사용자 작업 ( 생체 인식 전 한번더 체크 ) 없이 인증할건지 default : true
-                        .setNegativeButtonText("취소")
-                        .build();
-
-                keyManager.generateKey();
-
-                if (keyManager.cipherInit()) {
-                    bioCryptoObject = new BiometricPrompt.CryptoObject(keyManager.getCipher());
-                    biometricPrompt.authenticate(promptInfo, bioCryptoObject);
-                }
-
-                biometricPrompt.authenticate(promptInfo);
-            }
-
-        }
-        // 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 (canAuthenticate(activity)) {
-                Log.d("fingerprint", "requirement fingerprint needed all pass");
-
-                keyManager.generateKey();
-
-                if (keyManager.cipherInit()) {
-
-                    Cipher cipher = keyManager.getCipher();
-
-                    cryptoObject = new FingerprintManager.CryptoObject(cipher);
-
-                    fingerprintManager.authenticate(cryptoObject, new CancellationSignal(), 0, new FingerprintManager.AuthenticationCallback() {
-                        @Override
-                        public void onAuthenticationError(int errorCode, CharSequence errString) {
-                            super.onAuthenticationError(errorCode, errString);
-                            Log.d("fingerprint", String.valueOf(errorCode));
-                            if(callback != null) {
-                                callback.onFail(errString.toString());
+        activity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                keyManager = KeyManager.getInstance();
+                // api 28 ( ANDROID 9.0 ) 이상은 biometricPrompt 사용
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                    Log.d("bioAuth", "start biometricPrompt");
+
+                    if (canAuthenticate(activity)) {
+                        executor = activity.getMainExecutor();
+
+                        biometricPrompt = new BiometricPrompt((FragmentActivity) activity, executor, new BiometricPrompt.AuthenticationCallback() {
+                            @Override
+                            public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+                                super.onAuthenticationError(errorCode, errString);
+                                Log.d("bioAuth", errString.toString());
+                                if(callback != null) {
+                                    callback.onFail(errorCode);
+                                }
                             }
-                        }
 
-                        @Override
-                        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
-                            super.onAuthenticationSucceeded(result);
-                            Log.d("fingerprint", "auth success");
-                            if(callback != null) {
-                                callback.onSuccess();
+                            @Override
+                            public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+                                super.onAuthenticationSucceeded(result);
+                                Log.d("bioAuth", "auth success");
+                                if(callback != null) {
+                                    callback.onSuccess(result.getAuthenticationType());
+                                }
                             }
-                        }
 
-                        @Override
-                        public void onAuthenticationFailed() {
-                            super.onAuthenticationFailed();
-                            Log.d("fingerprint", "auth failed");
-                            if(callback != null) {
-                                callback.onFail("auth failed");
+                            @Override
+                            public void onAuthenticationFailed() {
+                                super.onAuthenticationFailed();
+                                Log.d("bioAuth", "auth failed");
+                                if(callback != null) {
+                                    callback.onFail(-1);
+                                }
                             }
+                        });
+
+                        // DEVICE_CREDENTIAL 및 BIOMETRIC_STRING | DEVICE_CREDENTIAL 은 안드로이드 10 이하에서 지원되지 않는다.
+                        // 안드로이드 10 이하에서 PIN 이나 패턴, 비밀번호가 있는지 확인하려면 KeyguardManager.isDeviceSecure() 함수를 사용할 것
+                        promptInfo = new BiometricPrompt.PromptInfo.Builder()
+                                .setTitle("생체 인증")
+                                .setSubtitle("기기에 등록된 생체 인증을 이용하여 인증해주세요.")
+//                                .setDescription("생체 인증")
+                                // BIOMETRIC_STRONG 은 안드로이드 11 에서 정의한 클래스 3 생체 인식을 사용하는 인증 - 암호회된 키 필요
+                                // BIOMETRIC_WEAK 은 안드로이드 11 에서 정의한 클래스 2 생체 인식을 사용하는 인증 - 암호화된 키까지 필요하지는 않음
+                                // DEVICE_CREDENTIAL 은 화면 잠금 사용자 인증 정보를 사용하는 인증 - 사용자의 PIN, 패턴 또는 비밀번호
+//                                .setAllowedAuthenticators(DEVICE_CREDENTIAL)
+                                .setConfirmationRequired(false) // 명시적인 사용자 작업 ( 생체 인식 전 한번더 체크 ) 없이 인증할건지 default : true
+                                .setNegativeButtonText("취소")
+                                .build();
+
+                        keyManager.generateKey();
+
+                        if (keyManager.cipherInit()) {
+                            bioCryptoObject = new BiometricPrompt.CryptoObject(keyManager.getCipher());
+                            biometricPrompt.authenticate(promptInfo, bioCryptoObject);
                         }
 
-                        @Override
-                        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
-                            super.onAuthenticationHelp(helpCode, helpString);
-                            Log.d("fingerprint", helpString.toString());
-                            if(callback != null) {
-                                callback.onFail(helpString.toString());
-                            }
-                        }
+                        biometricPrompt.authenticate(promptInfo);
+                    }
 
-                    }, null);
+                }
+                // 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 (canAuthenticate(activity)) {
+                        Log.d("fingerprint", "requirement fingerprint needed all pass");
+
+                        keyManager.generateKey();
+
+                        if (keyManager.cipherInit()) {
+
+                            Cipher cipher = keyManager.getCipher();
+
+                            cryptoObject = new FingerprintManager.CryptoObject(cipher);
+
+                            fingerprintManager.authenticate(cryptoObject, new CancellationSignal(), 0, new FingerprintManager.AuthenticationCallback() {
+                                @Override
+                                public void onAuthenticationError(int errorCode, CharSequence errString) {
+                                    super.onAuthenticationError(errorCode, errString);
+                                    Log.d("fingerprint", String.valueOf(errorCode));
+                                    if(callback != null) {
+                                        callback.onFail(errorCode);
+                                    }
+                                }
+
+                                @Override
+                                public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+                                    super.onAuthenticationSucceeded(result);
+                                    Log.d("fingerprint", "auth success");
+                                    if(callback != null) {
+                                        callback.onSuccess(-1);
+                                    }
+                                }
+
+                                @Override
+                                public void onAuthenticationFailed() {
+                                    super.onAuthenticationFailed();
+                                    Log.d("fingerprint", "auth failed");
+                                    if(callback != null) {
+                                        callback.onFail(-1);
+                                    }
+                                }
+
+                                @Override
+                                public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+                                    super.onAuthenticationHelp(helpCode, helpString);
+                                    Log.d("fingerprint", helpString.toString());
+                                    if(callback != null) {
+                                        callback.onFail(helpCode);
+                                    }
+                                }
+
+                            }, null);
+                        }
+                    }
                 }
             }
-        }
+        });
     }
 }

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

@@ -19,29 +19,4 @@ public class BioPlugin extends Plugin{
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void auth(PluginCall call) {
-        if(implementation == null) {
-            implementation = new Bio();
-        }
-        implementation.authenticate(getActivity(), new Bio.OnBioResult() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("result", true);
-                ret.put("message", "완료");
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onFail(String error) {
-                JSObject ret = new JSObject();
-                ret.put("result", false);
-                ret.put("message", error);
-                call.resolve(ret);
-            }
-        });
-
-    }
 }

package/android/src/main/java/com/plugin/contact/ContactPlugin.java

@@ -19,33 +19,4 @@ public class ContactPlugin extends Plugin{
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void addContact(PluginCall call) {
-        String name = call.getString("name");
-        String mobile = call.getString("phone");
-        String phone = call.getString("ext");
-        String department = call.getString("dept");
-        String email = call.getString("email");
-        if(implementation == null) {
-            implementation = new Contact();
-        }
-        implementation.save(getActivity(), name, email, mobile, phone, department, new Contact.OnResult() {
-            @Override
-            public void onSuccess() {
-                JSObject ret = new JSObject();
-                ret.put("result", true);
-                ret.put("message", "완료");
-                call.resolve(ret);
-            }
-
-            @Override
-            public void onFail() {
-                JSObject ret = new JSObject();
-                ret.put("result", false);
-                ret.put("message", "존재하는 번호입니다.");
-                call.resolve(ret);
-            }
-        });
-    }
 }

package/android/src/main/java/com/plugin/linker/LinkerPlugin.java

@@ -5,11 +5,17 @@ import com.getcapacitor.Plugin;
 import com.getcapacitor.PluginCall;
 import com.getcapacitor.PluginMethod;
 import com.getcapacitor.annotation.CapacitorPlugin;
+import com.plugin.bio.Bio;
+import com.plugin.contact.Contact;
+import com.plugin.openbrowser.OpenBrowser;
 
 
 @CapacitorPlugin(name = "Plugin")
 public class LinkerPlugin extends Plugin{
     private Linker implementation = new Linker();
+    private Bio bioImplementation = new Bio();
+    private Contact contactImplementation = new Contact();
+    private OpenBrowser openBrowserImplementation = new OpenBrowser();
 
     @PluginMethod
     public void echo(PluginCall call) {
@@ -44,4 +50,68 @@ public class LinkerPlugin extends Plugin{
             }
         });
     }
+
+    @PluginMethod
+    public void auth(PluginCall call) {
+        if(bioImplementation == null) {
+            bioImplementation = new Bio();
+        }
+        bioImplementation.authenticate(getActivity(), new Bio.OnBioResult() {
+            @Override
+            public void onSuccess(int type) {
+                JSObject ret = new JSObject();
+                ret.put("isAvailable", true);
+                ret.put("biometryType", type);
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onFail(int code) {
+                JSObject ret = new JSObject();
+                ret.put("isAvailable", false);
+                ret.put("biometryType", -1);
+                ret.put("errorCode", code);
+                call.resolve(ret);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void addContact(PluginCall call) {
+        String name = call.getString("name");
+        String mobile = call.getString("phone");
+        String phone = call.getString("ext");
+        String department = call.getString("dept");
+        String email = call.getString("email");
+        if(contactImplementation == null) {
+            contactImplementation = new Contact();
+        }
+        contactImplementation.save(getActivity(), name, email, mobile, phone, department, new Contact.OnResult() {
+            @Override
+            public void onSuccess() {
+                JSObject ret = new JSObject();
+                ret.put("result", true);
+                ret.put("message", "완료");
+                call.resolve(ret);
+            }
+
+            @Override
+            public void onFail() {
+                JSObject ret = new JSObject();
+                ret.put("result", false);
+                ret.put("message", "존재하는 번호입니다.");
+                call.resolve(ret);
+            }
+        });
+    }
+
+    @PluginMethod
+    public void open(PluginCall call) {
+        String url = call.getString("url");
+        boolean isExternal = call.getBoolean("ext");
+        if(openBrowserImplementation == null) {
+            openBrowserImplementation = new OpenBrowser();
+        }
+        openBrowserImplementation.open(getActivity(), url, isExternal);
+    }
 }

package/android/src/main/java/com/plugin/openbrowser/OpenBrowserPlugin.java

@@ -19,14 +19,4 @@ public class OpenBrowserPlugin extends Plugin {
         ret.put("value", implementation.echo(value));
         call.resolve(ret);
     }
-
-    @PluginMethod
-    public void open(PluginCall call) {
-        String url = call.getString("url");
-        boolean isExternal = call.getBoolean("ext");
-        if(implementation == null) {
-            implementation = new OpenBrowser();
-        }
-        implementation.open(getActivity(), url, isExternal);
-    }
 }

package/package.json

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