From 0a2497e7e763695eba534620ed2a4f650ab53a9d Mon Sep 17 00:00:00 2001 From: alexchornyi <85160203+alexchornyi@users.noreply.github.com> Date: Fri, 23 Jul 2021 16:02:10 +0300 Subject: [PATCH] fixed contex json for test env (#101) Co-authored-by: Alexandr Chernyy --- Context/Release/context.jsonc | 18 +++++++++++++--- Context/Test/context.jsonc | 32 +++++++++++++++++++--------- DGCAWallet.xcodeproj/project.pbxproj | 16 +++++++------- 3 files changed, 45 insertions(+), 21 deletions(-) diff --git a/Context/Release/context.jsonc b/Context/Release/context.jsonc index cd1fb55..4b863b6 100644 --- a/Context/Release/context.jsonc +++ b/Context/Release/context.jsonc @@ -21,13 +21,25 @@ ] }, "countryList": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/countrylist" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/countrylist", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] }, "rules": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/rules" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/rules", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] }, "valuesets": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/valuesets" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/valuesets", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] } } }, diff --git a/Context/Test/context.jsonc b/Context/Test/context.jsonc index 00b4468..8772b14 100644 --- a/Context/Test/context.jsonc +++ b/Context/Test/context.jsonc @@ -5,13 +5,13 @@ "default": { // catch-all for normal versions "privacyUrl": "https://publications.europa.eu/en/web/about-us/legal-notices/eu-mobile-apps", - "context": { - "url": "https://dgca-issuance-web-eu-acc.cfapps.eu10.hana.ondemand.com/dgca-issuance-service/context", - "pubKeys": [ - "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", - "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" - ] - }, + "context": { + "url": "https://dgca-verifier-service.cfapps.eu10.hana.ondemand.com/context", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] + }, "endpoints": { "claim": { "url": "https://issuance-dgca-test.cfapps.eu10.hana.ondemand.com/dgca-issuance-service/dgci/wallet/claim", @@ -21,13 +21,25 @@ ] }, "countryList": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/countrylist" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/countrylist", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] }, "rules": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/rules" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/rules", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] }, "valuesets": { - "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/valuesets" + "url": "https://dgca-businessrule-service.cfapps.eu10.hana.ondemand.com/valuesets", + "pubKeys": [ + "lKdU1EbQubxyDDm2q3N8KclZ2C94Num3xXjG0pk+3eI=", + "r/mIkG3eEpVdm+u/ko/cwxzOMo1bk4TyHIlByibiA5E=" + ] } } }, diff --git a/DGCAWallet.xcodeproj/project.pbxproj b/DGCAWallet.xcodeproj/project.pbxproj index 3417b37..6efa508 100644 --- a/DGCAWallet.xcodeproj/project.pbxproj +++ b/DGCAWallet.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 5C07261E26AAE853006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB18269DBB4C00074F66 /* context.jsonc */; }; + 5C07261F26AAE854006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB18269DBB4C00074F66 /* context.jsonc */; }; + 5C07262026AAE854006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB18269DBB4C00074F66 /* context.jsonc */; }; 5C50CF09269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; 5C50CF0A269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; 5C50CF0B269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; @@ -49,9 +52,6 @@ 5C50CF3E26983E090015EE29 /* UITableView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF3D26983E090015EE29 /* UITableView+.swift */; }; 5C50CF3F26983E090015EE29 /* UITableView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF3D26983E090015EE29 /* UITableView+.swift */; }; 5C50CF4026983E090015EE29 /* UITableView+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF3D26983E090015EE29 /* UITableView+.swift */; }; - 5C9C65A126A8486C00F14FC2 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; - 5C9C65A226A8486D00F14FC2 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; - 5C9C65A326A8486D00F14FC2 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; 5CE07C762692E0D900A032F9 /* CertLogic in Frameworks */ = {isa = PBXBuildFile; productRef = 5CE07C752692E0D900A032F9 /* CertLogic */; }; 5CE07C7A2692E1CD00A032F9 /* CountryDataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE07C772692E1CC00A032F9 /* CountryDataStorage.swift */; }; 5CE07C7B2692E1CD00A032F9 /* CountryDataStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CE07C772692E1CC00A032F9 /* CountryDataStorage.swift */; }; @@ -567,9 +567,9 @@ DA01661E26554992005B73A1 /* OpenSourceNotices.json in Resources */, CEA6D6F5261F8D2900715333 /* Assets.xcassets in Resources */, 5C50CF0C269700550015EE29 /* CheckValidityVC.xib in Resources */, - 5C9C65A126A8486C00F14FC2 /* context.jsonc in Resources */, CEA6D6F3261F8D2700715333 /* Main.storyboard in Resources */, 5C50CF14269700710015EE29 /* RuleValidationResultVC.xib in Resources */, + 5C07261E26AAE853006C4986 /* context.jsonc in Resources */, DA017DE626552259006E4D49 /* Licenses.storyboard in Resources */, 5C50CF2A26972BCA0015EE29 /* CellWithTitleAndDescriptionTVC.xib in Resources */, ); @@ -580,8 +580,8 @@ buildActionMask = 2147483647; files = ( 5C50CF15269700710015EE29 /* RuleValidationResultVC.xib in Resources */, - 5C9C65A226A8486D00F14FC2 /* context.jsonc in Resources */, 5C50CF2B26972BCA0015EE29 /* CellWithTitleAndDescriptionTVC.xib in Resources */, + 5C07261F26AAE854006C4986 /* context.jsonc in Resources */, 5C50CF3326972BFD0015EE29 /* CellWithDateAndCountryTVC.xib in Resources */, 5C50CF0D269700550015EE29 /* CheckValidityVC.xib in Resources */, 5C50CF1F2697023B0015EE29 /* RuleErrorTVC.xib in Resources */, @@ -593,8 +593,8 @@ buildActionMask = 2147483647; files = ( 5C50CF16269700710015EE29 /* RuleValidationResultVC.xib in Resources */, - 5C9C65A326A8486D00F14FC2 /* context.jsonc in Resources */, 5C50CF2C26972BCA0015EE29 /* CellWithTitleAndDescriptionTVC.xib in Resources */, + 5C07262026AAE854006C4986 /* context.jsonc in Resources */, 5C50CF3426972BFD0015EE29 /* CellWithDateAndCountryTVC.xib in Resources */, 5C50CF0E269700550015EE29 /* CheckValidityVC.xib in Resources */, 5C50CF202697023B0015EE29 /* RuleErrorTVC.xib in Resources */, @@ -894,7 +894,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 9FH6TNGWF2; INFOPLIST_FILE = DGCAWallet/SupportingFiles/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.1; @@ -918,7 +918,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 5; + CURRENT_PROJECT_VERSION = 7; DEVELOPMENT_TEAM = 9FH6TNGWF2; INFOPLIST_FILE = DGCAWallet/SupportingFiles/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.1;