Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: incorporate new changes made to the Android SDK to the percare sample application #474

Merged
merged 1 commit into from
Jun 10, 2024
Merged

chore: incorporate new changes made to the Android SDK to the percare sample application #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion petcare-sample/b2c/mobile-app/petcare-with-sdk/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...ample/api_auth_sample/features/home/presentation/screens/add_pet/AddPetScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...so2_sample/api_auth_sample/features/home/presentation/screens/home/HomeScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...mple/api_auth_sample/features/home/presentation/screens/profile/ProfileScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...om/wso2_sample/api_auth_sample/features/login/domain/repository/AsgardeoAuthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions .../wso2_sample/api_auth_sample/features/login/impl/repository/AsgardeoAuthRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...wso2_sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ...sample/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions ...le/api_auth_sample/features/login/presentation/screens/auth_screen/AuthScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ...mple/api_auth_sample/features/login/presentation/screens/auth_screen/components/AuthUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...e/api_auth_sample/features/login/presentation/screens/auth_screen/components/BasicAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...pi_auth_sample/features/login/presentation/screens/auth_screen/components/EmailOTPAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion .../api_auth_sample/features/login/presentation/screens/auth_screen/components/GithubAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...uth_sample/features/login/presentation/screens/auth_screen/components/GoogleNativeAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...i_auth_sample/features/login/presentation/screens/auth_screen/components/MicrosoftAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...h_sample/features/login/presentation/screens/auth_screen/components/OpenIdRedirectAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...api_auth_sample/features/login/presentation/screens/auth_screen/components/PasskeyAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../api_auth_sample/features/login/presentation/screens/auth_screen/components/SMSOTPAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...le/api_auth_sample/features/login/presentation/screens/auth_screen/components/TotpAuth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ..._auth_sample/features/login/presentation/screens/landing_screen/LandingScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...h-sdk/app/src/main/java/com/wso2_sample/api_auth_sample/util/navigation/NavDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions petcare-sample/b2c/mobile-app/petcare-with-sdk/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
Loading