MOB-862 #comment updated Android API

Author: shachartransmit

android/src/main/java/com/tsauthentication/TsAuthenticationModule.java

@@ -1,21 +1,20 @@
 package com.tsauthentication;
-
-import static androidx.work.ListenableWorker.Result.success;
-
 import androidx.annotation.NonNull;
-
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.module.annotations.ReactModule;
-import com.transmit.authentication.AuthenticationError;
+import com.transmit.authentication.TSDeviceInfoError;
+import com.transmit.authentication.TSWebAuthnAuthenticationError;
 import com.transmit.authentication.AuthenticationResult;
 import com.transmit.authentication.RegistrationResult;
 import com.transmit.authentication.TSAuthCallback;
 import com.transmit.authentication.TSAuthentication;
+import com.transmit.authentication.TSWebAuthnRegistrationError;
+import com.transmit.authentication.network.completereg.DeviceInfo;
 
 import java.util.HashMap;
 
@@ -39,7 +38,7 @@ public String getName() {
   @NonNull public void initialize(String clientId, String domain, String baseUrl, Promise promise) {
 
     if(reactContext.getCurrentActivity() != null) {
-      TSAuthentication.init(
+      TSAuthentication.initialize(
         reactContext,
         baseUrl,
         clientId
@@ -51,44 +50,38 @@ public String getName() {
   // Registration
 
   @ReactMethod
-  @NonNull public void register(
+  @NonNull public void registerWebAuthn(
     String username,
     String displayName,
     Promise promise) {
+
     if(reactContext.getCurrentActivity() != null) {
-      TSAuthentication.isPlatformAuthenticatorSupported(
-        reactContext.getCurrentActivity(),
-        new TSAuthCallback<Boolean>() {
-          @Override
-          public void success(Boolean aBoolean) {
-            continueRegistration(username, displayName, promise);
-          }
+      Boolean isSupported = TSAuthentication.isWebAuthnSupported();
+      if (!isSupported) {
+        promise.reject(new Error("Unsupported platform"));
+        return;
+      }
 
-          @Override
-          public void error(@NonNull AuthenticationError authenticationError) {
-            promise.reject(new Error("Unsupported platform"));
-          }
-        }
-      );
+      continueRegistration(username, displayName, promise);
     }
   }
+
   private void continueRegistration(String username, String displayName, Promise promise) {
     if(reactContext.getCurrentActivity() != null) {
-      TSAuthentication.register(
+      TSAuthentication.registerWebAuthn(
         reactContext.getCurrentActivity(),
         username,
         displayName,
-        new TSAuthCallback<RegistrationResult>() {
+        new TSAuthCallback<RegistrationResult, TSWebAuthnRegistrationError>() {
           @Override
           public void success(RegistrationResult registrationResult) {
             WritableMap map = new WritableNativeMap();
             map.putString(registrationResult.result(), NAME);
             promise.resolve(map);
           }
-
           @Override
-          public void error(@NonNull AuthenticationError authenticationError) {
-            promise.reject(NAME, authenticationError.toString());
+          public void error(TSWebAuthnRegistrationError tsWebAuthnRegistrationError) {
+            promise.reject(NAME, tsWebAuthnRegistrationError.toString());
           }
         }
       );
@@ -97,35 +90,34 @@ public void error(@NonNull AuthenticationError authenticationError) {
 
   // Authentication
   @ReactMethod
-  @NonNull public void authenticate(String username, Promise promise) {
+  @NonNull public void authenticateWebAuthn(String username, Promise promise) {
       if(reactContext.getCurrentActivity() != null) {
-        TSAuthentication.authenticate(
+        TSAuthentication.authenticateWebAuthn(
           reactContext.getCurrentActivity(),
           username,
-          new TSAuthCallback<AuthenticationResult>() {
+          new TSAuthCallback<AuthenticationResult, TSWebAuthnAuthenticationError>() {
             @Override
             public void success(AuthenticationResult authenticationResult) {
               WritableMap map = new WritableNativeMap();
               map.putString(authenticationResult.result(), NAME);
               promise.resolve(map);
             }
-
             @Override
-            public void error(@NonNull AuthenticationError authenticationError) {
-              promise.reject(NAME, authenticationError.toString());
+            public void error(TSWebAuthnAuthenticationError tsWebAuthnAuthenticationError) {
+              promise.reject(NAME, tsWebAuthnAuthenticationError.toString());
             }
-          }
-        );
+          });
       }
     }
 
+  // Transaction
   @ReactMethod
-  @NonNull public void signTransaction(String username, Promise promise) {
+  @NonNull public void signTransactionWebAuthn(String username, Promise promise) {
     if(reactContext.getCurrentActivity() != null) {
-      TSAuthentication.signTransaction(
+      TSAuthentication.signTransactionWebAuthn(
         reactContext.getCurrentActivity(),
         username,
-        new TSAuthCallback<AuthenticationResult>() {
+        new TSAuthCallback<AuthenticationResult, TSWebAuthnAuthenticationError>() {
           @Override
           public void success(AuthenticationResult authenticationResult) {
             WritableMap map = new WritableNativeMap();
@@ -134,12 +126,40 @@ public void success(AuthenticationResult authenticationResult) {
           }
 
           @Override
-          public void error(@NonNull AuthenticationError authenticationError) {
-            promise.reject(NAME, authenticationError.toString());
+          public void error(TSWebAuthnAuthenticationError tsWebAuthnAuthenticationError) {
+            promise.reject(NAME, tsWebAuthnAuthenticationError.toString());
+          }
+        }
+      );
+    }
+  }
+
+  @ReactMethod
+  @NonNull public void getDeviceInfo(Promise promise) {
+    if(reactContext.getCurrentActivity() != null) {
+      TSAuthentication.getDeviceInfo(
+        reactContext.getCurrentActivity(),
+        new TSAuthCallback<DeviceInfo, TSDeviceInfoError>() {
+          @Override
+          public void success(DeviceInfo deviceInfo) {
+            WritableMap map = new WritableNativeMap();
+            map.putString("publicKeyId", deviceInfo.getPublicKeyId());
+            map.putString("publicKey", deviceInfo.getPublicKey());
+            promise.resolve(map);
+          }
+
+          @Override
+          public void error(TSDeviceInfoError tsDeviceInfoError) {
+            promise.reject(NAME, tsDeviceInfoError.toString());
           }
         }
       );
     }
   }
+
+  @ReactMethod
+  @NonNull public void isWebAuthnSupported(Promise promise) {
+    promise.resolve(TSAuthentication.isWebAuthnSupported());
+  }
 }