Merge pull request #4 from TangramFlex/cred-bug

Cred bug
TangramFlex · Sep 21, 2022 · a1b68f4 · a1b68f4
2 parents a92ffc8 + 4a7e558
commit a1b68f4
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/main/scala/io/github/tangramflex/sbt/gitlab/GitlabPlugin.scala b/src/main/scala/io/github/tangramflex/sbt/gitlab/GitlabPlugin.scala
@@ -57,7 +57,7 @@ object GitlabPlugin extends AutoPlugin {
         .map {
           GitlabCredentials(_)
         }
-    }.get
+    }
   }
 
   private def projectRepo(domain: String, projectId: Int): MavenRepository =
@@ -82,9 +82,10 @@ object GitlabPlugin extends AutoPlugin {
           .map(GitlabCredentials("Job-Token", _))
       },
       headerAuthHandler := {
-        val cred = gitlabCredentialsHandler.value
-        val dispatcher = gitlabUrlHandlerDispatcher(gitlabDomain.value, cred)
-        URLHandlerRegistry.setDefault(dispatcher)
+        gitlabCredentialsHandler.value.map{ creds =>
+          val dispatcher = gitlabUrlHandlerDispatcher(gitlabDomain.value, creds)
+          URLHandlerRegistry.setDefault(dispatcher)
+        }
       },
       update := update.dependsOn(headerAuthHandler).value,
       updateClassifiers := updateClassifiers.dependsOn(headerAuthHandler).value,
@@ -98,8 +99,13 @@ object GitlabPlugin extends AutoPlugin {
       ).flatten,
       resolvers ++= gitlabResolvers.value,
       // Adds Coursier repository Authentication for each gitlabResolver
-      csrConfiguration := gitlabResolvers.value.foldRight(csrConfiguration.value){
-        case (repo, csr) => csr.addRepositoryAuthentication(repo.name, Authentication(Seq(gitlabCredentialsHandler.value.key -> gitlabCredentialsHandler.value.value)))
+      csrConfiguration := {
+        gitlabCredentialsHandler.value match {
+          case Some(creds) => gitlabResolvers.value.foldRight(csrConfiguration.value) {
+            case (repo, csr) => csr.addRepositoryAuthentication(repo.name, Authentication(Seq(creds.key -> creds.value)))
+          }
+          case None => csrConfiguration.value
+        }
       },
       publish := publish.dependsOn(headerAuthHandler).value,
       // If no publish location is specified then publish to the project id (if set)