Merge pull request #474 from Achintha444/master

chore: incorporate new changes made to the Android SDK to the percare sample application
wso2 · Jun 10, 2024 · 37b4214 · 37b4214
2 parents a260208 + 10f2e79
commit 37b4214
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 36 deletions.
diff --git a/petcare-sample/b2c/mobile-app/petcare-with-sdk/app/build.gradle.kts b/petcare-sample/b2c/mobile-app/petcare-with-sdk/app/build.gradle.kts
@@ -100,7 +100,7 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
 
     // Asgardeo android SDK
-    implementation(libs.asgardeo.android.ui)
+    implementation(libs.asgardeo.android)
 
     implementation(libs.okhttp)
     implementation(libs.jackson.module.kotlin)

diff --git a/...ample/api_auth_sample/features/home/presentation/screens/add_pet/AddPetScreenViewModel.kt b/...ample/api_auth_sample/features/home/presentation/screens/add_pet/AddPetScreenViewModel.kt
@@ -26,7 +26,7 @@ import com.wso2_sample.api_auth_sample.features.login.domain.repository.Asgardeo
 import com.wso2_sample.api_auth_sample.util.navigation.NavigationViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.asgardeo.android.core.provider.providers.token.TokenProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.token.TokenProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch

diff --git a/...so2_sample/api_auth_sample/features/home/presentation/screens/home/HomeScreenViewModel.kt b/...so2_sample/api_auth_sample/features/home/presentation/screens/home/HomeScreenViewModel.kt
@@ -26,7 +26,7 @@ import com.wso2_sample.api_auth_sample.features.login.domain.repository.Asgardeo
 import com.wso2_sample.api_auth_sample.util.navigation.NavigationViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.asgardeo.android.core.provider.providers.token.TokenProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.token.TokenProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch

diff --git a/...mple/api_auth_sample/features/home/presentation/screens/profile/ProfileScreenViewModel.kt b/...mple/api_auth_sample/features/home/presentation/screens/profile/ProfileScreenViewModel.kt
@@ -27,8 +27,8 @@ import com.wso2_sample.api_auth_sample.features.login.domain.repository.Asgardeo
 import com.wso2_sample.api_auth_sample.util.navigation.NavigationViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.asgardeo.android.core.provider.providers.authentication.AuthenticationProvider
-import io.asgardeo.android.core.provider.providers.token.TokenProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.authentication.AuthenticationProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.token.TokenProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch

diff --git a/...om/wso2_sample/api_auth_sample/features/login/domain/repository/AsgardeoAuthRepository.kt b/...om/wso2_sample/api_auth_sample/features/login/domain/repository/AsgardeoAuthRepository.kt
@@ -18,8 +18,8 @@
 
 package com.wso2_sample.api_auth_sample.features.login.domain.repository
 
-import io.asgardeo.android.core.provider.providers.authentication.AuthenticationProvider
-import io.asgardeo.android.core.provider.providers.token.TokenProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.authentication.AuthenticationProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.token.TokenProvider
 
 /**
  * Use as a repository to handle the authentication related operations using Asgardeo authentication SDK.

diff --git a/.../wso2_sample/api_auth_sample/features/login/impl/repository/AsgardeoAuthRepositoryImpl.kt b/.../wso2_sample/api_auth_sample/features/login/impl/repository/AsgardeoAuthRepositoryImpl.kt
@@ -20,10 +20,10 @@ package com.wso2_sample.api_auth_sample.features.login.impl.repository
 
 import com.wso2_sample.api_auth_sample.features.login.domain.repository.AsgardeoAuthRepository
 import com.wso2_sample.api_auth_sample.util.Config
-import io.asgardeo.android.core.asgardeo_auth.AsgardeoAuth
-import io.asgardeo.android.core.core_config.AuthenticationCoreConfig
-import io.asgardeo.android.core.provider.providers.authentication.AuthenticationProvider
-import io.asgardeo.android.core.provider.providers.token.TokenProvider
+import io.asgardeo.android.core_auth_direct.asgardeo_auth.AsgardeoAuth
+import io.asgardeo.android.core_auth_direct.core_config.AuthenticationCoreConfig
+import io.asgardeo.android.core_auth_direct.provider.providers.authentication.AuthenticationProvider
+import io.asgardeo.android.core_auth_direct.provider.providers.token.TokenProvider
 import javax.inject.Inject
 
 class AsgardeoAuthRepositoryImpl @Inject constructor() : AsgardeoAuthRepository {

diff --git a/...wso2_sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreen.kt b/...wso2_sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreen.kt
@@ -47,7 +47,7 @@ import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_c
 import com.wso2_sample.api_auth_sample.util.ui.LoadingDialog
 import com.wso2_sample.api_auth_sample.ui.theme.Api_authenticator_sdkTheme
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.components.PasskeyAuthComponent
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlow
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlow
 
 @Composable
 internal fun AuthScreen(

diff --git a/...sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenState.kt b/...sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenState.kt
@@ -18,8 +18,8 @@
 
 package com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen
 
-import io.asgardeo.android.core.models.autheniticator.Authenticator
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlowNotSuccess
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlowNotSuccess
 
 data class AuthScreenState(
     val isLoading: Boolean = true,

diff --git a/...le/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenViewModel.kt b/...le/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenViewModel.kt
@@ -29,10 +29,10 @@ import androidx.lifecycle.viewModelScope
 import com.wso2_sample.api_auth_sample.features.login.domain.repository.AsgardeoAuthRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.asgardeo.android.core.models.autheniticator.Authenticator
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlow
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlowNotSuccess
-import io.asgardeo.android.core.provider.providers.authentication.AuthenticationProvider
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlow
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlowNotSuccess
+import io.asgardeo.android.core_auth_direct.provider.providers.authentication.AuthenticationProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch

diff --git a/...mple/api_auth_sample/features/login/presentation/screens/auth_screen/components/AuthUI.kt b/...mple/api_auth_sample/features/login/presentation/screens/auth_screen/components/AuthUI.kt
@@ -20,9 +20,9 @@ package com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth
 
 import androidx.compose.runtime.Composable
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.ContinueText
-import io.asgardeo.android.core.models.autheniticator.Authenticator
-import io.asgardeo.android.core.models.autheniticator.AuthenticatorTypes
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlowNotSuccess
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.AuthenticatorTypes
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlowNotSuccess
 
 @Composable
 internal fun AuthUI(authenticationFlow: AuthenticationFlowNotSuccess) {

diff --git a/...e/api_auth_sample/features/login/presentation/screens/auth_screen/components/BasicAuth.kt b/...e/api_auth_sample/features/login/presentation/screens/auth_screen/components/BasicAuth.kt
@@ -44,7 +44,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.ui.theme.Api_authenticator_sdkTheme
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 
 @Composable
 internal fun BasicAuth(

diff --git a/...pi_auth_sample/features/login/presentation/screens/auth_screen/components/EmailOTPAuth.kt b/...pi_auth_sample/features/login/presentation/screens/auth_screen/components/EmailOTPAuth.kt
@@ -44,7 +44,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 
 @Composable
 internal fun EmailOTPAuth(

diff --git a/.../api_auth_sample/features/login/presentation/screens/auth_screen/components/GithubAuth.kt b/.../api_auth_sample/features/login/presentation/screens/auth_screen/components/GithubAuth.kt
@@ -21,7 +21,7 @@ package com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/...uth_sample/features/login/presentation/screens/auth_screen/components/GoogleNativeAuth.kt b/...uth_sample/features/login/presentation/screens/auth_screen/components/GoogleNativeAuth.kt
@@ -27,7 +27,7 @@ import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/...i_auth_sample/features/login/presentation/screens/auth_screen/components/MicrosoftAuth.kt b/...i_auth_sample/features/login/presentation/screens/auth_screen/components/MicrosoftAuth.kt
@@ -21,7 +21,7 @@ package com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/...h_sample/features/login/presentation/screens/auth_screen/components/OpenIdRedirectAuth.kt b/...h_sample/features/login/presentation/screens/auth_screen/components/OpenIdRedirectAuth.kt
@@ -21,7 +21,7 @@ package com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/...api_auth_sample/features/login/presentation/screens/auth_screen/components/PasskeyAuth.kt b/...api_auth_sample/features/login/presentation/screens/auth_screen/components/PasskeyAuth.kt
@@ -23,7 +23,7 @@ import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/.../api_auth_sample/features/login/presentation/screens/auth_screen/components/SMSOTPAuth.kt b/.../api_auth_sample/features/login/presentation/screens/auth_screen/components/SMSOTPAuth.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/...le/api_auth_sample/features/login/presentation/screens/auth_screen/components/TotpAuth.kt b/...le/api_auth_sample/features/login/presentation/screens/auth_screen/components/TotpAuth.kt
@@ -41,7 +41,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import io.asgardeo.android.core.models.autheniticator.Authenticator
+import io.asgardeo.android.core_auth_direct.models.autheniticator.Authenticator
 import com.wso2_sample.api_auth_sample.R
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.util.common_component.AuthButton

diff --git a/..._auth_sample/features/login/presentation/screens/landing_screen/LandingScreenViewModel.kt b/..._auth_sample/features/login/presentation/screens/landing_screen/LandingScreenViewModel.kt
@@ -28,8 +28,8 @@ import com.wso2_sample.api_auth_sample.util.navigation.NavigationViewModel
 import com.wso2_sample.api_auth_sample.util.ui.sendEvent
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import io.asgardeo.android.core.models.state.AuthenticationState
-import io.asgardeo.android.core.provider.providers.authentication.AuthenticationProvider
+import io.asgardeo.android.core_auth_direct.models.state.AuthenticationState
+import io.asgardeo.android.core_auth_direct.provider.providers.authentication.AuthenticationProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.update

diff --git a/...h-sdk/app/src/main/java/com/wso2_sample/api_auth_sample/util/navigation/NavDestination.kt b/...h-sdk/app/src/main/java/com/wso2_sample/api_auth_sample/util/navigation/NavDestination.kt
@@ -32,8 +32,8 @@ import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.auth_screen.AuthScreenViewModel
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.landing_screen.LandingScreen
 import com.wso2_sample.api_auth_sample.features.login.presentation.screens.landing_screen.LandingScreenViewModel
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlow
-import io.asgardeo.android.core.models.authentication_flow.AuthenticationFlowNotSuccess
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlow
+import io.asgardeo.android.core_auth_direct.models.authentication_flow.AuthenticationFlowNotSuccess
 import java.net.URLDecoder
 
 object NavDestination {

diff --git a/petcare-sample/b2c/mobile-app/petcare-with-sdk/gradle/libs.versions.toml b/petcare-sample/b2c/mobile-app/petcare-with-sdk/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 activityCompose = "1.9.0"
 agp = "8.3.2"
-asgardeoAndroidUi = "0.1.1"
+asgardeoAndroid = "0.1.1"
 arrowCore = "1.2.0"
 coilCompose = "2.5.0"
 composeBom = "2024.04.01"
@@ -24,7 +24,7 @@ integrity = "1.3.0"
 playServicesTasks = "18.1.0"
 
 [libraries]
-asgardeo-android-ui = { module = "io.asgardeo:android.ui", version.ref = "asgardeoAndroidUi" }
+asgardeo-android = { module = "io.asgardeo:asgardeo-android", version.ref = "asgardeoAndroid" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 androidx-compose-bom-v20240400 = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" }