Merge branch 'main' into release/1.0.x

wultra · Oct 25, 2021 · b79806d · b79806d
2 parents 7543f15 + cb46f7f
commit b79806d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # PowerAuth Networking for Apple platforms.
 
+[![build](https://github.com/wultra/networking-apple/actions/workflows/build.yml/badge.svg)](https://github.com/wultra/networking-apple/actions/workflows/build.yml) [![pod](https://img.shields.io/cocoapods/v/WultraPowerAuthNetworking)](https://cocoapods.org/pods/WultraMobileTokenSDK) ![date](https://img.shields.io/github/release-date/wultra/networking-apple) ![platform](https://img.shields.io/cocoapods/p/WultraPowerAuthNetworking) [![license](https://img.shields.io/github/license/wultra/networking-apple)](LICENSE)   
+
 A high-level networking SDK for PowerAuth-based endpoints.
 
 Proper documentation will be added later. You can visit our [Mobile Token SDK for iOS](https://github.com/wultra/mtoken-sdk-ios) for reference implementation.
diff --git a/WultraPowerAuthNetworking.xcodeproj/project.pbxproj b/WultraPowerAuthNetworking.xcodeproj/project.pbxproj
@@ -153,7 +153,7 @@
 		DC53E60B26DFD8520076AAFF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1250;
+				LastUpgradeCheck = 1300;
 				TargetAttributes = {
 					DC53E61326DFD8520076AAFF = {
 						CreatedOnToolsVersion = 12.5;

diff --git a/...raPowerAuthNetworking.xcodeproj/xcshareddata/xcschemes/WultraPowerAuthNetworking.xcscheme b/...raPowerAuthNetworking.xcodeproj/xcshareddata/xcschemes/WultraPowerAuthNetworking.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1250"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/WultraPowerauthNetworking/WPNHttpRequest.swift b/WultraPowerauthNetworking/WPNHttpRequest.swift
@@ -105,6 +105,10 @@ class WPNHttpRequest<TRequest: WPNRequestBase, TResponse: WPNResponseBase> {
         if let encryptor = encryptor {
             if let cryptorgram = encryptor.encryptRequest(data) {
                 data = try? jsonEncoder.encode(E2EERequest(cryptogram: cryptorgram))
+                // Only add E2EE headers when the endpoint is not signed
+                if !needsSignature, let metadata = encryptor.associatedMetaData {
+                    request.addValue(metadata.httpHeaderValue, forHTTPHeaderField: metadata.httpHeaderKey)
+                }
             } else {
                 D.error("Failed to encrypt request with encryptor.")
             }