Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ios magic links handling #1034

Merged
merged 6 commits into from
Jan 29, 2025
Merged

fix: ios magic links handling #1034

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e878fcc
Added namespace to android gradle file and minor change for ios
pmathew92 Jan 22, 2025
f083f45
Added changes to the breaking tests
pmathew92 Jan 22, 2025
290c741
updated the test cases
pmathew92 Jan 22, 2025
72853dd
Removed the missed instance of safari view controller
pmathew92 Jan 23, 2025
afcc023
Merge branch 'master' into SDK-5539
pmathew92 Jan 29, 2025
17a8fc8
Merge branch 'master' into SDK-5539
pmathew92 Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def DEFAULT_TARGET_SDK_VERSION = 28
android {
compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)
namespace 'com.auth0.react'

defaultConfig {
minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION)
Expand Down
20 changes: 5 additions & 15 deletions src/webauth/__tests__/agent.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,20 +307,10 @@ describe('Agent', () => {
});
});

describe('handle app linking for SFSafariViewController', () => {
it('with useSFSafariViewController AppLinking should be enabled', async () => {
await agent.login({}, { safariViewControllerPresentationStyle: 0 });
expect(Linking.addEventListener).toHaveBeenCalledTimes(1);
});

it('without useSFSafariViewController AppLinking should be enabled', async () => {
await agent.login({}, {});
expect(Linking.addEventListener).toHaveBeenCalledTimes(0);
});

describe('handle app linking for ios platform', () => {
it('for only iOS platform AppLinking should be enabled', async () => {
Platform.OS = 'android';
await agent.login({}, { safariViewControllerPresentationStyle: 0 });
await agent.login({}, {});
expect(Linking.addEventListener).toHaveBeenCalledTimes(0);
Platform.OS = 'ios'; //reset value to ios
});
Expand All @@ -341,7 +331,7 @@ describe('Agent', () => {
try {
await agent.login({}, { safariViewControllerPresentationStyle: 0 });
pmathew92 marked this conversation as resolved.
Show resolved Hide resolved
} catch (e) {}
expect(Linking.addEventListener).toHaveBeenCalledTimes(1);
!expect(Linking.addEventListener).toHaveBeenCalled;
expect(mockSubscription.remove).toHaveBeenCalledTimes(1);
});

Expand Down Expand Up @@ -393,8 +383,8 @@ describe('Agent', () => {
try {
await agent.login({}, {});
} catch (e) {}
expect(Linking.addEventListener).toHaveBeenCalledTimes(0);
expect(mockSubscription.remove).toHaveBeenCalledTimes(0);
!expect(Linking.addEventListener).toHaveBeenCalled();
!expect(mockSubscription.remove).toHaveBeenCalled();
});
});
});
5 changes: 1 addition & 4 deletions src/webauth/agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ class Agent {
);
}
return new Promise(async (resolve, reject) => {
if (
Platform.OS === 'ios' &&
options.safariViewControllerPresentationStyle !== undefined
) {
if (Platform.OS === 'ios') {
linkSubscription = Linking.addEventListener('url', async (event) => {
try {
linkSubscription?.remove();
Expand Down
Loading