fix auth in maven

Mr3zee · Mr3zee · commit 268e0e283547 · 2024-10-30T15:43:19.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,9 @@
  */
 
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
-import util.getSpacePassword
+import util.configureApiValidation
+import util.configureNpm
+import util.configureProjectReport
 import util.libs
 
 plugins {
@@ -30,7 +32,7 @@ println("kotlinx.rpc project version: $version, Kotlin version: $kotlinVersionFu
 // If the prefix of the kPRC version is not Kotlin gradle plugin version – you have a problem :)
 // Probably some dependency brings kotlin with the later version.
 // To mitigate so, refer to `versions-root/kotlin-version-lookup.json`
-// and its usage in `gradle-conventions-settings/src/main/kotlin/settings-conventions.settings.gradle.kts`
+// and its usage in `gradle-conventions-settings/src/main/kotlin/conventions-version-resolution.settings.gradle.kts`
 val kotlinGPVersion = getKotlinPluginVersion()
 if (kotlinVersionFull != kotlinGPVersion) {
     error("KGP version mismatch. Project version: $kotlinVersionFull, KGP version: $kotlinGPVersion")
diff --git a/gradle-conventions-settings/src/main/kotlin/conventions-repositories.settings.gradle.kts b/gradle-conventions-settings/src/main/kotlin/conventions-repositories.settings.gradle.kts
@@ -15,16 +15,26 @@ pluginManagement {
         propertyName.replace(".", "_").uppercase()
     )?.ifEmpty { null }
 
-    fun getSpaceUsername(): String? {
-        val username = "kotlinx.rpc.team.space.username"
-        return settings.providers.gradleProperty(username).orNull
-            ?: getEnv(username)
-            ?: logAbsentProperty(username)
+    fun getLocalProperties(): java.util.Properties {
+        return java.util.Properties().apply {
+            val propertiesDir = File(
+                rootDir.path
+                    .removeSuffix("/gradle-conventions")
+                    .removeSuffix("/gradle-conventions-settings")
+                    .removeSuffix("/compiler-plugin")
+                    .removeSuffix("/gradle-plugin")
+            )
+            val localFile = File(propertiesDir, "local.properties")
+            if (localFile.exists()) {
+                localFile.inputStream().use { load(it) }
+            }
+        }
     }
 
     fun getSpacePassword(): String? {
         val password = "kotlinx.rpc.team.space.password"
-        return settings.providers.gradleProperty(password).orNull
+        return getLocalProperties()[password] as String?
+            ?: settings.providers.gradleProperty(password).orNull
             ?: getEnv(password)
             ?: logAbsentProperty(password)
     }
@@ -39,13 +49,16 @@ pluginManagement {
             name = repoName.split("-").joinToString("") { it.replaceFirstChar { c -> c.titlecase() } }
             url = uri("https://packages.jetbrains.team/maven/p/krpc/$repoName")
 
-            val spaceUsername = getSpaceUsername()
             val spacePassword = getSpacePassword()
 
-            if (spaceUsername != null && spacePassword != null) {
-                credentials {
-                    username = spaceUsername
-                    password = spacePassword
+            if (spacePassword != null) {
+                credentials(HttpHeaderCredentials::class.java) {
+                    name = "Authorization"
+                    value = "Bearer $spacePassword"
+                }
+
+                authentication {
+                    create<HttpHeaderAuthentication>("http_auth_header")
                 }
             } else {
                 logger.info("Skipping adding credentials for Space repository '$repoName'")
@@ -57,8 +70,16 @@ pluginManagement {
     fun RepositoryHandler.buildDepsEap() = jbTeamPackages(repoName = "build-deps-eap")
 
     repositories {
-        buildDeps()
-        buildDepsEap()
+        val useProxyProperty = getLocalProperties()["kotlinx.rpc.useProxyRepositories"] as String?
+        val useProxy = useProxyProperty == null || useProxyProperty == "true"
+
+        if (useProxy) {
+            buildDeps()
+            buildDepsEap()
+        } else {
+            mavenCentral()
+            gradlePluginPortal()
+        }
     }
 }
 
@@ -73,16 +94,31 @@ gradle.rootProject {
         propertyName.replace(".", "_").uppercase()
     )?.ifEmpty { null }
 
-    fun getSpaceUsername(): String? {
-        val username = "kotlinx.rpc.team.space.username"
-        return settings.providers.gradleProperty(username).orNull
-            ?: getEnv(username)
-            ?: logAbsentProperty(username)
+    fun getLocalProperties(): java.util.Properties {
+        return java.util.Properties().apply {
+            val propertiesDir = File(
+                rootDir.path
+                    .removeSuffix("/gradle-conventions")
+                    .removeSuffix("/gradle-conventions-settings")
+                    .removeSuffix("/compiler-plugin")
+                    .removeSuffix("/gradle-plugin")
+            )
+            val localFile = File(propertiesDir, "local.properties")
+            if (localFile.exists()) {
+                localFile.inputStream().use { load(it) }
+            }
+        }
+    }
+
+    fun java.util.Properties.isUsingProxyRepositories(): Boolean {
+        val useProxyProperty = this["kotlinx.rpc.useProxyRepositories"] as String?
+        return useProxyProperty == null || useProxyProperty == "true"
     }
 
     fun getSpacePassword(): String? {
         val password = "kotlinx.rpc.team.space.password"
-        return settings.providers.gradleProperty(password).orNull
+        return getLocalProperties()[password] as String?
+            ?: settings.providers.gradleProperty(password).orNull
             ?: getEnv(password)
             ?: logAbsentProperty(password)
     }
@@ -95,16 +131,18 @@ gradle.rootProject {
     fun RepositoryHandler.jbTeamPackages(repoName: String) {
         maven {
             name = repoName.split("-").joinToString("") { it.replaceFirstChar { c -> c.titlecase() } }
-
             url = uri("https://packages.jetbrains.team/maven/p/krpc/$repoName")
 
-            val spaceUsername = getSpaceUsername()
             val spacePassword = getSpacePassword()
 
-            if (spaceUsername != null && spacePassword != null) {
-                credentials {
-                    username = spaceUsername
-                    password = spacePassword
+            if (spacePassword != null) {
+                credentials(HttpHeaderCredentials::class.java) {
+                    name = "Authorization"
+                    value = "Bearer $spacePassword"
+                }
+
+                authentication {
+                    create<HttpHeaderAuthentication>("http_auth_header")
                 }
             } else {
                 logger.info("Skipping adding credentials for Space repository '$repoName'")
@@ -116,15 +154,41 @@ gradle.rootProject {
     fun RepositoryHandler.buildDepsEap() = jbTeamPackages(repoName = "build-deps-eap")
 
     allprojects {
+        val localProps = getLocalProperties()
+
+        this.extra["spacePassword"] = getSpacePassword()
+        this.extra["localProperties"] = localProps
+        this.extra["useProxyRepositories"] = localProps.isUsingProxyRepositories()
+
+        val useProxy = localProps.isUsingProxyRepositories()
+
         buildscript {
             repositories {
-                buildDeps()
-                buildDepsEap()
+                if (useProxy) {
+                    buildDeps()
+                    buildDepsEap()
+                } else {
+                    mavenCentral()
+                    gradlePluginPortal()
+                }
             }
         }
         repositories {
-            buildDeps()
-            buildDepsEap()
+            if (useProxy) {
+                buildDeps()
+                buildDepsEap()
+            } else {
+                mavenCentral()
+                gradlePluginPortal()
+
+                maven("https://www.jetbrains.com/intellij-repository/releases")
+
+                maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies")
+                maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+                maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+
+                maven("https://maven.pkg.jetbrains.space/public/p/ktor/eap")
+            }
         }
     }
 }
diff --git a/gradle-conventions-settings/src/main/kotlin/util/npm.kt b/gradle-conventions-settings/src/main/kotlin/util/npm.kt
@@ -7,17 +7,22 @@ package util
 import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
 import java.io.File
 
 fun Project.configureNpm() {
     val executeNpmLogin by tasks.registering {
+        if (!useProxyRepositories) {
+            return@registering
+        }
+
         val registryUrl = "https://packages.jetbrains.team/npm/p/krpc/build-deps/"
 
         // To prevent leaking of credentials in VCS on dev machine use the build directory config file
         val buildYarnConfigFile = File(project.rootDir, "build/js/.yarnrc")
         val buildNpmConfigFile = File(project.rootDir, "build/js/.npmrc")
 
-        val spacePassword: String? = getSpacePassword()
+        val spacePassword: String? = spacePassword
 
         doLast {
             val outputYarnText = """
@@ -50,10 +55,14 @@ fun Project.configureNpm() {
         outputs.file(buildNpmConfigFile).withPropertyName("buildOutputNpmFile")
     }
 
+    val useProxy = useProxyRepositories
+
     plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class.java).configureEach {
         rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
             download = true
-            downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+            if (useProxy) {
+                downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+            }
         }
 
         tasks.named("kotlinNpmInstall").configure {
@@ -66,7 +75,15 @@ fun Project.configureNpm() {
         rootProject.extensions.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> {
             ignoreScripts = false
             download = true
-            downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+
+            yarnLockMismatchReport = when (useProxy) {
+                true -> YarnLockMismatchReport.FAIL
+                false -> YarnLockMismatchReport.WARNING
+            }
+
+            if (useProxy) {
+                downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+            }
         }
     }
 }
diff --git a/gradle-conventions-settings/src/main/kotlin/util/properties.kt b/gradle-conventions-settings/src/main/kotlin/util/properties.kt
@@ -7,29 +7,16 @@
 package util
 
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
 
-fun Project.logAbsentProperty(name: String): Nothing? {
-    logger.info("Property '$name' is not present.")
-
-    return null
+val Project.spacePassword get(): String? {
+    return (this.extra["spacePassword"] as String?)
 }
 
-fun getEnv(propertyName: String): String? = System.getenv(
-    propertyName.replace(".", "_").uppercase()
-)?.ifEmpty { null }
-
-private const val SPACE_USERNAME = "kotlinx.rpc.team.space.username"
-
-fun Project.getSpaceUsername(): String? {
-    return providers.gradleProperty(SPACE_USERNAME).orNull
-        ?: getEnv(SPACE_USERNAME)
-        ?: logAbsentProperty(SPACE_USERNAME)
+val Project.localProperties get(): java.util.Properties {
+    return (this.extra["localProperties"] as java.util.Properties)
 }
 
-private const val SPACE_PASSWORD = "kotlinx.rpc.team.space.password"
-
-fun Project.getSpacePassword(): String? {
-    return providers.gradleProperty(SPACE_PASSWORD).orNull
-        ?: getEnv(SPACE_PASSWORD)
-        ?: logAbsentProperty(SPACE_USERNAME)
+val Project.useProxyRepositories get(): Boolean {
+    return (this.extra["useProxyRepositories"] as Boolean)
 }
