@procivis/react-native-one-core 1.77931.0 → 1.81885.0

package/ios/RSEPinPad.swift

@@ -1,74 +1,21 @@
 import UIKit
-import UBQKit
 
 @objc
 public class RSEPinPad: UIView {
     
     static let sharedPinPad: UBQPinPad = {
-        let pinPad = UBQPinPad(biometricsButtonShown: false)
-        fixSubviews(view: pinPad)
-        return pinPad
+        fatalError("sharedPinPad() has not been implemented")
     }()
     
     override init(frame: CGRect) {
-        super.init(frame: frame)
-        let pinPad = RSEPinPad.self.sharedPinPad
-        self.addSubview(pinPad)
-        pinPad.frame = self.bounds
-        pinPad.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-        pinPad.translatesAutoresizingMaskIntoConstraints = true
-        pinPad.listener = self
+        fatalError("init(frame:) has not been implemented")
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
     
-    public override func layoutSubviews() {
-        super.layoutSubviews()
-        RSEPinPad.fixSubviews(view: self)
-    }
-    
     public static func fixSubviews(view: UIView) {
-        view.subviews.forEach { subview in
-            if subview.isKind(of: UIStackView.self), let stackview = subview as? UIStackView {
-                stackview.backgroundColor = .white
-                stackview.layer.borderColor = .none
-            }
-            if subview.isKind(of: UIButton.self) {
-                var constraintsToRemove: [NSLayoutConstraint] = []
-                view.constraints.forEach { constraint in
-                    if constraint.firstAttribute == .width || constraint.firstAttribute == .height {
-                        constraintsToRemove.append(constraint)
-                    }
-                }
-                view.removeConstraints(constraintsToRemove)
-                subview.autoresizingMask = []
-                subview.translatesAutoresizingMaskIntoConstraints = false
-                subview.removeConstraints(subview.constraints)
-                subview.widthAnchor.constraint(equalToConstant: 72).isActive = true
-                subview.heightAnchor.constraint(equalToConstant: 72).isActive = true
-                subview.layer.cornerRadius = 36
-                subview.backgroundColor = .systemGray5
-            } else if subview.isKind(of: UILabel.self), let label = subview as? UILabel {
-                label.textColor = .black
-                label.highlightedTextColor = .black
-                label.tintColor = .black
-            } else {
-                subview.backgroundColor = .clear
-                subview.layer.borderColor = .none
-                subview.layer.borderWidth = 0
-                subview.tintColor = .black
-            }
-            fixSubviews(view: subview)
-        }
-    }
-}
-
-extension RSEPinPad: UBQPinPadReporting {
-    
-    public func amountOfDigitsDidChange(newAmount: Int) {
-        ProcivisOneCoreEventEmitter.shared.sendDigitsEnteredEvent(amount: newAmount)
-        RSEPinPad.fixSubviews(view: RSEPinPad.sharedPinPad)
+        fatalError("fixSubviews(view:) has not been implemented")
     }
 }

package/ios/Serialize.swift

@@ -37,8 +37,8 @@ private func serializeSpecific(_ value: Encodable) throws -> Any? {
         return try serialize(proofRequestClaimValue: data)
     case let data as HandleInvitationResponseBindingEnum:
         return try serialize(invitationResponse: data)
-    case let data as CredentialQueryResponseBindingDto:
-        return try serialize(credentialQuery: data)
+    case let data as ApplicableCredentialOrFailureHintBindingEnum:
+        return try serialize(applicableCredentialQuery: data)
     case let data as PresentationDefinitionV2ClaimValueBindingDto:
         return try serialize(presentationDefinitionV2ClaimValue: data)
 
@@ -47,38 +47,68 @@ private func serializeSpecific(_ value: Encodable) throws -> Any? {
     }
 }
 
-private func serialize(historyMetadata: HistoryMetadataBinding) throws -> Any {
+private func serialize(historyMetadata: HistoryMetadataBinding) throws -> NSDictionary {
     switch (historyMetadata) {
     case let .unexportableEntities(value):
-        return try serializeAny(value);
+        return [
+            "type_": "UNEXPORTABLE_ENTITIES",
+            "value": try serializeAny(value)
+        ];
     case let .errorMetadata(value):
-        return try serializeAny(value);
+        return [
+            "type_": "ERROR_METADATA",
+            "value": try serializeAny(value)
+        ];
     case let .walletUnitJwt(value):
-        return ["jwt": value] as NSDictionary;
+        return [
+            "type_": "WALLET_UNIT_JWT",
+            "value": [value]
+        ];
     }
 }
 
-private func serialize(claimValue: ClaimValueBindingDto) throws -> Any {
+private func serialize(claimValue: ClaimValueBindingDto) throws -> NSDictionary {
     switch (claimValue) {
     case let .boolean(value):
-        return value;
+        return [
+            "type_": "BOOLEAN",
+            "value": value
+        ];
     case let .float(value):
-        return value;
+        return [
+            "type_": "FLOAT",
+            "value": value
+        ];
     case let .integer(value):
-        return NSNumber(value: value);
+        return [
+            "type_": "INTEGER",
+            "value": NSNumber(value: value)
+        ];
     case let .string(value):
-        return value;
+        return [
+            "type_": "STRING",
+            "value": value
+        ];
     case .nested(value: let values):
-        return try values.map { try serializeAny($0) }
+        return [
+            "type_": "NESTED",
+            "value": try values.map { try serializeAny($0) }
+        ];
     }
 }
 
-private func serialize(proofRequestClaimValue: ProofRequestClaimValueBindingDto) throws -> Any {
+private func serialize(proofRequestClaimValue: ProofRequestClaimValueBindingDto) throws -> NSDictionary {
     switch (proofRequestClaimValue) {
     case let .value(value):
-        return value;
+        return [
+            "type_": "VALUE",
+            "value": value
+        ];
     case .claims(value: let values):
-        return try values.map { try serializeAny($0)}
+        return [
+            "type_": "CLAIMS",
+            "value": try values.map { try serializeAny($0)}
+        ];
     }
 }
 
@@ -86,6 +116,7 @@ private func serialize(invitationResponse: HandleInvitationResponseBindingEnum)
     switch (invitationResponse) {
     case let .credentialIssuance(interactionId, keyStorageSecurityLevels, keyAlgorithms, txCode):
         var result: [String: Any] = [
+            "type_": "CREDENTIAL_ISSUANCE",
             "interactionId": interactionId
         ];
         if let keyStorageSecurityLevels = keyStorageSecurityLevels {
@@ -101,40 +132,62 @@ private func serialize(invitationResponse: HandleInvitationResponseBindingEnum)
 
     case let .proofRequest(interactionId, proofId):
         return [
+            "type_": "PROOF_REQUEST",
             "interactionId": interactionId,
             "proofId": proofId
         ];
 
     case let .authorizationCodeFlow(interactionId, authorizationCodeFlowUrl):
         return [
+            "type_": "AUTHORIZATION_CODE_FLOW",
             "interactionId": interactionId,
             "authorizationCodeFlowUrl": authorizationCodeFlowUrl
         ];
     }
 }
 
-private func serialize(credentialQuery: CredentialQueryResponseBindingDto) throws -> Any {
-    var result: [String: Any] = ["multiple": credentialQuery.multiple]
-    switch (credentialQuery.credentialOrFailureHint) {
+private func serialize(applicableCredentialQuery: ApplicableCredentialOrFailureHintBindingEnum) throws -> NSDictionary {
+    switch (applicableCredentialQuery) {
     case let .applicableCredentials(applicableCredentials: value):
-        result["applicableCredentials"] = try serializeAny(value);
+        return [
+            "type_": "APPLICABLE_CREDENTIALS",
+            "applicableCredentials": try serializeAny(value)
+        ];
+
     case let .failureHint(failureHint: value):
-        result["failureHint"] = try serializeAny(value);
+        return [
+            "type_": "FAILURE_HINT",
+            "failureHint": try serializeAny(value)
+        ];
     }
-    return result as NSDictionary;
 }
 
-private func serialize(presentationDefinitionV2ClaimValue: PresentationDefinitionV2ClaimValueBindingDto) throws -> Any {
+private func serialize(presentationDefinitionV2ClaimValue: PresentationDefinitionV2ClaimValueBindingDto) throws -> NSDictionary {
     switch (presentationDefinitionV2ClaimValue) {
     case let .boolean(value):
-        return value;
+        return [
+            "type_": "BOOLEAN",
+            "value": value
+        ];
     case let .float(value):
-        return value;
+        return [
+            "type_": "FLOAT",
+            "value": value
+        ];
     case let .integer(value):
-        return NSNumber(value: value);
+        return [
+            "type_": "INTEGER",
+            "value": NSNumber(value: value)
+        ];
     case let .string(value):
-        return value;
+        return [
+            "type_": "STRING",
+            "value": value
+        ];
     case .nested(value: let values):
-        return try values.map { try serializeAny($0) }
+        return [
+            "type_": "NESTED",
+            "value": try values.map { try serializeAny($0) }
+        ];
     }
 }

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@procivis/react-native-one-core",
-  "version": "1.77931.0",
+  "version": "1.81885.0",
   "author": "Procivis AG (https://procivis.ch)",
   "license": "Apache-2.0",
   "description": "ONE core bindings for React Native",
-  "repository": "https://github.com/procivis/react-native-one-core",
+  "repository": {
+    "url": "git+https://github.com/procivis/react-native-one-core"
+  },
   "homepage": "https://procivis.ch",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/react-native-one-core.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source                  = { :git => "https://gitlab.procivis.ch/procivis/one/react-native-one-core.git" }
   s.source_files            = "ios/**/*.{h,m,swift}"
   s.requires_arc            = true
-  s.ios.vendored_frameworks = "ios/ProcivisOneCore.xcframework", "ios/ProcivisOneCoreFFI.xcframework", "ios/UBQKit.xcframework"
+  s.ios.vendored_frameworks = "ios/ProcivisOneCore.xcframework", "ios/ProcivisOneCoreFFI.xcframework"
   s.prepare_command         = <<-CMD
                               FRAMEWORK_URL=#{sdk['url']}
                               SHA_1_CHECKSUM=#{sdk['sha1']}

package/android/build.gradle_opensource

@@ -1,122 +0,0 @@
-import java.security.MessageDigest
-class Checksum {
-    static getChecksum(file, type) {
-        def digest = MessageDigest.getInstance(type)
-        def inputStream = file.newInputStream()
-        def buffer = new byte[16384]
-        def len
-
-        while((len=inputStream.read(buffer)) > 0) {
-            digest.update(buffer, 0, len)
-        }
-
-        def result = ""
-        for(byte b : digest.digest()) {
-            result += toHex(b)
-        }
-        return result
-    }
-    private static hexChr(int b) {
-        return Integer.toHexString(b & 0xF)
-    }
-    private static toHex(int b) {
-        return hexChr((b & 0xF0) >> 4) + hexChr(b & 0x0F)
-    }
-}
-
-buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'org.jetbrains.kotlin.plugin.serialization:org.jetbrains.kotlin.plugin.serialization.gradle.plugin:1.9.0'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 33)
-    buildToolsVersion = "30.0.2"
-
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 26)
-        targetSdkVersion safeExtGet('targetSdkVersion', 33)
-        versionCode 1
-        versionName "1.0.0"
-        
-        consumerProguardFiles 'proguard-rules.pro'
-    }
-    lintOptions {
-        abortOnError false
-    }
-    buildFeatures {
-        dataBinding true
-    }
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.9.0')}")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
-    implementation 'com.facebook.react:react-native:+'
-
-    releaseApi(name: 'onecore-release', ext: 'aar')
-    debugApi(name: 'onecore-debug', ext: 'aar')
-    implementation 'net.java.dev.jna:jna:5.17.0@aar'
-    implementation 'org.greenrobot:eventbus:3.3.1'
-    implementation("org.jetbrains.kotlin:kotlin-reflect:${safeExtGet('kotlinVersion', '1.9.0')}")
-}
-
-def downloadFile = { url, file ->
-    new URL(url).withInputStream { downloadStream ->
-        file.withOutputStream { fileOut ->
-            fileOut << downloadStream
-        }
-    }
-}
-
-def coreUrlAAR = { buildType ->
-    def name = "onecore-${buildType}"
-    def coreSdkJsonFile = file("$projectDir/../core-sdk.json")
-    def coreSdkJson = new groovy.json.JsonSlurper().parseText(coreSdkJsonFile.text)
-    def sdk = coreSdkJson.android[buildType]
-
-    def url = sdk.url
-    File file = new File("$projectDir/libs/${name}.aar")
-    file.parentFile.mkdirs()
-
-    def sha1Expected = sdk.sha1
-    if (file.exists()) {
-        if (Checksum.getChecksum(file, "SHA1") == sha1Expected) {
-            // all good
-            return
-        }
-        // The file is most likely just stale -> delete and download again
-        file.delete()
-    }
-
-    downloadFile(url, file)
-    def sha1sum = Checksum.getChecksum(file, "SHA1")
-    if (sha1sum != sha1Expected) {
-        // if the file hash still does not match then something is off
-        println "URL($name): $url"
-        println "sha1 expected: $sha1Expected"
-        println "sha1 actual: $sha1sum"
-        throw new Error("AAR file SHA1 mismatch: " + name)
-    }
-}
-
-afterEvaluate {
-    coreUrlAAR('debug')
-    coreUrlAAR('release')
-}

package/android/src/main/java/ch/procivis/one/core/ubiqu/PinPadRunner.kt

@@ -1,123 +0,0 @@
-package ch.procivis.one.core.ubiqu
-
-import android.content.Intent
-import ch.procivis.one.core.NativeKeyStorageException
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.ubiqu.eid.sdk.requests.UbqRequestFlow
-
-object PinPadRunner {
-    enum class RequestType {
-        SUBSCRIBE,
-        TRANSACTION,
-        ADD_BIOMETRICS,
-        CHANGE_PIN
-    }
-
-    enum class RNEvent {
-        RSE_SHOW_PIN,
-        RSE_HIDE_PIN,
-        RSE_DIGITS_ENTERED,
-        RSE_PIN_STAGE,
-        RSE_INCORRECT_PIN
-    }
-
-    enum class RNEventParam {
-        flowType,
-        digitsEntered,
-        stage,
-        attemptsLeft,
-    }
-
-    enum class RNEventStage {
-        CHECK_CURRENT_PIN,
-        NEW_FIRST_PIN,
-        NEW_SECOND_PIN,
-    }
-
-    data class Flow(
-        val flow: UbqRequestFlow,
-        val promise: Util.Promise<String?>,
-        val type: RequestType
-    )
-
-    @Volatile
-    private var activeFlow: Flow? = null
-
-    @Synchronized
-    fun getActiveFlow(): Flow {
-        return activeFlow ?: throw NativeKeyStorageException.Unknown("No active flow")
-    }
-
-    private fun sendRNEvent(context: ReactContext, eventName: String, params: WritableMap?) {
-        context
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit(eventName, params)
-    }
-
-    // ==== called from UbiquKeyStorage
-    @Synchronized
-    fun startPinPadFlow(
-        context: ReactContext,
-        flow: UbqRequestFlow,
-        requestType: RequestType,
-        promise: Util.Promise<String?>
-    ) {
-        if (activeFlow != null) {
-            throw NativeKeyStorageException.Unknown("Another PinPad flow in progress")
-        }
-
-        activeFlow = Flow(flow, promise, requestType)
-
-        val params = Arguments.createMap()
-        params.putString(RNEventParam.flowType.name, requestType.name)
-
-        val initialStage = when (requestType) {
-            RequestType.SUBSCRIBE -> RNEventStage.NEW_FIRST_PIN
-            else -> RNEventStage.CHECK_CURRENT_PIN
-        }
-        params.putString(RNEventParam.stage.name, initialStage.name)
-        sendRNEvent(context, RNEvent.RSE_SHOW_PIN.name, params)
-    }
-
-    @Synchronized
-    fun cancelPinPadFlow() {
-        activeFlow?.promise?.fail(NativeKeyStorageException.Unknown("Canceled by user"))
-        activeFlow = null
-    }
-
-    // ==== called from PinPadWrapper
-    @Synchronized
-    fun finishPinPadFlowSuccess(context: ReactContext, data: String?) {
-        activeFlow?.promise?.succeed(data)
-        activeFlow = null
-        sendRNEvent(context, RNEvent.RSE_HIDE_PIN.name, null)
-    }
-
-    @Synchronized
-    fun finishPinPadFlowFailure(context: ReactContext, error: Throwable) {
-        activeFlow?.promise?.fail(error)
-        activeFlow = null
-        sendRNEvent(context, RNEvent.RSE_HIDE_PIN.name, null)
-    }
-
-    fun digitsEntered(context: ReactContext, numPins: Int) {
-        val params = Arguments.createMap()
-        params.putInt(RNEventParam.digitsEntered.name, numPins)
-        sendRNEvent(context, RNEvent.RSE_DIGITS_ENTERED.name, params)
-    }
-
-    fun pinStage(context: ReactContext, stage: RNEventStage) {
-        val params = Arguments.createMap()
-        params.putString(RNEventParam.stage.name, stage.name)
-        sendRNEvent(context, RNEvent.RSE_PIN_STAGE.name, params)
-    }
-
-    fun incorrectPin(context: ReactContext, attemptsLeft: Int) {
-        val params = Arguments.createMap()
-        params.putInt(RNEventParam.attemptsLeft.name, attemptsLeft)
-        sendRNEvent(context, RNEvent.RSE_INCORRECT_PIN.name, params)
-    }
-}

package/android/src/main/java/ch/procivis/one/core/ubiqu/PinPadViewManager.kt_opensource

@@ -1,20 +0,0 @@
-package ch.procivis.one.core.ubiqu
-
-import android.view.View
-import ch.procivis.one.core.NativeKeyStorageException
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.SimpleViewManager
-import com.facebook.react.uimanager.ThemedReactContext
-
-class PinPadViewManager(private val callerContext: ReactApplicationContext) :
-    SimpleViewManager<View>() {
-    companion object {
-        const val REACT_CLASS = "RCTProcivisRSEPinPad"
-    }
-
-    override fun getName() = REACT_CLASS
-
-    override fun createViewInstance(context: ThemedReactContext): View {
-        throw NativeKeyStorageException.Unsupported()
-    }
-}