[fix] credential issuer id fix

eu-digital-identity-wallet · Oct 31, 2024 · 83fa4fb · 83fa4fb
1 parent 5483f37
commit 83fa4fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Sources/Entities/CredentialIssuer/CredentialIssuerId.swift b/Sources/Entities/CredentialIssuer/CredentialIssuerId.swift
@@ -21,15 +21,15 @@ public struct CredentialIssuerId: Codable, Equatable {
   public init(_ string: String) throws {
     if let queryItems = URLComponents(string: string)?.queryItems,
        queryItems.count > 0 {
-      throw CredentialError.genericError
+      throw CredentialError.extraneousQueryComponents
     }
 
     guard
       let validURL = URL(string: string),
       validURL.scheme == "https",
       validURL.fragment == nil
     else {
-      throw CredentialError.genericError
+      throw CredentialError.invalidScheme
     }
 
     self.url = validURL
@@ -43,6 +43,6 @@ public struct CredentialIssuerId: Codable, Equatable {
   public init(from decoder: Decoder) throws {
     let container = try decoder.singleValueContainer()
     let urlString = try container.decode(String.self)
-    url = try URL(string: urlString) ?? { throw ValidationError.error(reason: "Invalid credential_issuer URL")}()
+    try self.init(urlString)
   }
 }
diff --git a/Sources/Entities/Errors/CredentialError.swift b/Sources/Entities/Errors/CredentialError.swift
@@ -18,4 +18,6 @@ import Foundation
 public enum CredentialError: Error {
   case genericError
   case issuerDoesNotSupportDeferredIssuance
+  case extraneousQueryComponents
+  case invalidScheme
 }