Merge branch 'develop_3ds_secure' into develop_1.4

# Conflicts: # ASDKCore/CryptoUtils/ASDKCryptoUtils.m
tinkoff-mobile-tech · Sep 24, 2019 · 873d682 · 873d682
2 parents d6914c4 + 6fd6439
commit 873d682
Show file tree

Hide file tree

Showing 20 changed files with 151 additions and 77 deletions.
diff --git a/ASDKCore.podspec b/ASDKCore.podspec
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "ASDKCore"
-  s.version      = "1.4.4"
+  s.version      = "1.4.5"
   s.summary      = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app"
   s.description  = "Core library that allows you to use internet acquiring from Tinkoff Bank in your app!"
 

diff --git a/ASDKCore.xcodeproj/project.pbxproj b/ASDKCore.xcodeproj/project.pbxproj
@@ -49,12 +49,12 @@
 		2C6E6BAA1F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C6E6BA81F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m */; };
 		2C6E6BAD1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C6E6BAB1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.h */; };
 		2C6E6BAE1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C6E6BAC1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m */; };
+		2C9BE102233904F60094347D /* ASDKCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 83166EE51C63988F00533D85 /* ASDKCard.m */; };
 		2CFBF58E1FCBFD180060C87F /* ASDKUtilsAmount.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CFBF58C1FCBFD180060C87F /* ASDKUtilsAmount.h */; };
 		2CFBF58F1FCBFD180060C87F /* ASDKUtilsAmount.m in Sources */ = {isa = PBXBuildFile; fileRef = 2CFBF58D1FCBFD180060C87F /* ASDKUtilsAmount.m */; };
 		83166ED71C63984E00533D85 /* ASDKCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166ED61C63984E00533D85 /* ASDKCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83166F2F1C63988F00533D85 /* ASDKBaseObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166EE11C63988F00533D85 /* ASDKBaseObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		83166F301C63988F00533D85 /* ASDKBaseObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 83166EE21C63988F00533D85 /* ASDKBaseObject.m */; };
-		83166F321C63988F00533D85 /* ASDKCard.m in Sources */ = {isa = PBXBuildFile; fileRef = 83166EE51C63988F00533D85 /* ASDKCard.m */; };
 		83166F331C63988F00533D85 /* ASDKAcquiringRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166EE71C63988F00533D85 /* ASDKAcquiringRequest.h */; };
 		83166F341C63988F00533D85 /* ASDKAcquiringRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 83166EE81C63988F00533D85 /* ASDKAcquiringRequest.m */; };
 		83166F351C63988F00533D85 /* ASDKChargeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 83166EEA1C63988F00533D85 /* ASDKChargeRequest.h */; };
@@ -684,6 +684,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -757,6 +758,7 @@
 				83166F631C63988F00533D85 /* ASDKRemoveCardRequestBuilder.m in Sources */,
 				83166F341C63988F00533D85 /* ASDKAcquiringRequest.m in Sources */,
 				83166F481C63988F00533D85 /* ASDKGetCardListResponse.m in Sources */,
+				2C9BE102233904F60094347D /* ASDKCard.m in Sources */,
 				BE1555371C7768EA00BEA6E1 /* ASDKAcquringSdkError.m in Sources */,
 				2C6E6BAE1F94CC2700B345B9 /* ASDKRequestBuilderSubmitRandomAmount.m in Sources */,
 				83166F381C63988F00533D85 /* ASDKFinishAuthorizeRequest.m in Sources */,
@@ -777,7 +779,6 @@
 				2C6E6BAA1F94CB0300B345B9 /* ASDKRequestSubmitRandomAmount.m in Sources */,
 				946C399B1C648F630036D1AF /* ASDKRSAEncryptor.m in Sources */,
 				83166F611C63988F00533D85 /* ASDKInitRequestBuilder.m in Sources */,
-				83166F321C63988F00533D85 /* ASDKCard.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -894,6 +895,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CURRENT_PROJECT_VERSION = 72;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -903,6 +905,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.4.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKCore;
@@ -916,6 +919,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CURRENT_PROJECT_VERSION = 72;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -925,6 +929,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.4.5;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKCore;

diff --git a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore-universal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ASDKCore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme b/ASDKCore.xcodeproj/xcshareddata/xcschemes/ASDKCore.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ASDKCore.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/ASDKCore/ASDKAcquiringSdk.h b/ASDKCore/ASDKAcquiringSdk.h
@@ -57,6 +57,7 @@
 
 - (NSString *)domainPath;
 - (NSString *)domainPath_v2;
+- (NSString *)termPath;
 - (SecKeyRef)publicKeyRef;
 - (NSInteger)apiRequestsTimeoutInterval;
 

diff --git a/ASDKCore/ASDKAcquiringSdk.m b/ASDKCore/ASDKAcquiringSdk.m
@@ -84,6 +84,11 @@ - (NSString *)domainPath_v2
 	return [self testDomain] ? kASDKTestDomainName_v2 : kASDKDomainName_v2;
 }
 
+- (NSString *)termPath
+{
+	return kASDKAPITermPath;
+}
+
 - (SecKeyRef)publicKeyRef
 {
     id<ASDKAcquiringSdkPublicKeyDataSource> publicKeyDataSource = self.publicKeyDataSource;

diff --git a/ASDKCore/ASDKApiKeys.h b/ASDKCore/ASDKApiKeys.h
@@ -29,6 +29,8 @@
 #define kASDKTestDomainName_v2                 @"https://rest-api-test.tcsbank.ru/v2/"
 #define kASDKDomainName_v2                     @"https://securepay.tinkoff.ru/v2/"
 
+#define kASDKAPITermPath 					@"https://api.tinkoff.ru/v1/3ds"
+
 #define kASDKAPIPathInit                    @"Init"
 #define kASDKAPIPathFinishAuthorize         @"FinishAuthorize"
 #define kASDKAPIPathCharge                  @"Charge"

diff --git a/ASDKCore/Info.plist b/ASDKCore/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.4</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ASDKUI.podspec b/ASDKUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ASDKUI"
-  s.version      = "1.4.4"
+  s.version      = "1.4.5"
   s.summary      = "UI components library for internet acquiring from Tinkoff Bank"
   s.description  = "UI components library for internet acquiring from Tinkoff Bank!"
   s.homepage     = "https://www.tinkoff.ru"

diff --git a/ASDKUI.xcodeproj/project.pbxproj b/ASDKUI.xcodeproj/project.pbxproj
@@ -672,6 +672,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				ru,
@@ -932,7 +933,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 72;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -947,6 +948,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.4.5;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -961,7 +963,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
-				CURRENT_PROJECT_VERSION = 1.0.0;
+				CURRENT_PROJECT_VERSION = 72;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -976,6 +978,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 1.4.5;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = ru.tcsbank.ASDKUI;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI-universal.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ASDKUI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme b/ASDKUI.xcodeproj/xcshareddata/xcschemes/ASDKUI.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,8 +49,6 @@
             ReferencedContainer = "container:ASDKUI.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"