Skip to content

Commit

Permalink
Merge branch 'EWC-consortium:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@josmilan
josmilan authored Oct 21, 2024
2 parents bade895 + 7b5f2a6 commit 6a25f5c
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 17 deletions.
10 changes: 9 additions & 1 deletion Sources/eudiWalletOidcIos/Model/PresentationRequest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ public struct PresentationRequest: Codable {
public var responseUri: String?
public var presentationDefinition: String?
public var clientMetaData: String?
public var presentationDefinitionUri: String?
public var clientMetaDataUri: String?
enum CodingKeys: String, CodingKey {
case state = "state"
case clientId = "client_id"
Expand All @@ -22,8 +24,10 @@ public struct PresentationRequest: Codable {
case requestUri = "request_uri"
case presentationDefinition = "presentation_definition"
case clientMetaData = "client_metadata"
case presentationDefinitionUri = "presentation_definition_uri"
case clientMetaDataUri = "client_metadata_uri"
}
public init(state: String?, clientId: String?, redirectUri: String?, responseUri: String?, responseType: String?, responseMode: String?, scope: String?, nonce: String?, requestUri: String?, presentationDefinition: String?, clientMetaData: String?) {
public init(state: String?, clientId: String?, redirectUri: String?, responseUri: String?, responseType: String?, responseMode: String?, scope: String?, nonce: String?, requestUri: String?, presentationDefinition: String?, clientMetaData: String?, presentationDefinitionUri: String?, clientMetaDataUri: String?) {
self.state = state
self.clientId = clientId
self.redirectUri = redirectUri
Expand All @@ -35,6 +39,8 @@ public struct PresentationRequest: Codable {
self.requestUri = requestUri
self.presentationDefinition = presentationDefinition
self.clientMetaData = clientMetaData
self.presentationDefinitionUri = presentationDefinitionUri
self.clientMetaDataUri = clientMetaDataUri
}

public init(from decoder: Decoder) throws {
Expand All @@ -59,6 +65,8 @@ public struct PresentationRequest: Codable {
if let clientMetaDataModel = try? container.decode(ClientMetaData.self, forKey: . clientMetaData) {
clientMetaData = clientMetaDataModel.toJSONString()
}
presentationDefinitionUri = try container.decodeIfPresent(String.self, forKey: .presentationDefinitionUri)
clientMetaDataUri = try container.decodeIfPresent(String.self, forKey: .clientMetaDataUri)
}
}
public struct ClientMetaData: Codable {
Expand Down
16 changes: 8 additions & 8 deletions Sources/eudiWalletOidcIos/Service/IssueService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public class IssueService: NSObject, IssueServiceProtocol {

if responseUrl.contains("code=") ||
responseUrl.contains("error=") ||
responseUrl.contains("presentation_definition=") ||
responseUrl.contains("presentation_definition=") || responseUrl.contains("presentation_definition_uri=") ||
(responseUrl.contains("request_uri=") && !responseUrl.contains("response_type=") && !responseUrl.contains("state=")){
return responseUrl
} else {
Expand Down Expand Up @@ -542,7 +542,7 @@ public class IssueService: NSObject, IssueServiceProtocol {
if types is String {
params = [
"vct": types ?? "",
"format": format ?? "jwt_vc",
"format": formatT ?? "jwt_vc",
"proof": [
"proof_type": "jwt",
"jwt": idToken
Expand All @@ -551,9 +551,9 @@ public class IssueService: NSObject, IssueServiceProtocol {
}else{
params = [
"credential_definition": [
"type": types
"type": types ?? []
],
"format": format ?? "jwt_vc",
"format": formatT ?? "jwt_vc",
"proof": [
"proof_type": "jwt",
"jwt": idToken
Expand All @@ -563,7 +563,7 @@ public class IssueService: NSObject, IssueServiceProtocol {
if credentialOffer.credentials?[0].trustFramework != nil {
params = [
"types": credentialTypes,
"format": formatT,
"format": formatT ?? "jwt_vc",
"proof": [
"proof_type": "jwt",
"jwt": idToken
Expand All @@ -575,9 +575,9 @@ public class IssueService: NSObject, IssueServiceProtocol {
if let dataArray = data as? [String] {
params = [
"credential_definition": [
"type": dataArray
"type": dataArray ?? []
],
"format": formatT,
"format": formatT ?? "jwt_vc",
"proof": [
"proof_type": "jwt",
"jwt": idToken
Expand All @@ -586,7 +586,7 @@ public class IssueService: NSObject, IssueServiceProtocol {
} else if let dataString = data as? String {
params = [
"vct": dataString,
"format": formatT,
"format": formatT ?? "jwt_vc",
"proof": [
"proof_type": "jwt",
"jwt": idToken
Expand Down
74 changes: 66 additions & 8 deletions Sources/eudiWalletOidcIos/Service/VerificationService.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,30 +72,40 @@ public class VerificationService: NSObject, VerificationServiceProtocol {
if let code = data {
let state = URL(string: code)?.queryParameters?["state"] ?? ""
let nonce = URL(string: code)?.queryParameters?["nonce"] ?? ""
let redirectUri = URL(string: code)?.queryParameters?["redirect_uri"] ?? ""
let responseUri = URL(string: code)?.queryParameters?["response_uri"] ?? ""
let redirectUri = URL(string: code)?.queryParameters?["redirect_uri"] ?? responseUri
let clientID = URL(string: code)?.queryParameters?["client_id"] ?? ""
let responseType = URL(string: code)?.queryParameters?["response_type"] ?? ""
let scope = URL(string: code)?.queryParameters?["scope"] ?? ""
let requestUri = URL(string: code)?.queryParameters?["request_uri"] ?? ""
let responseUri = URL(string: code)?.queryParameters?["response_uri"] ?? ""
let responseMode = URL(string: code)?.queryParameters?["response_mode"] ?? ""
var presentationDefinition = URL(string: code)?.queryParameters?["presentation_definition"] ?? ""
var clientMetaData = URL(string: code)?.queryParameters?["client_metadata"] ?? ""
var presentationDefinitionUri = URL(string: code)?.queryParameters?["presentation_definition_uri"] ?? ""
var clientMetaDataUri = URL(string: code)?.queryParameters?["client_metadata_uri"] ?? ""

if presentationDefinition != "" {

let presentationRequest = PresentationRequest(state: state,
if presentationDefinition != "" || presentationDefinitionUri != "" {
var presentationRequest = PresentationRequest(state: state,
clientId: clientID,
redirectUri: redirectUri,
redirectUri: redirectUri ?? responseUri,
responseUri: responseUri,
responseType: responseType,
responseMode: responseMode,
scope: scope,
nonce: nonce,
requestUri: requestUri,
presentationDefinition: presentationDefinition,
clientMetaData: clientMetaData
clientMetaData: clientMetaData,
presentationDefinitionUri: presentationDefinitionUri, clientMetaDataUri: clientMetaDataUri
)
if presentationDefinition == "" && presentationDefinitionUri != "" {
let presentationDefinitionFromUri = await resolvePresentationDefinitionFromURI(url: presentationDefinitionUri)
presentationRequest.presentationDefinition = presentationDefinitionFromUri
}
if clientMetaData == "" && clientMetaDataUri != "" {
let clientMetaDataFromUri = await resolveClientMetaDataFromURI(url: clientMetaDataUri)
presentationRequest.clientMetaData = clientMetaDataFromUri
}
return presentationRequest

} else if requestUri != "" {
Expand All @@ -105,7 +115,7 @@ public class VerificationService: NSObject, VerificationServiceProtocol {
do {
let (data, _) = try await URLSession.shared.data(for: request)
let jsonDecoder = JSONDecoder()
let model = try? jsonDecoder.decode(PresentationRequest.self, from: data)
var model = try? jsonDecoder.decode(PresentationRequest.self, from: data)
if model == nil {
if let jwtString = String(data: data, encoding: .utf8) {
do {
Expand All @@ -126,6 +136,14 @@ public class VerificationService: NSObject, VerificationServiceProtocol {
return nil
}
}
if model?.presentationDefinition == nil && model?.presentationDefinitionUri != "" {
let presentationDefinitionFromUri = await resolvePresentationDefinitionFromURI(url: model?.presentationDefinitionUri)
model?.presentationDefinition = presentationDefinitionFromUri
}
if model?.clientMetaData == nil && model?.clientMetaDataUri != "" {
let clientMetaDataFromUri = await resolveClientMetaDataFromURI(url: model?.clientMetaDataUri)
model?.clientMetaData = clientMetaDataFromUri
}
return model
} catch {
debugPrint("Error:\(error)")
Expand All @@ -136,6 +154,46 @@ public class VerificationService: NSObject, VerificationServiceProtocol {
return nil
}

func resolvePresentationDefinitionFromURI(url: String?) async -> String? {
if let uri = URL(string: url ?? "") {
var request = URLRequest(url: uri)
request.httpMethod = "GET"
do {
let (data, _) = try await URLSession.shared.data(for: request)
if let presentationDefinitionFromUri = String(data: data, encoding: .utf8) {
return presentationDefinitionFromUri
} else {
debugPrint("Error: Could not resolve presentation_definition from URI")
return nil
}
} catch {
debugPrint("Error while fetching presentation_definition from URI: \(error)")
return nil
}
}
return nil
}

func resolveClientMetaDataFromURI(url: String?) async -> String? {
if let uri = URL(string: url ?? "") {
var request = URLRequest(url: uri)
request.httpMethod = "GET"
do {
let (data, _) = try await URLSession.shared.data(for: request)
if let clientMetaDataFromUri = String(data: data, encoding: .utf8) {
return clientMetaDataFromUri
} else {
debugPrint("Error: Could not resolve presentation_definition from URI")
return nil
}
} catch {
debugPrint("Error while fetching presentation_definition from URI: \(error)")
return nil
}
}
return nil
}

private func generateJWTHeader(jwk: [String: Any], did: String) -> String {
let methodSpecificId = did.replacingOccurrences(of: "did:key:", with: "")

Expand Down

0 comments on commit 6a25f5c

Please sign in to comment.