fixup! Merge remote-tracking branch 'origin/develop' into kshitij/cus…

…tom-auth-2
openedx · Nov 29, 2024 · 57259d9 · 57259d9
1 parent 60ce739
commit 57259d9
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/app/src/main/java/org/openedx/app/AppActivity.kt b/app/src/main/java/org/openedx/app/AppActivity.kt
@@ -69,7 +69,11 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
     private val authCode: String?
         get() {
             val data = intent?.data
-            if (data is Uri && data.scheme == BuildConfig.APPLICATION_ID && data.host == ApiConstants.BrowserLogin.REDIRECT_HOST) {
+            if (
+                data is Uri &&
+                data.scheme == BuildConfig.APPLICATION_ID &&
+                data.host == ApiConstants.BrowserLogin.REDIRECT_HOST
+            ) {
                 return data.getQueryParameter(ApiConstants.BrowserLogin.CODE_QUERY_PARAM)
             }
             return null

diff --git a/app/src/main/java/org/openedx/app/di/ScreenModule.kt b/app/src/main/java/org/openedx/app/di/ScreenModule.kt
@@ -104,7 +104,7 @@ val screenModule = module {
         )
     }
 
-    viewModel { (courseId: String?, infoType: String?, authCode:String) ->
+    viewModel { (courseId: String?, infoType: String?, authCode: String) ->
         SignInViewModel(
             get(),
             get(),

diff --git a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt
@@ -69,12 +69,11 @@ class LogistrationFragment : Fragment() {
             OpenEdXTheme {
                 LogistrationScreen(
                     onSignInClick = {
-                        if(viewModel.isBrowserLoginEnabled) {
+                        if (viewModel.isBrowserLoginEnabled) {
                             viewModel.signInBrowser(requireActivity())
                         } else {
                             viewModel.navigateToSignIn(parentFragmentManager)
                         }
-
                     },
                     onRegisterClick = {
                         if (viewModel.isBrowserRegistrationEnabled) {

diff --git a/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationViewModel.kt b/auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationViewModel.kt
@@ -10,9 +10,9 @@ import org.openedx.auth.presentation.AuthAnalyticsKey
 import org.openedx.auth.presentation.AuthRouter
 import org.openedx.auth.presentation.sso.BrowserAuthHelper
 import org.openedx.core.config.Config
+import org.openedx.core.utils.Logger
 import org.openedx.foundation.extension.takeIfNotEmpty
 import org.openedx.foundation.presentation.BaseViewModel
-import org.openedx.core.utils.Logger
 
 class LogistrationViewModel(
     private val courseId: String,

diff --git a/auth/src/main/java/org/openedx/auth/presentation/signin/SignInViewModel.kt b/auth/src/main/java/org/openedx/auth/presentation/signin/SignInViewModel.kt
@@ -18,10 +18,10 @@ import org.openedx.auth.domain.interactor.AuthInteractor
 import org.openedx.auth.domain.model.SocialAuthResponse
 import org.openedx.auth.presentation.AgreementProvider
 import org.openedx.auth.presentation.AuthAnalytics
-import org.openedx.auth.presentation.sso.BrowserAuthHelper
 import org.openedx.auth.presentation.AuthAnalyticsEvent
 import org.openedx.auth.presentation.AuthAnalyticsKey
 import org.openedx.auth.presentation.AuthRouter
+import org.openedx.auth.presentation.sso.BrowserAuthHelper
 import org.openedx.auth.presentation.sso.OAuthHelper
 import org.openedx.core.Validator
 import org.openedx.core.config.Config

diff --git a/auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt b/auth/src/main/java/org/openedx/auth/presentation/sso/BrowserAuthHelper.kt
@@ -18,12 +18,14 @@ class BrowserAuthHelper(private val config: Config) {
         logger.d { "Browser-based auth initiated" }
         val uri = Uri.parse("${config.getApiHostURL()}${ApiConstants.URL_AUTHORIZE}").buildUpon()
             .appendQueryParameter("client_id", config.getOAuthClientId())
-            .appendQueryParameter("redirect_uri", "${activityContext.packageName}://${ApiConstants.BrowserLogin.REDIRECT_HOST}")
+            .appendQueryParameter(
+                "redirect_uri",
+                "${activityContext.packageName}://${ApiConstants.BrowserLogin.REDIRECT_HOST}"
+            )
             .appendQueryParameter("response_type", ApiConstants.BrowserLogin.RESPONSE_TYPE).build()
         val intent =
             CustomTabsIntent.Builder().setUrlBarHidingEnabled(true).setShowTitle(true).build()
         intent.intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
-        logger.d { "Launching custom tab with ${uri.toString()}"}
         intent.launchUrl(activityContext, uri)
     }
 

diff --git a/auth/src/test/java/org/openedx/auth/presentation/signin/SignInViewModelTest.kt b/auth/src/test/java/org/openedx/auth/presentation/signin/SignInViewModelTest.kt
@@ -25,8 +25,8 @@ import org.openedx.auth.R
 import org.openedx.auth.domain.interactor.AuthInteractor
 import org.openedx.auth.presentation.AgreementProvider
 import org.openedx.auth.presentation.AuthAnalytics
-import org.openedx.auth.presentation.sso.BrowserAuthHelper
 import org.openedx.auth.presentation.AuthRouter
+import org.openedx.auth.presentation.sso.BrowserAuthHelper
 import org.openedx.auth.presentation.sso.OAuthHelper
 import org.openedx.core.Validator
 import org.openedx.core.config.Config