Skip to content

Commit

Permalink
resolve PR review comments
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryan Tate <[email protected]>
  • Loading branch information
@Ryanmtate
Ryanmtate committed Oct 18, 2024
1 parent 876d1ae commit c73baef
Show file tree
Hide file tree
Showing 6 changed files with 129 additions and 284 deletions.
141 changes: 63 additions & 78 deletions MobileSdkRs/Sources/MobileSdkRs/mobile_sdk_rs.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1323,11 +1323,11 @@ public convenience init(vdcCollection: VdcCollection, trustedDids: [String])asyn
* This constructor will use the provided credentials for the presentation,
* instead of searching for credentials in the VDC collection.
*/
public static func newWithCredentials(providedCredentials: [Credential], trustedDids: [String])async throws -> Holder {
public static func newWithCredentials(providedCredentials: [ParsedCredential], trustedDids: [String])async throws -> Holder {
return
try await uniffiRustCallAsync(
rustFutureFunc: {
uniffi_mobile_sdk_rs_fn_constructor_holder_new_with_credentials(FfiConverterSequenceTypeCredential.lower(providedCredentials),FfiConverterSequenceString.lower(trustedDids)
uniffi_mobile_sdk_rs_fn_constructor_holder_new_with_credentials(FfiConverterSequenceTypeParsedCredential.lower(providedCredentials),FfiConverterSequenceString.lower(trustedDids)
)
},
pollFunc: ffi_mobile_sdk_rs_rust_future_poll_pointer,
Expand Down Expand Up @@ -3100,6 +3100,11 @@ public protocol ParsedCredentialProtocol : AnyObject {
*/
func asMsoMdoc() -> Mdoc?

/**
* Return the credential as an SD-JWT, if it is of that format.
*/
func asSdJwt() -> SdJwt?

/**
* Return the format of the credential.
*/
Expand Down Expand Up @@ -3265,6 +3270,16 @@ open func asMsoMdoc() -> Mdoc? {
uniffi_mobile_sdk_rs_fn_method_parsedcredential_as_mso_mdoc(self.uniffiClonePointer(),$0
)
})
}

/**
* Return the credential as an SD-JWT, if it is of that format.
*/
open func asSdJwt() -> SdJwt? {
return try! FfiConverterOptionTypeSdJwt.lift(try! rustCall() {
uniffi_mobile_sdk_rs_fn_method_parsedcredential_as_sd_jwt(self.uniffiClonePointer(),$0
)
})
}

/**
Expand Down Expand Up @@ -3800,11 +3815,6 @@ public protocol SdJwtProtocol : AnyObject {
*/
func decodeRevealJsonString() throws -> String

/**
* Access the revealed SD-JWT disclosures as an vector of UTF-8 encoded strings.
*/
func disclosures() -> [String]

/**
* Return the ID for the SdJwt instance.
*/
Expand Down Expand Up @@ -3885,17 +3895,6 @@ public static func newFromCompactSdJwtWithKey(input: String, keyAlias: KeyAlias)
})
}

/**
* Create an instance of a SdJwt from a generic credential type.
*/
public static func newFromCredential(credential: Credential)throws -> SdJwt {
return try FfiConverterTypeSdJwt.lift(try rustCallWithError(FfiConverterTypeSdJwtError.lift) {
uniffi_mobile_sdk_rs_fn_constructor_sdjwt_new_from_credential(
FfiConverterTypeCredential.lower(credential),$0
)
})
}



/**
Expand All @@ -3916,16 +3915,6 @@ open func decodeRevealJsonString()throws -> String {
uniffi_mobile_sdk_rs_fn_method_sdjwt_decode_reveal_json_string(self.uniffiClonePointer(),$0
)
})
}

/**
* Access the revealed SD-JWT disclosures as an vector of UTF-8 encoded strings.
*/
open func disclosures() -> [String] {
return try! FfiConverterSequenceString.lift(try! rustCall() {
uniffi_mobile_sdk_rs_fn_method_sdjwt_disclosures(self.uniffiClonePointer(),$0
)
})
}

/**
Expand Down Expand Up @@ -5625,13 +5614,13 @@ public enum CredentialDecodingError {



case MsoMdoc(String
case MsoMdoc(MdocInitError
)
case JsonVc(String
case JsonVc(JsonVcInitError
)
case JwtVc(String
case JwtVc(JwtVcInitError
)
case SdJwt(String
case SdJwt(SdJwtError
)
case UnsupportedCredentialFormat(String
)
Expand All @@ -5653,16 +5642,16 @@ public struct FfiConverterTypeCredentialDecodingError: FfiConverterRustBuffer {


case 1: return .MsoMdoc(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeMdocInitError.read(from: &buf)
)
case 2: return .JsonVc(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeJsonVcInitError.read(from: &buf)
)
case 3: return .JwtVc(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeJwtVcInitError.read(from: &buf)
)
case 4: return .SdJwt(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeSdJwtError.read(from: &buf)
)
case 5: return .UnsupportedCredentialFormat(
try FfiConverterString.read(from: &buf)
Expand All @@ -5687,22 +5676,22 @@ public struct FfiConverterTypeCredentialDecodingError: FfiConverterRustBuffer {

case let .MsoMdoc(v1):
writeInt(&buf, Int32(1))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeMdocInitError.write(v1, into: &buf)


case let .JsonVc(v1):
writeInt(&buf, Int32(2))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeJsonVcInitError.write(v1, into: &buf)


case let .JwtVc(v1):
writeInt(&buf, Int32(3))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeJwtVcInitError.write(v1, into: &buf)


case let .SdJwt(v1):
writeInt(&buf, Int32(4))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeSdJwtError.write(v1, into: &buf)


case let .UnsupportedCredentialFormat(v1):
Expand Down Expand Up @@ -5737,11 +5726,11 @@ public enum CredentialEncodingError {



case MsoMdoc(String
case MsoMdoc(MdocEncodingError
)
case JsonVc(String
case JsonVc(JsonVcEncodingError
)
case SdJwt(String
case SdJwt(SdJwtError
)
}

Expand All @@ -5757,13 +5746,13 @@ public struct FfiConverterTypeCredentialEncodingError: FfiConverterRustBuffer {


case 1: return .MsoMdoc(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeMdocEncodingError.read(from: &buf)
)
case 2: return .JsonVc(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeJsonVcEncodingError.read(from: &buf)
)
case 3: return .SdJwt(
try FfiConverterString.read(from: &buf)
try FfiConverterTypeSdJwtError.read(from: &buf)
)

default: throw UniffiInternalError.unexpectedEnumCase
Expand All @@ -5779,17 +5768,17 @@ public struct FfiConverterTypeCredentialEncodingError: FfiConverterRustBuffer {

case let .MsoMdoc(v1):
writeInt(&buf, Int32(1))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeMdocEncodingError.write(v1, into: &buf)


case let .JsonVc(v1):
writeInt(&buf, Int32(2))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeJsonVcEncodingError.write(v1, into: &buf)


case let .SdJwt(v1):
writeInt(&buf, Int32(3))
FfiConverterString.write(v1, into: &buf)
FfiConverterTypeSdJwtError.write(v1, into: &buf)

}
}
Expand Down Expand Up @@ -8515,6 +8504,27 @@ fileprivate struct FfiConverterOptionTypeMdoc: FfiConverterRustBuffer {
}
}

fileprivate struct FfiConverterOptionTypeSdJwt: FfiConverterRustBuffer {
typealias SwiftType = SdJwt?

public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
guard let value = value else {
writeInt(&buf, Int8(0))
return
}
writeInt(&buf, Int8(1))
FfiConverterTypeSdJwt.write(value, into: &buf)
}

public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
switch try readInt(&buf) as Int8 {
case 0: return nil
case 1: return try FfiConverterTypeSdJwt.read(from: &buf)
default: throw UniffiInternalError.unexpectedOptionalTag
}
}
}

fileprivate struct FfiConverterOptionTypeCredentialInfo: FfiConverterRustBuffer {
typealias SwiftType = CredentialInfo?

Expand Down Expand Up @@ -8663,28 +8673,6 @@ fileprivate struct FfiConverterSequenceString: FfiConverterRustBuffer {
}
}

fileprivate struct FfiConverterSequenceTypeCredential: FfiConverterRustBuffer {
typealias SwiftType = [Credential]

public static func write(_ value: [Credential], into buf: inout [UInt8]) {
let len = Int32(value.count)
writeInt(&buf, len)
for item in value {
FfiConverterTypeCredential.write(item, into: &buf)
}
}

public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [Credential] {
let len: Int32 = try readInt(&buf)
var seq = [Credential]()
seq.reserveCapacity(Int(len))
for _ in 0 ..< len {
seq.append(try FfiConverterTypeCredential.read(from: &buf))
}
return seq
}
}

fileprivate struct FfiConverterSequenceTypeParsedCredential: FfiConverterRustBuffer {
typealias SwiftType = [ParsedCredential]

Expand Down Expand Up @@ -9873,6 +9861,9 @@ private var initializationResult: InitializationResult = {
if (uniffi_mobile_sdk_rs_checksum_method_parsedcredential_as_mso_mdoc() != 54804) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_method_parsedcredential_as_sd_jwt() != 46834) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_method_parsedcredential_format() != 39112) {
return InitializationResult.apiChecksumMismatch
}
Expand Down Expand Up @@ -9918,9 +9909,6 @@ private var initializationResult: InitializationResult = {
if (uniffi_mobile_sdk_rs_checksum_method_sdjwt_decode_reveal_json_string() != 58650) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_method_sdjwt_disclosures() != 25363) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_method_sdjwt_id() != 55842) {
return InitializationResult.apiChecksumMismatch
}
Expand Down Expand Up @@ -9969,7 +9957,7 @@ private var initializationResult: InitializationResult = {
if (uniffi_mobile_sdk_rs_checksum_constructor_holder_new() != 41846) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_constructor_holder_new_with_credentials() != 50697) {
if (uniffi_mobile_sdk_rs_checksum_constructor_holder_new_with_credentials() != 3358) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_constructor_ihttpclient_new_async() != 55307) {
Expand Down Expand Up @@ -10038,9 +10026,6 @@ private var initializationResult: InitializationResult = {
if (uniffi_mobile_sdk_rs_checksum_constructor_sdjwt_new_from_compact_sd_jwt_with_key() != 22633) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_constructor_sdjwt_new_from_credential() != 10802) {
return InitializationResult.apiChecksumMismatch
}
if (uniffi_mobile_sdk_rs_checksum_constructor_vdccollection_new() != 31236) {
return InitializationResult.apiChecksumMismatch
}
Expand Down
Loading

0 comments on commit c73baef

Please sign in to comment.