Update auth library (#12)

* Update version of omh auth library

* Update version of omh auth library

build.gradle.kts

@@ -3,6 +3,7 @@ subprojects {
         mavenCentral()
         google()
         mavenLocal()
+        maven("https://s01.oss.sonatype.org/content/groups/staging/")
     }
 }
 

buildSrc/src/main/kotlin/Dependencies.kt

@@ -40,4 +40,7 @@ object Libs {
     val androidJunit by lazy { "androidx.test.ext:junit:${Versions.androidJunit}" }
     val mockk by lazy { "io.mockk:mockk:${Versions.mockk}" }
     val coroutineTesting by lazy { "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutines}" }
+
+    // Auth
+    val omhAuthLibrary by lazy { "com.openmobilehub.android:auth-api:${Versions.omhAuth}" }
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -32,4 +32,7 @@ object Versions {
     const val junit = "4.13.2"
     const val androidJunit = "1.1.5"
     const val mockk = "1.13.4"
+
+    // Auth
+    const val omhAuth = "1.0.1"
 }

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/OmhStorageClientImpl.kt

@@ -1,11 +1,13 @@
 package com.omh.android.storage.api.drive.nongms
 
 import android.content.Context
+import com.omh.android.auth.api.OmhAuthClient
 import com.omh.android.storage.api.OmhStorageClient
 
 internal class OmhStorageClientImpl(
-    context: Context
-) : OmhStorageClient {
+    context: Context,
+    authClient: OmhAuthClient
+) : OmhStorageClient(authClient) {
 
     private val applicationContext: Context
 
@@ -14,12 +16,11 @@ internal class OmhStorageClientImpl(
     }
 
     internal class Builder : OmhStorageClient.Builder {
-        override fun build(context: Context): OmhStorageClient {
-            return OmhStorageClientImpl(context)
-        }
-    }
 
-    override fun setupAccessToken(token: String) {
-        // Implement THIS
+        override fun build(context: Context, authClient: OmhAuthClient) =
+            OmhStorageClientImpl(context, authClient)
     }
+
+    // This will be implemented in a future PR
+    override fun getRepository() = Unit
 }

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/OmhStorageFactoryImpl.kt

@@ -1,11 +1,14 @@
 package com.omh.android.storage.api.drive.nongms
 
 import android.content.Context
+import com.omh.android.auth.api.OmhAuthClient
+import com.omh.android.storage.api.OmhStorageClient
 import com.omh.android.storage.api.OmhStorageFactory
 
 class OmhStorageFactoryImpl : OmhStorageFactory {
 
     override fun getStorageClient(
-        context: Context
-    ) = OmhStorageClientImpl.Builder().build(context)
+        context: Context,
+        authClient: OmhAuthClient
+    ): OmhStorageClient = OmhStorageClientImpl.Builder().build(context, authClient)
 }

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleRetrofitImpl.kt

@@ -1,22 +1,24 @@
 package com.omh.android.storage.api.drive.nongms.data
 
+import com.omh.android.auth.api.OmhCredentials
 import com.omh.android.storage.api.drive.nongms.BuildConfig
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.jackson.JacksonConverterFactory
 
-internal class GoogleRetrofitImpl(private val bearerToken: String) {
+internal class GoogleRetrofitImpl(private val omhCredentials: OmhCredentials) {
 
     companion object {
         private const val HEADER_AUTHORIZATION_NAME = "Authorization"
+        private const val BEARER = "Bearer %s"
 
         private var instance: GoogleRetrofitImpl? = null
 
-        internal fun getInstance(bearerToken: String): GoogleRetrofitImpl {
+        internal fun getInstance(omhCredentials: OmhCredentials): GoogleRetrofitImpl {
             if (instance == null) {
-                instance = GoogleRetrofitImpl(bearerToken)
+                instance = GoogleRetrofitImpl(omhCredentials)
             }
 
             return instance!!
@@ -67,7 +69,7 @@ internal class GoogleRetrofitImpl(private val bearerToken: String) {
         .newBuilder()
         .addHeader(
             HEADER_AUTHORIZATION_NAME,
-            bearerToken
+            BEARER.format(omhCredentials.accessToken.orEmpty())
         )
         .build()
 

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/source/FileRemoteDataSource.kt

@@ -1,15 +1,16 @@
 package com.omh.android.storage.api.drive.nongms.data.source
 
+import com.omh.android.auth.api.OmhCredentials
 import com.omh.android.storage.api.data.source.remote.FileRemoteDataSource
 import com.omh.android.storage.api.domain.model.File
 import com.omh.android.storage.api.drive.nongms.data.GoogleRetrofitImpl
 import com.omh.android.storage.api.drive.nongms.data.source.mapper.toFileList
 
-internal class FileRemoteDataSource : FileRemoteDataSource {
+internal class FileRemoteDataSource(private val authCredentials: OmhCredentials) : FileRemoteDataSource {
 
     override fun getRootFilesList(): List<File> {
         val response = GoogleRetrofitImpl
-            .getInstance("")
+            .getInstance(authCredentials)
             .getGoogleStorageApiService()
             .getRootFilesList()
             .execute()

storage-api/build.gradle.kts

@@ -10,4 +10,5 @@ android {
 dependencies {
     implementation(Libs.reflection)
     testImplementation(Libs.junit)
-}
+    api(Libs.omhAuthLibrary)
+}

storage-api/src/main/java/com/omh/android/storage/api/OmhStorageClient.kt

@@ -1,12 +1,14 @@
 package com.omh.android.storage.api
 
 import android.content.Context
+import com.omh.android.auth.api.OmhAuthClient
 
-interface OmhStorageClient {
+abstract class OmhStorageClient protected constructor(protected val authClient: OmhAuthClient) {
 
     interface Builder {
-        fun build(context: Context): OmhStorageClient
+
+        fun build(context: Context, authClient: OmhAuthClient): OmhStorageClient
     }
 
-    fun setupAccessToken(token: String)
+    abstract fun getRepository()
 }

storage-api/src/main/java/com/omh/android/storage/api/OmhStorageFactory.kt

@@ -1,7 +1,9 @@
 package com.omh.android.storage.api
 
 import android.content.Context
+import com.omh.android.auth.api.OmhAuthClient
 
 interface OmhStorageFactory {
-    fun getStorageClient(context: Context): OmhStorageClient
+
+    fun getStorageClient(context: Context, authClient: OmhAuthClient): OmhStorageClient
 }

storage-api/src/main/java/com/omh/android/storage/api/OmhStorageProvider.kt

@@ -1,16 +1,17 @@
 package com.omh.android.storage.api
 
 import android.content.Context
+import com.omh.android.auth.api.OmhAuthClient
 import kotlin.reflect.KClass
 
 object OmhStorageProvider {
 
     private const val NGMS_ADDRESS = "com.omh.android.storage.api.drive.nongms.OmhStorageFactoryImpl"
 
     @SuppressWarnings("SwallowedException")
-    fun provideStorageClient(context: Context): OmhStorageClient {
+    fun provideStorageClient(context: Context, authClient: OmhAuthClient): OmhStorageClient {
         val clazz: KClass<out Any> = Class.forName(NGMS_ADDRESS).kotlin
         val omhStorageFactory = clazz.objectInstance as OmhStorageFactory
-        return omhStorageFactory.getStorageClient(context)
+        return omhStorageFactory.getStorageClient(context, authClient)
     }
 }