Skip to content

Commit eb3f8a9

Browse files
RawanMatar89RawanMatar89
committed
revert: Support for login and registration via a browser custom tab (openedx#371) This reverts commit 4566b1a 
1 parent 0b254f7 commit eb3f8a9

File tree

27 files changed

+69
-384
lines changed

27 files changed

+69
-384
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@
4848

4949
<category android:name="android.intent.category.LAUNCHER" />
5050
</intent-filter>
51-
<intent-filter>
52-
<action android:name="android.intent.action.VIEW" />
53-
<category android:name="android.intent.category.DEFAULT" />
54-
<category android:name="android.intent.category.BROWSABLE" />
55-
<data android:scheme="${applicationId}" />
56-
</intent-filter>
5751

5852
<!-- Branch URI Scheme -->
5953
<intent-filter>

‎app/src/main/java/org/openedx/app/AppActivity.kt‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.openedx.app
33
import android.content.Intent
44
import android.content.res.Configuration
55
import android.graphics.Color
6-
import android.net.Uri
76
import android.os.Bundle
87
import android.view.View
98
import android.view.WindowManager
@@ -25,7 +24,6 @@ import org.openedx.app.databinding.ActivityAppBinding
2524
import org.openedx.app.deeplink.DeepLink
2625
import org.openedx.auth.presentation.logistration.LogistrationFragment
2726
import org.openedx.auth.presentation.signin.SignInFragment
28-
import org.openedx.core.ApiConstants
2927
import org.openedx.core.data.storage.CorePreferences
3028
import org.openedx.core.presentation.dialog.downloaddialog.DownloadDialogManager
3129
import org.openedx.core.presentation.global.InsetHolder
@@ -66,18 +64,6 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
6664
private var _insetCutout = 0
6765

6866
private var _windowSize = WindowSize(WindowType.Compact, WindowType.Compact)
69-
private val authCode: String?
70-
get() {
71-
val data = intent?.data
72-
if (
73-
data is Uri &&
74-
data.scheme == BuildConfig.APPLICATION_ID &&
75-
data.host == ApiConstants.BrowserLogin.REDIRECT_HOST
76-
) {
77-
return data.getQueryParameter(ApiConstants.BrowserLogin.CODE_QUERY_PARAM)
78-
}
79-
return null
80-
}
8167

8268
private val branchCallback =
8369
BranchUniversalReferralInitListener { branchUniversalObject, _, error ->
@@ -168,10 +154,10 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
168154
if (savedInstanceState == null) {
169155
when {
170156
corePreferencesManager.user == null -> {
171-
val fragment = if (viewModel.isLogistrationEnabled && authCode == null) {
157+
val fragment = if (viewModel.isLogistrationEnabled) {
172158
LogistrationFragment()
173159
} else {
174-
SignInFragment.newInstance(null, null, authCode = authCode)
160+
SignInFragment()
175161
}
176162
addFragment(fragment)
177163
}
@@ -218,10 +204,6 @@ class AppActivity : AppCompatActivity(), InsetHolder, WindowSizeHolder {
218204
super.onNewIntent(intent)
219205
this.intent = intent
220206

221-
if (authCode != null) {
222-
addFragment(SignInFragment.newInstance(null, null, authCode = authCode))
223-
}
224-
225207
val extras = intent?.extras
226208
if (extras?.containsKey(DeepLink.Keys.NOTIFICATION_TYPE.value) == true) {
227209
handlePushNotification(extras)

‎app/src/main/java/org/openedx/app/di/AppModule.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import org.openedx.app.room.DatabaseManager
2323
import org.openedx.auth.presentation.AgreementProvider
2424
import org.openedx.auth.presentation.AuthAnalytics
2525
import org.openedx.auth.presentation.AuthRouter
26-
import org.openedx.auth.presentation.sso.BrowserAuthHelper
2726
import org.openedx.auth.presentation.sso.FacebookAuthHelper
2827
import org.openedx.auth.presentation.sso.GoogleAuthHelper
2928
import org.openedx.auth.presentation.sso.MicrosoftAuthHelper
@@ -214,7 +213,6 @@ val appModule = module {
214213
factory { FacebookAuthHelper() }
215214
factory { GoogleAuthHelper(get()) }
216215
factory { MicrosoftAuthHelper() }
217-
factory { BrowserAuthHelper(get()) }
218216
factory { OAuthHelper(get(), get(), get()) }
219217

220218
factory { FileUtil(get(), get<ResourceManager>().getString(R.string.app_name)) }

‎app/src/main/java/org/openedx/app/di/ScreenModule.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,10 @@ val screenModule = module {
103103
get(),
104104
get(),
105105
get(),
106-
get(),
107106
)
108107
}
109108

110-
viewModel { (courseId: String?, infoType: String?, authCode: String) ->
109+
viewModel { (courseId: String?, infoType: String?) ->
111110
SignInViewModel(
112111
get(),
113112
get(),
@@ -122,10 +121,8 @@ val screenModule = module {
122121
get(),
123122
get(),
124123
get(),
125-
get(),
126124
courseId,
127125
infoType,
128-
authCode,
129126
)
130127
}
131128

‎auth/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ android {
5454
dependencies {
5555
implementation project(path: ':core')
5656

57-
implementation 'androidx.browser:browser:1.7.0'
5857
implementation "androidx.credentials:credentials:1.3.0"
5958
implementation "androidx.credentials:credentials-play-services-auth:1.3.0"
6059
implementation "com.facebook.android:facebook-login:16.2.0"

‎auth/src/main/java/org/openedx/auth/data/api/AuthApi.kt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ interface AuthApi {
3737
@Field("asymmetric_jwt") isAsymmetricJwt: Boolean = true,
3838
): AuthResponse
3939

40-
@FormUrlEncoded
41-
@POST(ApiConstants.URL_ACCESS_TOKEN)
42-
suspend fun getAccessTokenFromCode(
43-
@Field("grant_type") grantType: String,
44-
@Field("client_id") clientId: String,
45-
@Field("code") code: String,
46-
@Field("redirect_uri") redirectUri: String,
47-
@Field("token_type") tokenType: String,
48-
@Field("asymmetric_jwt") isAsymmetricJwt: Boolean = true,
49-
): AuthResponse
50-
5140
@FormUrlEncoded
5241
@POST(ApiConstants.URL_ACCESS_TOKEN)
5342
fun refreshAccessToken(

‎auth/src/main/java/org/openedx/auth/data/model/AuthType.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ enum class AuthType(val postfix: String, val methodName: String) {
1313
GOOGLE(ApiConstants.AUTH_TYPE_GOOGLE, "Google"),
1414
FACEBOOK(ApiConstants.AUTH_TYPE_FB, "Facebook"),
1515
MICROSOFT(ApiConstants.AUTH_TYPE_MICROSOFT, "Microsoft"),
16-
BROWSER(ApiConstants.AUTH_TYPE_BROWSER, "Browser")
1716
}

‎auth/src/main/java/org/openedx/auth/data/repository/AuthRepository.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ class AuthRepository(
4343
.processAuthResponse()
4444
}
4545

46-
suspend fun browserAuthCodeLogin(code: String) {
47-
api.getAccessTokenFromCode(
48-
grantType = ApiConstants.GRANT_TYPE_CODE,
49-
clientId = config.getOAuthClientId(),
50-
code = code,
51-
redirectUri = "${config.getAppId()}://${ApiConstants.BrowserLogin.REDIRECT_HOST}",
52-
tokenType = config.getAccessTokenType(),
53-
).mapToDomain().processAuthResponse()
54-
}
55-
5646
suspend fun getRegistrationFields(): List<RegistrationField> {
5747
return api.getRegistrationFields().fields?.map { it.mapToDomain() } ?: emptyList()
5848
}

‎auth/src/main/java/org/openedx/auth/domain/interactor/AuthInteractor.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ class AuthInteractor(private val repository: AuthRepository) {
1818
repository.socialLogin(token, authType)
1919
}
2020

21-
suspend fun loginAuthCode(authCode: String) {
22-
repository.browserAuthCodeLogin(authCode)
23-
}
24-
2521
suspend fun getRegistrationFields(): List<RegistrationField> {
2622
return repository.getRegistrationFields()
2723
}

‎auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import androidx.fragment.app.Fragment
4242
import org.koin.androidx.viewmodel.ext.android.viewModel
4343
import org.koin.core.parameter.parametersOf
4444
import org.openedx.auth.R
45-
import org.openedx.core.ApiConstants
4645
import org.openedx.core.ui.AuthButtonsPanel
4746
import org.openedx.core.ui.SearchBar
4847
import org.openedx.core.ui.displayCutoutForLandscape
@@ -51,7 +50,6 @@ import org.openedx.core.ui.theme.OpenEdXTheme
5150
import org.openedx.core.ui.theme.appColors
5251
import org.openedx.core.ui.theme.appTypography
5352
import org.openedx.core.ui.theme.compose.LogistrationLogoView
54-
import org.openedx.foundation.utils.UrlUtils
5553

5654
class LogistrationFragment : Fragment() {
5755

@@ -69,22 +67,10 @@ class LogistrationFragment : Fragment() {
6967
OpenEdXTheme {
7068
LogistrationScreen(
7169
onSignInClick = {
72-
if (viewModel.isBrowserLoginEnabled) {
73-
viewModel.signInBrowser(requireActivity())
74-
} else {
75-
viewModel.navigateToSignIn(parentFragmentManager)
76-
}
70+
viewModel.navigateToSignIn(parentFragmentManager)
7771
},
7872
onRegisterClick = {
79-
if (viewModel.isBrowserRegistrationEnabled) {
80-
UrlUtils.openInBrowser(
81-
activity = context,
82-
apiHostUrl = viewModel.apiHostUrl,
83-
url = ApiConstants.URL_REGISTER_BROWSER,
84-
)
85-
} else {
86-
viewModel.navigateToSignUp(parentFragmentManager)
87-
}
73+
viewModel.navigateToSignUp(parentFragmentManager)
8874
},
8975
onSearchClick = { querySearch ->
9076
viewModel.navigateToDiscovery(parentFragmentManager, querySearch)

0 commit comments

Comments
 (0)