From 9874f95d2eecf53c8b60138dff679f0a4e8c18cd Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Sun, 31 Mar 2024 13:57:29 +0200 Subject: [PATCH] use 2024 data --- .../store/graphql/ApolloClientBuilder.android.kt | 11 +++++++---- shared/data/src/commonMain/graphql/operations.graphql | 2 +- .../kotlin/fr/androidmakers/store/graphql/mappers.kt | 2 +- .../kotlin/fr/androidmakers/di/DataModule.android.kt | 4 ++-- .../kotlin/fr/androidmakers/di/DataModule.ios.kt | 2 +- .../kotlin/com/androidmakers/ui/agenda/AgendaUtils.kt | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/shared/data/src/androidMain/kotlin/fr/androidmakers/store/graphql/ApolloClientBuilder.android.kt b/shared/data/src/androidMain/kotlin/fr/androidmakers/store/graphql/ApolloClientBuilder.android.kt index 111b8a78..0346a844 100644 --- a/shared/data/src/androidMain/kotlin/fr/androidmakers/store/graphql/ApolloClientBuilder.android.kt +++ b/shared/data/src/androidMain/kotlin/fr/androidmakers/store/graphql/ApolloClientBuilder.android.kt @@ -27,10 +27,13 @@ actual class ApolloClientBuilder( request.newBuilder() .addHeader("conference", conference) .apply { - val token = Firebase.auth.currentUser?.getIdToken(false)?.result?.token - if (token != null) { - addHeader("Authorization", "Bearer $token") - } + /** + * + */ +// val token = Firebase.auth.currentUser?.getIdToken(false)?.result?.token +// if (token != null) { +// addHeader("Authorization", "Bearer $token") +// } } .build() ) diff --git a/shared/data/src/commonMain/graphql/operations.graphql b/shared/data/src/commonMain/graphql/operations.graphql index 2de0da2d..323211bf 100644 --- a/shared/data/src/commonMain/graphql/operations.graphql +++ b/shared/data/src/commonMain/graphql/operations.graphql @@ -27,7 +27,7 @@ fragment SessionDetails on Session { id } tags - isServiceSession + #isServiceSession } diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt index a705405c..d8f2574f 100644 --- a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt +++ b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt @@ -56,7 +56,7 @@ fun SessionDetails.toSession(): Session { roomId = this.room?.id ?: "", endsAt = this.endsAt, startsAt = this.startsAt, - isServiceSession = isServiceSession + isServiceSession = false //isServiceSession ) } diff --git a/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt b/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt index 6971d2a2..5cdd92ea 100644 --- a/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt +++ b/shared/di/src/androidMain/kotlin/fr/androidmakers/di/DataModule.android.kt @@ -10,8 +10,8 @@ import org.koin.dsl.module actual val dataPlatformModule = module { single { ApolloClientBuilder( androidContext(), - "https://androidmakers-2023.ew.r.appspot.com/graphql", - "androidmakers2023") + "https://confetti-app.dev/graphql", + "androidmakers2024") } single> { diff --git a/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt b/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt index e407396a..e7c71d28 100644 --- a/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt +++ b/shared/di/src/iosMain/kotlin/fr/androidmakers/di/DataModule.ios.kt @@ -13,7 +13,7 @@ import platform.Foundation.NSUserDomainMask @OptIn(ExperimentalForeignApi::class) actual val dataPlatformModule = module { - single { ApolloClientBuilder("https://androidmakers-2023.ew.r.appspot.com/graphql", "androidmakers2023", "") } + single { ApolloClientBuilder("https://confetti-app.dev/graphql", "androidmakers2024", "") } single> { createDataStore { diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaUtils.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaUtils.kt index 5e175ee2..04ea4ad8 100644 --- a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaUtils.kt +++ b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaUtils.kt @@ -44,7 +44,7 @@ fun Session.toUISession( endDate = endsAt.toInstant(eventTimeZone), language = language, roomId = roomId, - room = rooms[roomId]!!.name, + room = rooms[roomId]?.name ?: "unknown", speakers = this.speakers.mapNotNull { speakers[it]?.toUISpeaker() }, isServiceSession = isServiceSession, isFavorite = isFavorite