-
Notifications
You must be signed in to change notification settings - Fork 18
First Iteration of AuthTab feature work #120
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.
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
Open
noguier
wants to merge
3
commits into
auth-tab-initial-setup
Choose a base branch
from
ana-dev
base: auth-tab-initial-setup
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
86 changes: 86 additions & 0 deletions
86
browser-switch/src/main/java/com/braintreepayments/api/AuthTabInternalClient.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| package com.braintreepayments.api; | ||
|
|
||
| import android.content.ActivityNotFoundException; | ||
| import android.content.Context; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
| import androidx.activity.result.ActivityResultLauncher; | ||
| import androidx.annotation.VisibleForTesting; | ||
| import androidx.browser.auth.AuthTabIntent; | ||
| import androidx.browser.customtabs.CustomTabsClient; | ||
| import androidx.browser.customtabs.CustomTabsIntent; | ||
|
|
||
| class AuthTabInternalClient { | ||
|
|
||
| private final AuthTabIntent.Builder authTabIntentBuilder; | ||
| private final CustomTabsIntent.Builder customTabsIntentBuilder; | ||
|
|
||
| AuthTabInternalClient() { | ||
| this(new AuthTabIntent.Builder(), new CustomTabsIntent.Builder()); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| AuthTabInternalClient(AuthTabIntent.Builder authTabBuilder, | ||
| CustomTabsIntent.Builder customTabsBuilder) { | ||
| this.authTabIntentBuilder = authTabBuilder; | ||
| this.customTabsIntentBuilder = customTabsBuilder; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if Auth Tab is supported by the current browser | ||
| */ | ||
| boolean isAuthTabSupported(Context context) { | ||
| String packageName = CustomTabsClient.getPackageName(context, null); | ||
| if (packageName == null) { | ||
| return false; | ||
| } | ||
| return CustomTabsClient.isAuthTabSupported(context, packageName); | ||
| } | ||
|
|
||
| /** | ||
| * Launch URL using Auth Tab if supported, otherwise fall back to Custom Tabs | ||
| */ | ||
| void launchUrl(Context context, | ||
| Uri url, | ||
| String returnUrlScheme, | ||
| Uri appLinkUri, | ||
| ActivityResultLauncher<Intent> launcher, | ||
| LaunchType launchType) throws ActivityNotFoundException { | ||
|
|
||
| if (launcher != null && isAuthTabSupported(context)) { | ||
| // Auth Tab flow | ||
| AuthTabIntent authTabIntent = authTabIntentBuilder.build(); | ||
|
|
||
| if (appLinkUri != null) { | ||
| // For app links (HTTPS), extract host and path | ||
| String host = appLinkUri.getHost(); | ||
| String path = appLinkUri.getPath(); | ||
| if (path == null) { | ||
| path = "/"; | ||
| } | ||
| assert host != null; | ||
| authTabIntent.launch(launcher, url, host, path); | ||
| } else if (returnUrlScheme != null) { | ||
| // For custom schemes | ||
| authTabIntent.launch(launcher, url, returnUrlScheme); | ||
| } else { | ||
| throw new IllegalArgumentException("Either returnUrlScheme or appLinkUri must be provided"); | ||
| } | ||
| } else { | ||
| // Chrome Custom Tabs Fallback | ||
| CustomTabsIntent customTabsIntent = customTabsIntentBuilder.build(); | ||
|
|
||
| if (launchType != null) { | ||
| switch (launchType) { | ||
| case ACTIVITY_NEW_TASK: | ||
| customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); | ||
| break; | ||
| case ACTIVITY_CLEAR_TOP: | ||
| customTabsIntent.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); | ||
| break; | ||
| } | ||
| } | ||
| customTabsIntent.launchUrl(context, url); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 0 additions & 38 deletions
38
browser-switch/src/main/java/com/braintreepayments/api/ChromeCustomTabsInternalClient.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For newer classes, we could use kotlin probably?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, I was thinking the same thing, I will rewrite it