Revert "Mask API credentials (#64)"

mr3y-the-programmer · mr3y-the-programmer · commit 24cf0de91e2a · 2024-06-30T16:11:10.000+03:00
This reverts commit 35c0b52.
diff --git a/.editorconfig b/.editorconfig
@@ -3,5 +3,4 @@ ktlint_code_style = intellij_idea
 ktlint_function_naming_ignore_when_annotated_with=Composable
 ktlint_standard_property-naming = disabled
 ktlint_standard_filename = disabled
-ktlint_standard_discouraged-comment-location = disabled
-ktlint_standard_package-name = disabled
+ktlint_standard_discouraged-comment-location = disabled
diff --git a/.github/workflows/CompareScreenshot.yml b/.github/workflows/CompareScreenshot.yml
@@ -17,6 +17,10 @@ concurrency:
 
 permissions: {}
 
+env:
+  API_KEY: ${{ secrets.API_KEY }}
+  API_SECRET: ${{ secrets.API_SECRET }}
+
 jobs:
   compare-screenshot-test:
     runs-on: ubuntu-latest
@@ -41,19 +45,6 @@ jobs:
         with:
           gradle-version: wrapper
 
-      - name: Create debug keystore file
-        run: |
-          echo "$DEBUG_KEYSTORE" > debug.keystore.b64
-          base64 -d -i debug.keystore.b64 > debug.keystore
-        env:
-          DEBUG_KEYSTORE: ${{ secrets.DEBUG_KEYSTORE }}
-
-      - name: Create API credentials
-        run: |
-          echo "$API_CREDENTIALS" > app/bytemask.properties.b64
-          base64 -d -i app/bytemask.properties.b64 > app/bytemask.properties
-        env:
-          API_CREDENTIALS: ${{ secrets.API_CREDENTIALS }}
 
       - uses: dawidd6/action-download-artifact@v6
         continue-on-error: true
diff --git a/.github/workflows/StoreScreenshot.yml b/.github/workflows/StoreScreenshot.yml
@@ -17,6 +17,10 @@ concurrency:
 
 permissions: {}
 
+env:
+  API_KEY: ${{ secrets.API_KEY }}
+  API_SECRET: ${{ secrets.API_SECRET }}
+
 jobs:
   store-screenshot-test:
     runs-on: ubuntu-latest
@@ -42,20 +46,6 @@ jobs:
         with:
           gradle-version: wrapper
 
-      - name: Create debug keystore file
-        run: |
-          echo "$DEBUG_KEYSTORE" > debug.keystore.b64
-          base64 -d -i debug.keystore.b64 > debug.keystore
-        env:
-          DEBUG_KEYSTORE: ${{ secrets.DEBUG_KEYSTORE }}
-
-      - name: Create API credentials
-        run: |
-          echo "$API_CREDENTIALS" > app/bytemask.properties.b64
-          base64 -d -i app/bytemask.properties.b64 > app/bytemask.properties
-        env:
-          API_CREDENTIALS: ${{ secrets.API_CREDENTIALS }}
-
       - name: record screenshot
         id: record-test
         run: |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
+env:
+  API_KEY: ${{ secrets.API_KEY }}
+  API_SECRET: ${{ secrets.API_SECRET }}
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -41,20 +45,6 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Create debug keystore file
-        run: |
-          echo "$DEBUG_KEYSTORE" > debug.keystore.b64
-          base64 -d -i debug.keystore.b64 > debug.keystore
-        env:
-          DEBUG_KEYSTORE: ${{ secrets.DEBUG_KEYSTORE }}
-
-      - name: Create API credentials
-        run: |
-          echo "$API_CREDENTIALS" > app/bytemask.properties.b64
-          base64 -d -i app/bytemask.properties.b64 > app/bytemask.properties
-        env:
-          API_CREDENTIALS: ${{ secrets.API_CREDENTIALS }}
-
       - name: Build debug
         run: ./gradlew assembleDebug --stacktrace
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,6 +5,10 @@ on:
     tags:
       - 'v*'
 
+env:
+  API_KEY: ${{ secrets.API_KEY }}
+  API_SECRET: ${{ secrets.API_SECRET }}
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -32,13 +36,6 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Create API credentials
-        run: |
-          echo "$API_CREDENTIALS" > app/bytemask.properties.b64
-          base64 -d -i app/bytemask.properties.b64 > app/bytemask.properties
-        env:
-          API_CREDENTIALS: ${{ secrets.API_CREDENTIALS }}
-
       - name: Build changelog
         id: build_changelog
         uses: mikepenz/release-changelog-builder-action@v4
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@
 .externalNativeBuild
 .cxx
 local.properties
-bytemask.properties
 keystore.properties
 debug.keystore
 debug.keystore.b64
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,4 +1,3 @@
-import dev.shreyaspatil.bytemask.plugin.config.KeySource
 import java.io.FileInputStream
 import java.time.Instant
 import java.util.Properties
@@ -15,7 +14,6 @@ plugins {
     alias(libs.plugins.appversioning)
     alias(libs.plugins.play.publisher)
     alias(libs.plugins.roborazzi)
-    alias(libs.plugins.bytemask)
 }
 
 android {
@@ -26,9 +24,6 @@ android {
     }
 
     signingConfigs {
-        if (System.getenv("CI").toBoolean()) {
-            named("debug") { storeFile = rootProject.file("debug.keystore") }
-        }
         create("release") {
             if (rootProject.file("keystore.properties").exists()) {
                 val keystoreProperties = Properties()
@@ -71,16 +66,6 @@ android {
     }
 }
 
-bytemaskConfig {
-    configure("release") {
-        enableEncryption = true
-        encryptionKeySource = KeySource.SigningConfig(name = "release")
-    }
-    configure("debug") {
-        enableEncryption = true
-    }
-}
-
 appVersioning {
     overrideVersionName { gitTag, providerFactory, variantInfo ->
         val buildNumber = providerFactory
@@ -122,7 +107,6 @@ dependencies {
     implementation(projects.core.data)
     implementation(projects.core.sync)
     implementation(projects.core.opml)
-    implementation(projects.core.credentialsProvider)
     implementation(projects.ui.resources)
     implementation(projects.ui.preview)
     implementation(projects.ui.designSystem)
diff --git a/app/src/main/kotlin/com/mr3y/podcaster/PodcasterApplication.kt b/app/src/main/kotlin/com/mr3y/podcaster/PodcasterApplication.kt
@@ -3,11 +3,9 @@ package com.mr3y.podcaster
 import android.app.Application
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
-import com.mr3y.podcaster.core.credentials_provider.CredentialsProvider
 import com.mr3y.podcaster.core.opml.FileManager
 import com.mr3y.podcaster.core.sync.initializeWorkManagerInstance
 import dagger.hilt.android.HiltAndroidApp
-import dev.shreyaspatil.bytemask.android.AndroidBytemask
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -22,8 +20,6 @@ class PodcasterApplication : Application(), Configuration.Provider {
     override fun onCreate() {
         super.onCreate()
         initializeWorkManagerInstance(this)
-        AndroidBytemask.init(this)
-        CredentialsProvider.setAPICredentials(key = BytemaskConfig.API_KEY, secret = BytemaskConfig.API_SECRET)
         fileManager.registerActivityWatcher()
     }
 
diff --git a/app/src/test/kotlin/com/mr3y/podcaster/PodcasterApplication.kt b/app/src/test/kotlin/com/mr3y/podcaster/PodcasterApplication.kt
diff --git a/core/credentials-provider/build.gradle.kts b/core/credentials-provider/build.gradle.kts
diff --git a/core/credentials-provider/src/main/kotlin/com/mr3y/podcaster/core/credentials_provider/CredentialsProvider.kt b/core/credentials-provider/src/main/kotlin/com/mr3y/podcaster/core/credentials_provider/CredentialsProvider.kt
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -1,3 +1,6 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     alias(libs.plugins.podcaster.android.lib)
     alias(libs.plugins.kotlinx.serialization)
@@ -6,6 +9,26 @@ plugins {
 
 android {
     namespace = "com.mr3y.podcaster.core.network"
+
+    defaultConfig {
+
+        buildConfigField("String", "API_KEY", "\"${getValueOfKey("API_KEY")}\"")
+        buildConfigField("String", "API_SECRET", "\"${getValueOfKey("API_SECRET")}\"")
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+}
+
+fun getValueOfKey(key: String): String {
+    return if (System.getenv("CI").toBoolean()) {
+        System.getenv(key)
+    } else {
+        val properties = Properties()
+        properties.load(FileInputStream(rootProject.file("local.properties")))
+        properties.getProperty(key)
+    }
 }
 
 dependencies {
@@ -14,7 +37,6 @@ dependencies {
     implementation(libs.hilt.runtime)
     implementation(projects.core.model)
     implementation(projects.core.logger)
-    implementation(projects.core.credentialsProvider)
     implementation(libs.bundles.ktor)
     implementation(libs.result)
     implementation(libs.kotlinx.serialization)
diff --git a/core/network/src/main/kotlin/com/mr3y/podcaster/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/mr3y/podcaster/core/network/di/NetworkModule.kt
@@ -1,7 +1,7 @@
 package com.mr3y.podcaster.core.network.di
 
 import android.content.Context
-import com.mr3y.podcaster.core.credentials_provider.CredentialsProvider
+import com.mr3y.podcaster.core.network.BuildConfig
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -48,9 +48,7 @@ object NetworkModule {
         }
 
         fun authHeader(epoch: Long): String {
-            val apiKey = CredentialsProvider.apiKey()
-            val apiSecret = CredentialsProvider.apiSecret()
-            val authHash = sha1("$apiKey$apiSecret$epoch".toByteArray())
+            val authHash = sha1("${BuildConfig.API_KEY}${BuildConfig.API_SECRET}$epoch".toByteArray())
             return byteToHex(authHash)
         }
 
@@ -61,7 +59,7 @@ object NetworkModule {
                     val epoch = (System.currentTimeMillis() / 1000)
                     append("User-Agent", "Podcaster/1.0")
                     append("X-Auth-Date", epoch.toString())
-                    append("X-Auth-Key", CredentialsProvider.apiKey())
+                    append("X-Auth-Key", BuildConfig.API_KEY)
                     append("Authorization", authHeader(epoch))
                 }
             }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,7 +14,6 @@ splashscreen = "1.0.1"
 junit = "4.13.2"
 robolectric = "4.12.2"
 roborazzi = "1.20.0"
-bytemask = "1.0.0-alpha02"
 okio = "3.9.0"
 mockk = "1.13.11"
 assertk = "0.28.1"
@@ -154,7 +153,6 @@ aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "abo
 appversioning = { id = "io.github.reactivecircus.app-versioning", version.ref = "appversioning" }
 play-publisher = { id = "com.github.triplet.play", version.ref = "gpp" }
 roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
-bytemask = { id = "dev.shreyaspatil.bytemask.plugin", version.ref = "bytemask" }
 podcaster-android-app = { id = "podcaster.android.application", version = "unspecified" }
 podcaster-android-lib = { id = "podcaster.android.library", version = "unspecified" }
 podcaster-compose-android-lib = { id = "podcaster.android.compose.library", version = "unspecified" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -28,7 +28,6 @@ include(":core:network-test-fixtures")
 include(":core:data")
 include(":core:sync")
 include(":core:opml")
-include(":core:credentials-provider")
 include(":ui:resources")
 include(":ui:preview")
 include(":ui:design-system")
