Merge pull request #5 from getyoti/ED-714

[ED-714]Remove CustomCertificate class and functionality

Author: eduardoyoti

gradle.properties

@@ -32,8 +32,8 @@ supportLibraryVersion=25.3.1
 libJunitVersion=4.12
 libMockitoVersion=1.10.19
 
-currentVersion=0.0.6
-currentVersionCode=000006
+currentVersion=1.0.0
+currentVersionCode=000007
 currentAppName=Mobile Button SDK
 artefactName=yoti-button-sdk
 

sample-app/src/main/java/com/yoti/mobile/android/sdk/sampleapp/SampleApp.java

@@ -5,7 +5,6 @@
 
 import com.yoti.mobile.android.sdk.YotiSDK;
 import com.yoti.mobile.android.sdk.exceptions.YotiSDKNotValidScenarioException;
-import com.yoti.mobile.android.sdk.model.CustomCertificate;
 import com.yoti.mobile.android.sdk.model.Scenario;
 
 import static android.content.ContentValues.TAG;
@@ -16,20 +15,13 @@ public class SampleApp extends Application {
     public void onCreate() {
         super.onCreate();
 
-        CustomCertificate customCertificate = new CustomCertificate();
-        customCertificate.setCertificateResourceId(R.raw.certificate);
-        customCertificate.setAlias("test");
-        customCertificate.setPassword("test123");
-        customCertificate.setStoreName("TEST");
-
         try {
             Scenario scenario = new Scenario.Builder()
                     .setUseCaseId("get_user_phone_1")
                     .setClientSDKId("d10b19d3-fa50-48ab-bd8c-f5a099205e6c")
                     .setScenarioId("17807359-a933-4b77-baa2-3c2fdb5608f2")
                     .setCallbackAction("com.test.app.YOTI_CALLBACK")
                     .setBackendCallbackAction("com.test.app.BACKEND_CALLBACK")
-                    .setCustomCertificate(customCertificate)
                     .create();
 
             YotiSDK.addScenario(scenario);

sample-app/src/main/res/raw/certificate.pem

@@ -1,50 +1,27 @@
 package com.yoti.mobile.android.sdk.kernelSDK;
 
-import android.content.Context;
 import android.support.annotation.NonNull;
 
 import com.yoti.mobile.android.sdk.YotiSDKLogger;
-import com.yoti.mobile.android.sdk.model.CustomCertificate;
 import com.yoti.mobile.android.sdk.model.Scenario;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 
 import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManagerFactory;
 
 public class KernelSDK {
 
-    private final Context mContext;
-    private final CertificateManager mCertMgr;
-
-    public KernelSDK(Context context) {
-        mContext = context;
-
-        mCertMgr = new CertificateManager(mContext);
-    }
-
     /**
      * Will make a call to the Yoti Connect API to retrieve the Uri for the provided Scenario
      *
      * @param currentScenario
      * @return the uri of the provided scenario to forward to the Yoti app
-     * @throws CertificateException
-     * @throws NoSuchAlgorithmException
-     * @throws KeyStoreException
-     * @throws KeyManagementException
      * @throws IOException
      */
-    public String retrieveScenarioUri(Scenario currentScenario) throws CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException, IOException {
+    public String retrieveScenarioUri(Scenario currentScenario) throws IOException {
 
         URL url = new URL(String.format(EnvironmentConfiguration.GET_QR_CODE_URL, currentScenario.getClientSDKId(), currentScenario.getScenarioId()));
 
@@ -66,21 +43,10 @@ public String retrieveScenarioUri(Scenario currentScenario) throws CertificateEx
     public void processShareResult(@NonNull Scenario currentScenario, @NonNull ICallbackBackendListener listener) {
 
         try {
-
             URL url = new URL(currentScenario.getCallbackBackendUrl());
 
-            CustomCertificate certificate = currentScenario.getCustomCertificate();
             HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection();
 
-            if (certificate != null) {
-                mCertMgr.storeCrt(certificate.getCertificateResourceId(),
-                        certificate.getStoreName(),
-                        certificate.getPassword(),
-                        certificate.getAlias());
-
-                urlConnection.setSSLSocketFactory(getSslSocketFactory(certificate.getStoreName(), certificate.getPassword()));
-            }
-
             int statusCode = urlConnection.getResponseCode();
 
             byte[] response = getBytes(urlConnection);
@@ -95,7 +61,7 @@ public void processShareResult(@NonNull Scenario currentScenario, @NonNull ICall
                 YotiSDKLogger.warning("ICallbackBackendListener is null");
             }
 
-        } catch (IOException | CertificateException | NoSuchAlgorithmException | KeyManagementException | KeyStoreException e) {
+        } catch (IOException e) {
             if (listener != null) {
                 listener.onError(-1, e, null);
             } else {
@@ -104,36 +70,6 @@ public void processShareResult(@NonNull Scenario currentScenario, @NonNull ICall
         }
     }
 
-    /**
-     * return a SSlSocketFactory for the provided store name
-     *
-     * @param storeName
-     * @param storePassword
-     * @return
-     * @throws KeyStoreException
-     * @throws IOException
-     * @throws NoSuchAlgorithmException
-     * @throws CertificateException
-     * @throws KeyManagementException
-     */
-    private SSLSocketFactory getSslSocketFactory(String storeName, String storePassword) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, KeyManagementException {
-
-        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        InputStream fos = mCertMgr.getKeyStoreAr(storeName);
-        keyStore.load(fos, storePassword.toCharArray());
-
-        // Create a TrustManager that trusts the CAs in our KeyStore
-        String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance(tmfAlgorithm);
-        tmf.init(keyStore);
-
-        // Create an SSLContext that uses our TrustManager
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(null, tmf.getTrustManagers(), null);
-
-        return sslContext.getSocketFactory();
-    }
-
     /**
      * read bytes from a UrlConnection
      *

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/kernelSDK/KernelSDK.java

@@ -49,7 +49,7 @@ public KernelSDKIntentService() {
     @Override
     public void onCreate() {
         super.onCreate();
-        mKernelSDK = new KernelSDK(this);
+        mKernelSDK = new KernelSDK();
     }
 
     /**
@@ -102,7 +102,7 @@ private void handleActionStartScenario(String useCaseId, ResultReceiver resultRe
         String qrCodeUrl = null;
         try {
             qrCodeUrl = mKernelSDK.retrieveScenarioUri(currentScenario);
-        } catch (CertificateException | NoSuchAlgorithmException | KeyManagementException | KeyStoreException | IOException e) {
+        } catch (IOException e) {
             YotiSDKLogger.error("Error while reaching Connect API", e);
         }
 

yoti-sdk/src/main/java/com/yoti/mobile/android/sdk/kernelSDK/KernelSDKIntentService.java

@@ -19,7 +19,6 @@ public class Scenario {
     private String callbackAction;
     private String qrCodeUrl;
     private String callbackBackendAction;
-    private CustomCertificate customCertificate;
     private String callbackBackendUrl;
 
     public String getUseCaseId() {
@@ -70,14 +69,6 @@ public void setCallbackBackendAction(String callbackBackendAction) {
         this.callbackBackendAction = callbackBackendAction;
     }
 
-    public CustomCertificate getCustomCertificate() {
-        return customCertificate;
-    }
-
-    public void setCustomCertificate(CustomCertificate customCertificate) {
-        this.customCertificate = customCertificate;
-    }
-
     public String getCallbackBackendUrl() {
         return callbackBackendUrl;
     }
@@ -131,13 +122,6 @@ public Builder setCallbackAction(String action) {
             return this;
         }
 
-        public Builder setCustomCertificate(CustomCertificate customCertificate) {
-            if (customCertificate.isValid()) {
-                mScenario.setCustomCertificate(customCertificate);
-            }
-            return this;
-        }
-
         public Scenario create() {
             return mScenario;
         }