From 47581f4e65dbca9ff9a03ea8aae7f3862502bafa Mon Sep 17 00:00:00 2001 From: sydneymorton Date: Wed, 14 Oct 2020 10:07:15 -0700 Subject: [PATCH] Fix dependencies and access levels --- VCCrypto/VcCrypto.xcodeproj/project.pbxproj | 4 ++++ VCEntities/VCEntities.xcodeproj/project.pbxproj | 16 ---------------- .../claims/PresentationRequestClaims.swift | 4 ++++ .../VerifiableCredentialDescriptor.swift | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/VCCrypto/VcCrypto.xcodeproj/project.pbxproj b/VCCrypto/VcCrypto.xcodeproj/project.pbxproj index 543a06e..055855a 100644 --- a/VCCrypto/VcCrypto.xcodeproj/project.pbxproj +++ b/VCCrypto/VcCrypto.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 5577E874251E9F99005250BC /* VCCrypto.h in Headers */ = {isa = PBXBuildFile; fileRef = 92CDE7AD24DC78DD00F95B5D /* VCCrypto.h */; settings = {ATTRIBUTES = (Public, ); }; }; 55ADE29924F5752500D9990E /* Sha256.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55ADE29824F5752500D9990E /* Sha256.swift */; }; 55ADE29B24F5757100D9990E /* Sha256Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55ADE29A24F5757100D9990E /* Sha256Tests.swift */; }; + 55EB0D7F253766D300057520 /* Secp256k1.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55EB0D7E253766D300057520 /* Secp256k1.framework */; }; 928AAF7124EEDC9D0029A8F9 /* Secp256k1PublicKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 928AAF7024EEDC9D0029A8F9 /* Secp256k1PublicKey.swift */; }; 928AAF7324EEE0AB0029A8F9 /* Secp256k1PublicKeyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 928AAF7224EEE0AB0029A8F9 /* Secp256k1PublicKeyTests.swift */; }; 92CDE7B424DC78DD00F95B5D /* VCCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92CDE7AA24DC78DD00F95B5D /* VCCrypto.framework */; }; @@ -62,6 +63,7 @@ 5540903C25000F6A001246DB /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = ""; }; 55ADE29824F5752500D9990E /* Sha256.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Sha256.swift; path = ../../../VCCrypto/VCCrypto/Algo/Sha256.swift; sourceTree = ""; }; 55ADE29A24F5757100D9990E /* Sha256Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Sha256Tests.swift; path = ../../VCCrypto/VCCryptoTests/Sha256Tests.swift; sourceTree = ""; }; + 55EB0D7E253766D300057520 /* Secp256k1.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Secp256k1.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 928AAF7024EEDC9D0029A8F9 /* Secp256k1PublicKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secp256k1PublicKey.swift; sourceTree = ""; }; 928AAF7224EEE0AB0029A8F9 /* Secp256k1PublicKeyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secp256k1PublicKeyTests.swift; sourceTree = ""; }; 92B969052524230B00F64AB0 /* Secp256k1.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Secp256k1.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -117,6 +119,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 55EB0D7F253766D300057520 /* Secp256k1.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -249,6 +252,7 @@ C817E43043516B933BA2E4E6 /* Frameworks */ = { isa = PBXGroup; children = ( + 55EB0D7E253766D300057520 /* Secp256k1.framework */, 92B969052524230B00F64AB0 /* Secp256k1.framework */, ); name = Frameworks; diff --git a/VCEntities/VCEntities.xcodeproj/project.pbxproj b/VCEntities/VCEntities.xcodeproj/project.pbxproj index e1f872f..a9b3df0 100644 --- a/VCEntities/VCEntities.xcodeproj/project.pbxproj +++ b/VCEntities/VCEntities.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 551F3066252E71680081D5E7 /* MultihashTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F3065252E71680081D5E7 /* MultihashTests.swift */; }; 551F3068252E97000081D5E7 /* IdentifierCreator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 551F3067252E97000081D5E7 /* IdentifierCreator.swift */; }; 55253976252FCA6D003202D5 /* VCCrypto.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55253975252FCA6D003202D5 /* VCCrypto.framework */; }; - 55253977252FCA6D003202D5 /* VCCrypto.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 55253975252FCA6D003202D5 /* VCCrypto.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 55253982252FDF89003202D5 /* KeyContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55253981252FDF89003202D5 /* KeyContainer.swift */; }; 55575738251BC575009979AB /* VCEntities.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5557572E251BC575009979AB /* VCEntities.framework */; }; 5557573F251BC575009979AB /* VCEntities.h in Headers */ = {isa = PBXBuildFile; fileRef = 55575731251BC575009979AB /* VCEntities.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -93,20 +92,6 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 55253978252FCA6E003202D5 /* Embed Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 55253977252FCA6D003202D5 /* VCCrypto.framework in Embed Frameworks */, - ); - name = "Embed Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 5518CC632526427D00C7A21B /* PresentationResponseClaims.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationResponseClaims.swift; sourceTree = ""; }; 5518CC67252645D000C7A21B /* PresentationSubmission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationSubmission.swift; sourceTree = ""; }; @@ -495,7 +480,6 @@ 5557572A251BC575009979AB /* Sources */, 5557572B251BC575009979AB /* Frameworks */, 5557572C251BC575009979AB /* Resources */, - 55253978252FCA6E003202D5 /* Embed Frameworks */, ); buildRules = ( ); diff --git a/VCEntities/VCEntities/presentation/claims/PresentationRequestClaims.swift b/VCEntities/VCEntities/presentation/claims/PresentationRequestClaims.swift index 237599e..2469bea 100644 --- a/VCEntities/VCEntities/presentation/claims/PresentationRequestClaims.swift +++ b/VCEntities/VCEntities/presentation/claims/PresentationRequestClaims.swift @@ -19,6 +19,9 @@ public struct PresentationRequestClaims: OIDCClaims, Equatable { public let presentationDefinition: PresentationDefinition + /// flag to determine if presentation request can go into issuance flow + public let prompt: String? + enum CodingKeys: String, CodingKey { case clientID = "client_id" case issuer = "iss" @@ -26,6 +29,7 @@ public struct PresentationRequestClaims: OIDCClaims, Equatable { case redirectURI = "redirect_uri" case responseType = "response_type" case responseMode = "response_mode" + case prompt } } diff --git a/VCEntities/VCEntities/verifiableCredential/VerifiableCredentialDescriptor.swift b/VCEntities/VCEntities/verifiableCredential/VerifiableCredentialDescriptor.swift index 1f6a10f..fd4504f 100644 --- a/VCEntities/VCEntities/verifiableCredential/VerifiableCredentialDescriptor.swift +++ b/VCEntities/VCEntities/verifiableCredential/VerifiableCredentialDescriptor.swift @@ -5,7 +5,7 @@ public struct VerifiableCredentialDescriptor: Codable { let context: [String] - let type: [String] + public let type: [String] public let credentialSubject: Dictionary let credentialStatus: ServiceDescriptor? let exchangeService: ServiceDescriptor?