-
Notifications
You must be signed in to change notification settings - Fork 26
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
feat: Support for login and registration via a browser custom tab #371
feat: Support for login and registration via a browser custom tab #371
Conversation
Thanks for the pull request, @xitij2000! What's next?Please work through the following steps to get your changes ready for engineering review: 🔘 Get product approvalIf you haven't already, check this list to see if your contribution needs to go through the product review process.
🔘 Provide contextTo help your reviewers and other members of the community understand the purpose and larger context of your changes, feel free to add as much of the following information to the PR description as you can:
🔘 Get a green buildIf one or more checks are failing, continue working on your changes until this is no longer the case and your build turns green. 🔘 Let us know that your PR is ready for review:Who will review my changes?This repository is currently maintained by Where can I find more information?If you'd like to get more details on all aspects of the review process for open source pull requests (OSPRs), check out the following resources:
When can I expect my changes to be merged?Our goal is to get community contributions seen and reviewed as efficiently as possible. However, the amount of time that it takes to review and merge a PR can vary significantly based on factors such as:
💡 As a result it may take up to several weeks or months to complete a review and merge your PR. |
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.
@xitij2000 Nice work! 👍
👍
- I tested this: (tested login in both real hardware as well as emulator)
- I read through the code
- I checked for accessibility issues
- Includes documentation
@openedx/openedx-mobile-maintainers - is someone able to please take a look at this? |
I'll review it 👀 |
@volodymyr-chekyrta I've changed the target branch; however, I've had some issues running the develop branch before due to it often being reliant on unmerged PRs in edx-platform. So I might need your help with that. Could you have a quick look and see if the general direction of the PR is okay or if bigger changes are needed so I can budget the time accordingly? |
@xitij2000 I checked the approach, and it is good 👍; I have a few comments according to the code, but it will be better to address them after resolving conflicts |
b0b4165
to
92cb74e
Compare
I've rebased the code, but still need to test that everything works. |
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.
Minor changes, mostly move value to constant:
if (data is Uri && data.scheme == BuildConfig.APPLICATION_ID && data.host == "oauth2Callback") { | ||
return data.getQueryParameter("code") | ||
} |
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.
Please move "oauth2Callback"
and "code"
to constants.
val bundle = Bundle() | ||
bundle.putString("auth_code", authCode) | ||
val fragment = SignInFragment() | ||
fragment.arguments = bundle | ||
addFragment(fragment) |
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.
Please use SignInFragment.newIntance(...)
method
grantType = ApiConstants.GRANT_TYPE_CODE, | ||
clientId = config.getOAuthClientId(), | ||
code = code, | ||
redirectUri = "${config.getApplicationID()}://oauth2Callback" |
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.
oauth2Callback
to constants
UrlUtils.openInBrowser( | ||
activity = context, | ||
apiHostUrl = viewModel.apiHostUrl, | ||
url = "/register", |
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.
Please move /register
to constants
val authCode = arguments?.getString("auth_code") | ||
if (authCode is String && !state.loginFailure && !state.loginSuccess) { | ||
arguments?.remove("auth_code") |
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.
Please move arguments like "auth_code"
to companion object constants.
e.g.
companion object {
private const val ARG_COURSE_ID = "courseId"
private const val ARG_INFO_TYPE = "info_type"
private const val ARG_AUTH_CODE = "auth_code"
fun newInstance(courseId: String?, infoType: String?): SignInFragment {
val fragment = SignInFragment()
fragment.arguments = bundleOf(
ARG_COURSE_ID to courseId,
ARG_INFO_TYPE to infoType
)
return fragment
}
}
if(state.isBrowserLoginEnabled) { | ||
onEvent(AuthEvent.SignInBrowser) |
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.
if(state.isBrowserLoginEnabled)
-> if (state.isBrowserLoginEnabled)
} else { | ||
keyboardController?.hide() |
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.
} else { | |
keyboardController?.hide() | |
} else { | |
keyboardController?.hide() |
.appendQueryParameter("client_id", config.getOAuthClientId()) | ||
.appendQueryParameter("redirect_uri", "${activityContext.packageName}://oauth2Callback") | ||
.appendQueryParameter("response_type", "code").build() |
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.
It probably will be good to move the params to constants as well
fun getApplicationID(): String { | ||
return getString(APPLICATION_ID, "") | ||
} | ||
|
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.
duplicates:
fun getAppId(): String {
return getString(APPLICATION_ID, "")
}
docs/how-tos/auth-using-browser.rst
Outdated
How to user Browser-based Login and Registration | ||
================================================ | ||
|
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.
Just wanted to point out that I like this doc 👍
@volodymyr-chekyrta I will allocate some time soon to go through these properly and update the PR. Thanks for the great feedback! |
4b5437b
to
65b9c39
Compare
@volodymyr-chekyrta I've updated the PR based on your feedback. Do have a look! |
auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationViewModel.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
Fixed
Show fixed
Hide fixed
auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
Fixed
Show fixed
Hide fixed
@xitij2000 thank you! I'll take a look. Could you please check the errors in auth tests?
|
The code looks good to me. |
9e22b77
to
189b3f4
Compare
This change adds support for logging in and registering a new account using the browser. This can be useful for cases where the only way to log into the instatance is via a custom third-party auth provider.
189b3f4
to
7b1f928
Compare
Would it be possible to clarify the usage for this, and if possible any screenshots of it, even if just from local dev? I want to make sure I understand the flow here, is the configuration such that you are either using the native login / register (on by default?) or usign the browser mechanism? I ask becasue we also merged in a secondary web login button that can be optionally configured on the native view to direct users to a browser based login (ex: for corporate logins or other options not available natively). I still think the ability to choose a full browser login is a nimportant addition to the app, so I dont consider the two described features above as conflicting but I want to make sure I understand the changes and what the level of theming might be, or how the browser window renders (overlaps, embedded, etc). Thanks @xitij2000 for this contribution! |
@marcotuts Sure! It will be hard to do it through screenshots since it a flow, but I will try to make a screencap and post it here. In this particular implementation, the web-based login repalces the native login. So when you click on the login button, it opens a custom browser tab, which is essentially a full-screen browser window (AFAIK it will use your default browser) where the OAuth2 based login flow will be initiated. When the user completes the log in in this browser windows (it could be using a username and password or whatever third-party auth system the LMS is configured to use) it will redirect back to the app with the code and the app will fetch a login token from that. From what I understand the feature you're describing adds the above login flow as an option during runtime rather than build time (which is what this PR does). I think if that is the case, we could simplify this PR to use that flow. Is my understanding correct? |
@marcotuts Here is a video of this at work: Screen_recording_20241209_172251.webm |
Thanks for the video! This looks great, thanks again for the contribution. It might be worth eventually exploring the embedded mode for this view but it seamlessly loads and returns to the app in the demo so that's 99% of what we need :D product 👍 |
I am not very knowledgeable about Android so I followed the advice I heard about WebViews for OAuth2 which instead recommended using custom tabs. |
This change adds support for logging in and registering a new account using the
browser. This can be useful for cases where the only way to log into the
instatance is via a custom third-party auth provider.