From 03439c95d16c44831ff12df664e3eae555985923 Mon Sep 17 00:00:00 2001 From: Mike Nachbaur <74688448+mikenachbaur-okta@users.noreply.github.com> Date: Mon, 15 Apr 2024 12:34:34 -0700 Subject: [PATCH] Include a privacy manifest file (#359) --- OktaOidc.podspec | 3 ++- Package.swift | 5 +++- Sources/AppAuth/OktaUserAgent.m | 2 +- .../Common/Resources/PrivacyInfo.xcprivacy | 14 ++++++++++ okta-oidc.xcodeproj/project.pbxproj | 26 ++++++++++++++----- 5 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 Sources/OktaOidc/Common/Resources/PrivacyInfo.xcprivacy diff --git a/OktaOidc.podspec b/OktaOidc.podspec index 9d736e7e5f8..964ecf4adbf 100644 --- a/OktaOidc.podspec +++ b/OktaOidc.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'OktaOidc' - s.version = '3.11.4' + s.version = '3.11.5' s.summary = 'SDK to easily integrate AppAuth with Okta' s.description = <<-DESC Integrate your native app with Okta using the AppAuth library. @@ -21,6 +21,7 @@ Integrate your native app with Okta using the AppAuth library. s.subspec 'Okta' do |okta| okta.dependency 'OktaOidc/AppAuth' okta.source_files = 'Sources/OktaOidc/**/*.{h,swift}' + okta.resources = 'Sources/OktaOidc/Common/Resources/**/*' okta.exclude_files = 'Sources/OktaOidc/Common/Exports.swift' okta.ios.deployment_target = '11.0' okta.osx.deployment_target = '10.14' diff --git a/Package.swift b/Package.swift index cfac76a3dd1..1a7fed21c4f 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.3 // The swift-tools-version declares the minimum version of Swift required to build this package. /* @@ -38,6 +38,9 @@ let package = Package( .target(name: "OktaOidc", dependencies: [ "OktaOidc_AppAuth" + ], + resources: [ + .process("Common/Resources") ]), ] + [ .target(name: "TestCommon", diff --git a/Sources/AppAuth/OktaUserAgent.m b/Sources/AppAuth/OktaUserAgent.m index 0fa4aa6358b..159513718e5 100644 --- a/Sources/AppAuth/OktaUserAgent.m +++ b/Sources/AppAuth/OktaUserAgent.m @@ -22,7 +22,7 @@ +(void)setUserAgentValue:(NSString*)value { } +(NSString*)userAgentVersion { - return @"3.11.4"; + return @"3.11.5"; } +(NSString*)userAgentHeaderKey { diff --git a/Sources/OktaOidc/Common/Resources/PrivacyInfo.xcprivacy b/Sources/OktaOidc/Common/Resources/PrivacyInfo.xcprivacy new file mode 100644 index 00000000000..c6bdf9c1157 --- /dev/null +++ b/Sources/OktaOidc/Common/Resources/PrivacyInfo.xcprivacy @@ -0,0 +1,14 @@ + + + + + NSPrivacyAccessedAPITypes + + NSPrivacyTracking + + NSPrivacyTrackingDomains + + NSPrivacyCollectedDataTypes + + + diff --git a/okta-oidc.xcodeproj/project.pbxproj b/okta-oidc.xcodeproj/project.pbxproj index aea6d974f58..394f7e028c1 100644 --- a/okta-oidc.xcodeproj/project.pbxproj +++ b/okta-oidc.xcodeproj/project.pbxproj @@ -289,6 +289,8 @@ DEBFB8E62507C52400A27026 /* OktaNetworkRequestCustomizationDelegateMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBFB8E52507C52400A27026 /* OktaNetworkRequestCustomizationDelegateMock.swift */; }; DEBFB8E82507C53600A27026 /* URLSessionMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBFB8E72507C53600A27026 /* URLSessionMock.swift */; }; DEE37AD125065C7300318DC3 /* OktaNetworkRequestCustomizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E2E1F3472501868D0001DDD5 /* OktaNetworkRequestCustomizationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E0BAF79C2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = E0BAF79A2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy */; }; + E0BAF79D2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = E0BAF79A2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy */; }; E2E1F3482501868E0001DDD5 /* OktaNetworkRequestCustomizationDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = E2E1F3472501868D0001DDD5 /* OktaNetworkRequestCustomizationDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; E2F6026625104F3000492BEC /* OktaOIDAuthStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F6026525104F3000492BEC /* OktaOIDAuthStateTests.swift */; }; E2FB61302536779800D26EDC /* OKTAuthorizationRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E2FB612D2536779800D26EDC /* OKTAuthorizationRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -545,6 +547,7 @@ DEBFB8E22507A7A000A27026 /* OIDAuthorizationServiceRequestDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OIDAuthorizationServiceRequestDelegateTests.swift; sourceTree = ""; }; DEBFB8E52507C52400A27026 /* OktaNetworkRequestCustomizationDelegateMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaNetworkRequestCustomizationDelegateMock.swift; sourceTree = ""; }; DEBFB8E72507C53600A27026 /* URLSessionMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URLSessionMock.swift; sourceTree = ""; }; + E0BAF79A2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; E2E1F3472501868D0001DDD5 /* OktaNetworkRequestCustomizationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OktaNetworkRequestCustomizationDelegate.h; path = include/OktaNetworkRequestCustomizationDelegate.h; sourceTree = ""; }; E2F6026525104F3000492BEC /* OktaOIDAuthStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OktaOIDAuthStateTests.swift; sourceTree = ""; }; E2FB612D2536779800D26EDC /* OKTAuthorizationRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OKTAuthorizationRequest.h; path = include/OKTAuthorizationRequest.h; sourceTree = ""; }; @@ -746,6 +749,7 @@ 9601C326256D980D00C084F5 /* Common */ = { isa = PBXGroup; children = ( + E0BAF79B2BC9AB8A009CB80C /* Resources */, A17E39BE2357C50700837873 /* Internal */, A17E397F234D5F8E00837873 /* OktaOidc.h */, 2F32CB0B229D3A16003A6768 /* OktaOidc.swift */, @@ -1007,6 +1011,14 @@ path = Internal; sourceTree = ""; }; + E0BAF79B2BC9AB8A009CB80C /* Resources */ = { + isa = PBXGroup; + children = ( + E0BAF79A2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy */, + ); + path = Resources; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1285,6 +1297,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E0BAF79C2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1317,6 +1330,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E0BAF79D2BC9AB8A009CB80C /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1782,7 +1796,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc"; PRODUCT_NAME = OktaOidc; SKIP_INSTALL = YES; @@ -1812,7 +1826,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc"; PRODUCT_NAME = OktaOidc; SKIP_INSTALL = YES; @@ -1834,7 +1848,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = com.okta.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1853,7 +1867,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = com.okta.Example; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -1960,7 +1974,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc"; PRODUCT_NAME = OktaOidc; SDKROOT = macosx; @@ -1987,7 +2001,7 @@ "@loader_path/Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 3.11.4; + MARKETING_VERSION = 3.11.5; PRODUCT_BUNDLE_IDENTIFIER = "com.okta.okta-oidc"; PRODUCT_NAME = OktaOidc; SDKROOT = macosx;