Skip to content

Commit

Permalink
Merge pull request #66 from nfl/main
Browse files Browse the repository at this point in the history
Fix SsoLoginWrapper when PiP video is presented
  • Loading branch information
sagishm authored Aug 1, 2023
2 parents 9d2f771 + 2d54467 commit 3e2726d
Show file tree
Hide file tree
Showing 14 changed files with 172 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>GigyaE2ETestsApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>31</integer>
<integer>32</integer>
</dict>
</dict>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions GigyaNss.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'GigyaNss'
spec.version = '1.8.0'
spec.version = '1.8.1'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Native+Screen-Sets'
spec.author = 'Gigya SAP'
Expand All @@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
authentication methods from the standard login flow
DESC

spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.8.0' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.8.1' }
spec.module_name = 'GigyaNss'
spec.swift_version = '5.2'

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
</data>
<key>flutter_assets/kernel_blob.bin</key>
<data>
9vYUjKwuNg9OCWISOXrNOtMVdgU=
mgWk6p13DEgujJyXeIdIwknKwYU=
</data>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
<data>
Expand Down Expand Up @@ -380,7 +380,7 @@
<dict>
<key>hash2</key>
<data>
FEysRn7ktUirUepBy4KsqmUOjJnOS4jGVIQ60HhtOvk=
qEoHwtnd/fFwX8NjEwMZS7muz3MV5X5kLzeuT6Nsee4=
</data>
</dict>
<key>flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf</key>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions GigyaNss/GigyaNss.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
E70F8BED2405215C00D52208 /* ActionFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70F8BEC2405215C00D52208 /* ActionFactory.swift */; };
E70F8BEF24053ABA00D52208 /* RegisterAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70F8BEE24053AB900D52208 /* RegisterAction.swift */; };
E70F8BF124053B5800D52208 /* LoginAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E70F8BF024053B5800D52208 /* LoginAction.swift */; };
E712F20D2A5188680047F3D9 /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E798550726552AE200984794 /* Flutter.xcframework */; };
E719C6AF24225216002F8C36 /* LogChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E719C6AE24225216002F8C36 /* LogChannel.swift */; };
E719C6B124226139002F8C36 /* SetAccountAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = E719C6B024226139002F8C36 /* SetAccountAction.swift */; };
E71CB3B22554029000D63726 /* JsEvaluatorHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E71CB3B12554029000D63726 /* JsEvaluatorHelper.swift */; };
Expand All @@ -52,7 +53,6 @@
E73C8A4F2431D3480064EFE1 /* FlowManagerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E73C8A4E2431D3480064EFE1 /* FlowManagerDelegate.swift */; };
E73C8A522431D3930064EFE1 /* NssInterruptionsSupported.swift in Sources */ = {isa = PBXBuildFile; fileRef = E73C8A512431D3930064EFE1 /* NssInterruptionsSupported.swift */; };
E73C8A542431E6080064EFE1 /* NssResolverModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E73C8A532431E6080064EFE1 /* NssResolverModel.swift */; };
E75DE0CE294712C000EB5885 /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E119B2266CD5C3006EE19C /* Flutter.xcframework */; };
E761DBF624F3A27F0072BAFF /* ImagePickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E761DBF524F3A27F0072BAFF /* ImagePickerViewController.swift */; };
E764219E25D51FF500CDED4C /* OtpService.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7C3A6C825CC5C040037E574 /* OtpService.swift */; };
E76421A325D51FFD00CDED4C /* GigyaAuth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7C3A6BD25CC5BB60037E574 /* GigyaAuth.framework */; };
Expand Down Expand Up @@ -153,7 +153,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E75DE0CE294712C000EB5885 /* Flutter.xcframework in Frameworks */,
E712F20D2A5188680047F3D9 /* Flutter.xcframework in Frameworks */,
E76421A325D51FFD00CDED4C /* GigyaAuth.framework in Frameworks */,
E7288CA32455CFD800AD99CA /* Gigya.framework in Frameworks */,
);
Expand Down Expand Up @@ -734,7 +734,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.8.0;
MARKETING_VERSION = 1.8.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Gigya.GigyaNss;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down Expand Up @@ -775,7 +775,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.8.0;
MARKETING_VERSION = 1.8.1;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Gigya.GigyaNss;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
4 changes: 2 additions & 2 deletions GigyaNssRelease.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'GigyaNssRelease'
spec.version = '1.8.0'
spec.version = '1.8.1'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Native+Screen-Sets'
spec.author = 'Gigya SAP'
Expand All @@ -9,7 +9,7 @@ Pod::Spec.new do |spec|
authentication methods from the standard login flow
DESC

spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.8.0' }
spec.source = { :git => 'https://github.com/SAP/gigya-swift-sdk.git', :tag => 'nss/v1.8.1' }
spec.module_name = 'GigyaNss'
spec.swift_version = '5.2'

Expand Down
16 changes: 8 additions & 8 deletions GigyaSwift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
E711A8B522E9A12500ADA304 /* URLSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E711A8B422E9A12500ADA304 /* URLSessionTests.swift */; };
E712E90822A662D6005397BA /* PluginViewWrapperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E712E90722A662D6005397BA /* PluginViewWrapperTests.swift */; };
E712E90C22A664DB005397BA /* FakeUIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E712E90B22A664DB005397BA /* FakeUIViewController.swift */; };
E712F2092A5188580047F3D9 /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E732A82328BB55240035DDEA /* App.xcframework */; };
E712F20A2A5188580047F3D9 /* App.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E732A82328BB55240035DDEA /* App.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E712F20B2A5188580047F3D9 /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E732A82428BB55240035DDEA /* Flutter.xcframework */; };
E712F20C2A5188580047F3D9 /* Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E732A82428BB55240035DDEA /* Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E713E0FC2247C6E700181328 /* SignatureUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E713E0FB2247C6E700181328 /* SignatureUtils.swift */; };
E713E0FE2248C83D00181328 /* GigyaConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = E713E0FD2248C83D00181328 /* GigyaConfig.swift */; };
E713E1022248E41400181328 /* GigyaRequestSignature.swift in Sources */ = {isa = PBXBuildFile; fileRef = E713E1012248E41400181328 /* GigyaRequestSignature.swift */; };
Expand Down Expand Up @@ -119,10 +123,6 @@
E7584EEB22E0BC22007229FE /* View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E7584EEA22E0BC22007229FE /* View.xib */; };
E75C69E1276A33E500FFA610 /* CryptoKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E75C69E0276A33E400FFA610 /* CryptoKit.framework */; };
E75C69E2276A342400FFA610 /* CryptoKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E75C69E0276A33E400FFA610 /* CryptoKit.framework */; };
E75DE0D1294712D900EB5885 /* App.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E794998D292A1EC900D3FB98 /* App.xcframework */; };
E75DE0D2294712D900EB5885 /* App.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E794998D292A1EC900D3FB98 /* App.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E75DE0D3294712D900EB5885 /* Flutter.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E710952B288EC1FF0062DCAD /* Flutter.xcframework */; };
E75DE0D4294712D900EB5885 /* Flutter.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E710952B288EC1FF0062DCAD /* Flutter.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E760668B2278998E005E4CFD /* WebLoginProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = E76066882278998E005E4CFD /* WebLoginProvider.swift */; };
E760668C2278998E005E4CFD /* WebViewWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E76066892278998E005E4CFD /* WebViewWrapper.swift */; };
E760668D2278998E005E4CFD /* GigyaWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E760668A2278998E005E4CFD /* GigyaWebViewController.swift */; };
Expand Down Expand Up @@ -318,9 +318,9 @@
E76B94F8285089D100E63E3B /* GigyaAuth.framework in Embed Frameworks */,
E732A83028BB62720035DDEA /* (null) in Embed Frameworks */,
E76B94FE28508A5E00E63E3B /* GigyaTfa.framework in Embed Frameworks */,
E75DE0D4294712D900EB5885 /* Flutter.xcframework in Embed Frameworks */,
E712F20C2A5188580047F3D9 /* Flutter.xcframework in Embed Frameworks */,
E76B94FA285089EF00E63E3B /* GigyaNss.framework in Embed Frameworks */,
E75DE0D2294712D900EB5885 /* App.xcframework in Embed Frameworks */,
E712F20A2A5188580047F3D9 /* App.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -677,11 +677,11 @@
files = (
E7DC2C6D2280778000A13426 /* libc++.tbd in Frameworks */,
E7DC2C6C2280771700A13426 /* libz.tbd in Frameworks */,
E75DE0D1294712D900EB5885 /* App.xcframework in Frameworks */,
E712F2092A5188580047F3D9 /* App.xcframework in Frameworks */,
E76B94F7285089D100E63E3B /* GigyaAuth.framework in Frameworks */,
E76B94F9285089EF00E63E3B /* GigyaNss.framework in Frameworks */,
E7DC2C6B228076E600A13426 /* libsqlite3.tbd in Frameworks */,
E75DE0D3294712D900EB5885 /* Flutter.xcframework in Frameworks */,
E712F20B2A5188580047F3D9 /* Flutter.xcframework in Frameworks */,
E73373F522633BDA00ADEDBB /* SafariServices.framework in Frameworks */,
E731B72D232A53AD0032E111 /* AuthenticationServices.framework in Frameworks */,
E732A82F28BB62720035DDEA /* (null) in Frameworks */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<key>GigyaUITestsApp.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>32</integer>
<integer>31</integer>
</dict>
<key>GigyaXC.xcscheme_^#shared#^_</key>
<dict>
Expand Down
Binary file not shown.
Loading

0 comments on commit 3e2726d

Please sign in to comment.