Merge pull request #97 from velocitycareerlabs/VL-6178-verify-issuer.id

verify issuer.id instead of iss
velocitycareerlabs · Feb 1, 2024 · 00bbb96 · 00bbb96
2 parents e194ace + e150a0f
commit 00bbb96
Show file tree

Hide file tree

Showing 6 changed files with 233 additions and 160 deletions.
diff --git a/VCL/VCL.xcodeproj/project.pbxproj b/VCL/VCL.xcodeproj/project.pbxproj
@@ -1892,7 +1892,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 123;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 7DDDGP43MJ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1905,7 +1905,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.23.2;
+				MARKETING_VERSION = 1.23.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.velocitycareerlabs.VCL;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1922,7 +1922,7 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 123;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 7DDDGP43MJ;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1935,7 +1935,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.23.2;
+				MARKETING_VERSION = 1.23.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.velocitycareerlabs.VCL;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/VCL/VCL/impl/data/utils/Utils.swift b/VCL/VCL/impl/data/utils/Utils.swift
@@ -28,15 +28,15 @@ class Utils {
         var identifier: String? = nil
         var stack = [[String: Any]]()
         stack.append(jsonObject)
-
+        
         while (stack.isEmpty == false) {
             let obj = stack.remove(at: stack.count - 1)
-
+            
             identifier = getPrimaryIdentifier(obj[primaryOrgProp!])
             if (identifier != nil) {
                 break
             }
-
+            
             obj.forEach { _, value in
                 if let valueDict = value as? [String: Any] {
                     stack.append(valueDict)
@@ -53,15 +53,19 @@ class Utils {
             return credentialSubject as? String
         }
         return (credentialSubject as? [String: Any])?["identifier"] as? String
-            ?? (credentialSubject as? [String: Any])?["id"] as? String
+        ?? (credentialSubject as? [String: Any])?["id"] as? String
     }
 
     static func offersFromJsonArray(offersJsonArray: [[String: Any]]) -> [VCLOffer] {
         var allOffers = [VCLOffer]()
-        offersJsonArray.forEach { 
+        offersJsonArray.forEach {
             allOffers.append(VCLOffer(payload: $0))
         }
         return allOffers
     }
-
+
+    static func getCredentialIssuerId(jwtCredential: VCLJwt) -> String? {
+        let vc: [String: Any]? = jwtCredential.payload?["vc"] as? [String: Any]
+        return (vc?["issuer"] as? [String: Any])?["id"] as? String ?? vc?["issuer"] as? String
+    }
 }
diff --git a/VCL/VCL/impl/data/verifiers/CredentialIssuerVerifierImpl.swift b/VCL/VCL/impl/data/verifiers/CredentialIssuerVerifierImpl.swift
@@ -262,7 +262,11 @@ class CredentialIssuerVerifierImpl: CredentialIssuerVerifier {
                 let activeContext = (((completeContext[CodingKeys.KeyContext] as? [String: Any])?[credentialSubjectType] as? [String: Any]))?[CodingKeys.KeyContext] as? [String: Any] ?? completeContext
                 if let K = findKeyForPrimaryOrganizationValue(activeContext) {
                     if let did = Utils.getIdentifier(K, credentialSubject) {
-                        if (jwtCredential.iss == did) {
+//                            Comparing issuer.id instead of iss
+//                            https://velocitycareerlabs.atlassian.net/browse/VL-6178?focusedCommentId=46933
+//                            https://velocitycareerlabs.atlassian.net/browse/VL-6988
+//                            if (jwtCredential.iss == did)
+                        if (Utils.getCredentialIssuerId(jwtCredential: jwtCredential) == did) {
                             isCredentialVerified = true
                             completeConetxDispatcher.leave()
                         } else {

diff --git a/VCL/VCLTests/infrastructure/resources/valid/CredentialMocks.swift b/VCL/VCLTests/infrastructure/resources/valid/CredentialMocks.swift
@@ -37,6 +37,13 @@ class CredentialMocks {
     static let JwtCredentialDriversLicenseFromIdentityIssuer =
         "eyJ0eXAiOiJKV1QiLCJqd2siOnsiY3J2Ijoic2VjcDI1NmsxIiwieCI6ImxkU2gybmdRempJSnhwSktMVkpvbVpEdGQtX1JRMGpzVlgzMFB5ZmdMUEUiLCJ5IjoicEJleVJuMnFYZFNELVhTaG5WVGJCa08tb0VFRmgyV2hneU1VYTRCMHV6RSIsImt0eSI6IkVDIiwia2lkIjoiUXNiZUMzTjVHN2M0NEFQS2dKdWc2X3lhS3ZrR1lQd3B5RjRHVS1sWVpVSSIsImFsZyI6IkVTMjU2SyIsInVzZSI6InNpZyJ9LCJhbGciOiJFUzI1NksifQ.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSJdLCJ0eXBlIjpbIkRyaXZlcnNMaWNlbnNlVjEuMCIsIlZlcmlmaWFibGVDcmVkZW50aWFsIl0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7ImZpcnN0TmFtZSI6eyJsb2NhbGl6ZWQiOnsiZW4iOiJBZGFtIn19LCJsYXN0TmFtZSI6eyJsb2NhbGl6ZWQiOnsiZW4iOiJTbWl0aCJ9fSwia2luZCI6IkRyaXZlcnNMaWNlbnNlIiwiYXV0aG9yaXR5Ijp7ImxvY2FsaXplZCI6eyJlbiI6IkNhbGlmb3JuaWEgRE1WIn19LCJsb2NhdGlvbiI6eyJjb3VudHJ5Q29kZSI6IlVTIiwicmVnaW9uQ29kZSI6IkNBIn0sImRvYiI6eyJkYXkiOjIwLCJtb250aCI6NiwieWVhciI6MTk2Nn0sImlkZW50aXR5TnVtYmVyIjoiMTIzMTAzMTIzMTIifX0sImlzcyI6ImRpZDp2ZWxvY2l0eToweGJhN2Q4N2Y5ZDVlNDczZDdkM2E4MmQxNTI5MjNhZGI1M2RlOGZjMGUiLCJqdGkiOiJkaWQ6dmVsb2NpdHk6MHgyOWRhZTM3ZGIzYzYwYmIyZmY5ZThiZmU4ZTM4YzkxZmUzYjlhZDIyIiwiaWF0IjoxNjM0NTEwODk2LCJuYmYiOjE2MzQ1MTA4OTZ9._nWDDYVf11-KeCKXLNaQ_t2giZB2chFIGS2IVjCHs3dXoUWNG5WC1e-dRTBGngrtOTXFUGHgqrkKHqwi9wDaCQ"
 
+    static let JwtCredentialOpenBadgeValid =
+        "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NksiLCJraWQiOiJkaWQ6dmVsb2NpdHk6djI6MHg1NzU3MmNlYTU2ZmI0MDNkYzEzYzYwY2JiYzYzNzE1MDBlMTE0NjU2OjIzNDU3Nzk0MDIzNjM2MDo4MTEja2V5LTEifQ.eyJ2YyI6eyJ0eXBlIjpbIk9wZW5CYWRnZUNyZWRlbnRpYWwiLCJWZXJpZmlhYmxlQ3JlZGVudGlhbCJdLCJpZCI6ImRpZDp2ZWxvY2l0eTp2MjoweDU3NTcyY2VhNTZmYjQwM2RjMTNjNjBjYmJjNjM3MTUwMGUxMTQ2NTY6MjM0NTc3OTQwMjM2MzYwOjgxMSIsImNyZWRlbnRpYWxTdGF0dXMiOnsidHlwZSI6IlZlbG9jaXR5UmV2b2NhdGlvbkxpc3RKYW4yMDIxIiwiaWQiOiJldGhlcmV1bToweDE0OTljODg4NDA5RDYyYjhlQzUwMTZGNEUyYjZiYjRiZUUxRURGNDQvZ2V0UmV2b2tlZFN0YXR1cz9hZGRyZXNzPTB4NTc1NzJjRUE1NkZCNDAzRGMxM2M2MENiYkM2MzcxNTAwZTExNDY1NiZsaXN0SWQ9MTI2NjE4NzUwMjkzMDI2JmluZGV4PTY4NzUiLCJzdGF0dXNMaXN0SW5kZXgiOjY4NzUsInN0YXR1c0xpc3RDcmVkZW50aWFsIjoiZXRoZXJldW06MHgxNDk5Yzg4ODQwOUQ2MmI4ZUM1MDE2RjRFMmI2YmI0YmVFMUVERjQ0L2dldFJldm9rZWRTdGF0dXM_YWRkcmVzcz0weDU3NTcyY0VBNTZGQjQwM0RjMTNjNjBDYmJDNjM3MTUwMGUxMTQ2NTYmbGlzdElkPTEyNjYxODc1MDI5MzAyNiJ9LCJsaW5rQ29kZUNvbW1pdG1lbnQiOnsidHlwZSI6IlZlbG9jaXR5Q3JlZGVudGlhbExpbmtDb2RlQ29tbWl0bWVudDIwMjIiLCJ2YWx1ZSI6IkVpQlJDZVhuUVRxdDY4NGxQbkNhd1ljMFFJRVlIeTZlTjNhR3BlUE9MVlBNTnc9PSJ9LCJpc3N1ZXIiOnsiaWQiOiJkaWQ6aW9uOkVpRFVJMGRhS3J0b0tIWHk0emFFeTZPM0k2Z01xeV95TXRJbDBPZTNtejk4VlEifSwiY29udGVudEhhc2giOnsidHlwZSI6IlZlbG9jaXR5Q29udGVudEhhc2gyMDIwIiwidmFsdWUiOiIwZGYxZjg1OTY4YjdiYWM1YzhlMjNlNGZiZWM1YzY0MGZkOTdhOGQ5NTE1ZDhkYTk3ZDhkZWY4MWMzNzcyMjFmIn0sImNyZWRlbnRpYWxTY2hlbWEiOnsiaWQiOiJodHRwczovL3FhbGliLnZlbG9jaXR5bmV0d29yay5mb3VuZGF0aW9uL3NjaGVtYXMvb3Blbi1iYWRnZS1jcmVkZW50aWFsLnNjaGVtYS5qc29uIiwidHlwZSI6Ikpzb25TY2hlbWFWYWxpZGF0b3IyMDE4In0sInZuZlByb3RvY29sVmVyc2lvbiI6MSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3FhbGliLnZlbG9jaXR5bmV0d29yay5mb3VuZGF0aW9uL2NvbnRleHRzL2NyZWRlbnRpYWwtZXh0ZW5zaW9ucy0yMDIyLmpzb25sZC5qc29uIl0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7InR5cGUiOlsiQWNoaWV2ZW1lbnRTdWJqZWN0Il0sImFjaGlldmVtZW50Ijp7ImlkIjoidXJuOnV1aWQ6YmQ2ZDkzMTYtZjdhZS00MDczLWExZTUtMmY3ZjViZDIyOTIyIiwidHlwZSI6WyJBY2hpZXZlbWVudCJdLCJpc3N1ZXIiOiJkaWQ6aW9uOkVpRFVJMGRhS3J0b0tIWHk0emFFeTZPM0k2Z01xeV95TXRJbDBPZTNtejk4VlEiLCJuYW1lIjoiaXNzdWVyLmlkID0gaWRlbnRpZmllciAoMy4wKSIsImRlc2NyaXB0aW9uIjoiY3JlZGVudGlhbFN1YmplY3QuYWNoaWV2ZW1lbnQuaXNzdWVyID0gaXNzdWVyLmlkLiBUcnVzdGVkIElzc3VlciBjaGVjayBzaG91bGQgUEFTUyIsImNyaXRlcmlhIjp7InR5cGUiOiJDcml0ZXJpYSIsIm5hcnJhdGl2ZSI6ImNyZWRlbnRpYWxTdWJqZWN0LmFjaGlldmVtZW50Lmlzc3VlciA9IGlzc3Vlci5pZC4gVHJ1c3RlZCBJc3N1ZXIgY2hlY2sgc2hvdWxkIFBBU1MifSwiaW1hZ2UiOnsiaWQiOiJodHRwczovL3czYy1jY2cuZ2l0aHViLmlvL3ZjLWVkL3BsdWdmZXN0LTItMjAyMi9pbWFnZXMvSkZGLVZDLUVEVS1QTFVHRkVTVDItYmFkZ2UtaW1hZ2UucG5nIiwidHlwZSI6IkltYWdlIn19LCJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSJdfX0sIm5iZiI6MTcwMzE0NDIyMSwianRpIjoiZGlkOnZlbG9jaXR5OnYyOjB4NTc1NzJjZWE1NmZiNDAzZGMxM2M2MGNiYmM2MzcxNTAwZTExNDY1NjoyMzQ1Nzc5NDAyMzYzNjA6ODExIiwiaXNzIjoiZGlkOmlvbjpFaURVSTBkYUtydG9LSFh5NHphRXk2TzNJNmdNcXlfeU10SWwwT2UzbXo5OFZRIiwiaWF0IjoxNzAzMTQ0MjIxfQ.bN0jjREfyWqcol3RWxKg3pkCHd6wmsqwTQl_7TIZ4DEHqCKo589b1nDi96KBrh7gbw7uuvBJQ7cXT1HO6n5zlA"
+
+    static let JwtCredentialOpenBadgeInvalid =
+        "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NksiLCJraWQiOiJkaWQ6dmVsb2NpdHk6djI6MHg1NzU3MmNlYTU2ZmI0MDNkYzEzYzYwY2JiYzYzNzE1MDBlMTE0NjU2OjIzNDU3Nzk0MDIzNjM2MDo3NzU2I2tleS0xIn0.eyJ2YyI6eyJ0eXBlIjpbIk9wZW5CYWRnZVYyLjAiLCJWZXJpZmlhYmxlQ3JlZGVudGlhbCJdLCJpZCI6ImRpZDp2ZWxvY2l0eTp2MjoweDU3NTcyY2VhNTZmYjQwM2RjMTNjNjBjYmJjNjM3MTUwMGUxMTQ2NTY6MjM0NTc3OTQwMjM2MzYwOjc3NTYiLCJjcmVkZW50aWFsU3RhdHVzIjp7InR5cGUiOiJWZWxvY2l0eVJldm9jYXRpb25MaXN0SmFuMjAyMSIsImlkIjoiZXRoZXJldW06MHgxNDk5Yzg4ODQwOUQ2MmI4ZUM1MDE2RjRFMmI2YmI0YmVFMUVERjQ0L2dldFJldm9rZWRTdGF0dXM_YWRkcmVzcz0weDU3NTcyY0VBNTZGQjQwM0RjMTNjNjBDYmJDNjM3MTUwMGUxMTQ2NTYmbGlzdElkPTEyNjYxODc1MDI5MzAyNiZpbmRleD0xMCIsInN0YXR1c0xpc3RJbmRleCI6MTAsInN0YXR1c0xpc3RDcmVkZW50aWFsIjoiZXRoZXJldW06MHgxNDk5Yzg4ODQwOUQ2MmI4ZUM1MDE2RjRFMmI2YmI0YmVFMUVERjQ0L2dldFJldm9rZWRTdGF0dXM_YWRkcmVzcz0weDU3NTcyY0VBNTZGQjQwM0RjMTNjNjBDYmJDNjM3MTUwMGUxMTQ2NTYmbGlzdElkPTEyNjYxODc1MDI5MzAyNiJ9LCJsaW5rQ29kZUNvbW1pdG1lbnQiOnsidHlwZSI6IlZlbG9jaXR5Q3JlZGVudGlhbExpbmtDb2RlQ29tbWl0bWVudDIwMjIiLCJ2YWx1ZSI6IkVpQkFZRklBeUthNjFwNUhKeWR0SldHaGlTSXZvbHVTd3JzZ1h6dUtYRXJycFE9PSJ9LCJpc3N1ZXIiOnsiaWQiOiJkaWQ6aW9uOkVpRFVJMGRhS3J0b0tIWHk0emFFeTZPM0k2Z01xeV95TXRJbDBPZTNtejk4VlEifSwiY29udGVudEhhc2giOnsidHlwZSI6IlZlbG9jaXR5Q29udGVudEhhc2gyMDIwIiwidmFsdWUiOiJjMWI3YjUzMWQ5MGU1ZmU1NjU0OTY4M2NhNmI0YjJiMWZlMDdjYjU3N2E5NjQ0ODkyYTZjM2E5YmNhMDZiY2FmIn0sImNyZWRlbnRpYWxTY2hlbWEiOnsiaWQiOiJodHRwczovL3FhbGliLnZlbG9jaXR5bmV0d29yay5mb3VuZGF0aW9uL3NjaGVtYXMvb3Blbi1iYWRnZS12Mi4wLnNjaGVtYS5qc29uIiwidHlwZSI6Ikpzb25TY2hlbWFWYWxpZGF0b3IyMDE4In0sInZuZlByb3RvY29sVmVyc2lvbiI6MSwiQGNvbnRleHQiOlsiaHR0cHM6Ly93d3cudzMub3JnLzIwMTgvY3JlZGVudGlhbHMvdjEiLCJodHRwczovL3FhbGliLnZlbG9jaXR5bmV0d29yay5mb3VuZGF0aW9uL2NvbnRleHRzL2NyZWRlbnRpYWwtZXh0ZW5zaW9ucy0yMDIyLmpzb25sZC5qc29uIl0sImNyZWRlbnRpYWxTdWJqZWN0Ijp7Imhhc0NyZWRlbnRpYWwiOnsibmFtZSI6Imlzc3Vlci5pZCAhPSBpZGVudGlmaWVyIE9CVjIuMCIsImltYWdlIjoiaHR0cHM6Ly93d3cuaW1zZ2xvYmFsLm9yZy9zaXRlcy9kZWZhdWx0L2ZpbGVzL0JhZGdlcy9PQnYycDBGaW5hbC9pbWFnZXMvaW1zZ2xvYmFsLWxvZ28ucG5nIiwidHlwZSI6IkJhZGdlQ2xhc3MiLCJkZXNjcmlwdGlvbiI6ImNyZWRlbnRpYWxTdWJqZWN0Lmhhc0NyZWRlbnRpYWwuaXNzdWVyLmlkICE9IGlzc3Vlci5pZCDihpIgVFJVU1RFRF9JU1NVRVI6IEZBSUwiLCJpc3N1ZXIiOnsibmFtZSI6IlVuaXZlcnNhbCBJc3N1ZXIiLCJ0eXBlIjoiUHJvZmlsZSIsImlkIjoiVGVzdCJ9LCJjcml0ZXJpYSI6Imh0dHBzOi8vd3d3LmFldHNvZnQubmV0IiwidGFncyI6WyJzYW1wbGUtdGFnIl19LCJ0eXBlIjoiQmFkZ2UiLCJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vcWFsaWIudmVsb2NpdHluZXR3b3JrLmZvdW5kYXRpb24vY29udGV4dHMvbGF5ZXIxLXYxLjEuanNvbmxkLmpzb24iXX19LCJuYmYiOjE3MDMxNDQyMjEsImp0aSI6ImRpZDp2ZWxvY2l0eTp2MjoweDU3NTcyY2VhNTZmYjQwM2RjMTNjNjBjYmJjNjM3MTUwMGUxMTQ2NTY6MjM0NTc3OTQwMjM2MzYwOjc3NTYiLCJpc3MiOiJkaWQ6aW9uOkVpRFVJMGRhS3J0b0tIWHk0emFFeTZPM0k2Z01xeV95TXRJbDBPZTNtejk4VlEiLCJpYXQiOjE3MDMxNDQyMjF9.cExeY-Qu9WaYV9U5mWKDirdIMilVoPmixDgSkZsmOZCBt99vgfHtlPfyAW-Ez3HlcCwK0v5E8xjhV-IixR36NQ"
+
+
     static let JwtCredentialsFromRegularIssuer =
     "[\"\(JwtCredentialEducationDegreeRegistrationFromRegularIssuer)\", \"\(JwtCredentialEmploymentPastFromRegularIssuer)\"]"
 
@@ -49,5 +56,9 @@ class CredentialMocks {
     static let JwtCredentialsWithoutSubject =
     "[\"\(JwtCredEmailWithoutSubjectJwt)\", \"\(JwtCredPhoneWithoutSubjectJwt)\"]"
 
+    static let JwtCredentialsOpenBadgeValid = "[\"\(JwtCredentialOpenBadgeValid)\"]"
+
+    static let JwtCredentialsOpenBadgeInvalid = "[\"\(JwtCredentialOpenBadgeInvalid)\"]"
+
     static let JwtEmptyCredentials = "[]"
 }