release: 2.1.3 (#380)

Author: devxb

src/main/kotlin/org/gitanimals/render/app/AnimationFacade.kt

@@ -20,7 +20,7 @@ class AnimationFacade(
     private val contributionApi: ContributionApi,
     private val sagaManager: SagaManager,
     private val eventPublisher: ApplicationEventPublisher,
-    private val githubOpenApi: GithubOpenApi,
+    private val githubRestApi: GithubRestApi,
 ) {
 
     private val logger = LoggerFactory.getLogger(this::class.simpleName)
@@ -61,23 +61,6 @@ class AnimationFacade(
         }
     }
 
-    private fun setUserAuthInfoIfNotSet(username: String) {
-        runCatching {
-            val user = userService.getUserByName(username)
-
-            if (user.isAuthInfoSet().not()) {
-                val githubUserAuthInfo = githubOpenApi.getGithubUser(user.getName())
-                userService.setAuthInfo(
-                    name = user.getName(),
-                    entryPoint = EntryPoint.GITHUB,
-                    githubUserAuthInfo.id,
-                )
-            }
-        }.onFailure {
-            logger.info("Fail to update userAuthInfo cause: ${it.message}", it)
-        }
-    }
-
     fun createNewUser(username: String): User {
         return runCatching {
             val contributionYears = contributionApi.getAllContributionYears(username)
@@ -88,9 +71,28 @@ class AnimationFacade(
                 name = username,
                 contributions = contributionCountPerYear,
             )
+        }.onSuccess {
+            setUserAuthInfoIfNotSet(username)
         }.getOrElse {
             require(it !is RestClientException) { "Cannot create new user from username \"$username\"" }
             throw it
         }
     }
+
+    private fun setUserAuthInfoIfNotSet(username: String) {
+        runCatching {
+            val user = userService.getUserByName(username)
+
+            if (user.isAuthInfoSet().not()) {
+                val githubUserAuthInfo = githubRestApi.getGithubUser(user.getName())
+                userService.setAuthInfo(
+                    name = user.getName(),
+                    entryPoint = EntryPoint.GITHUB,
+                    githubUserAuthInfo.id,
+                )
+            }
+        }.onFailure {
+            logger.info("Fail to update userAuthInfo cause: ${it.message}", it)
+        }
+    }
 }

…g/gitanimals/render/app/GithubOpenApi.kt …g/gitanimals/render/app/GithubRestApi.ktsrc/main/kotlin/org/gitanimals/render/app/GithubOpenApi.kt renamed to src/main/kotlin/org/gitanimals/render/app/GithubRestApi.kt src/main/kotlin/org/gitanimals/render/app/GithubOpenApi.kt renamed to src/main/kotlin/org/gitanimals/render/app/GithubRestApi.kt

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.service.annotation.GetExchange
 
-fun interface GithubOpenApi {
+fun interface GithubRestApi {
 
     @GetExchange("/users/{username}")
     fun getGithubUser(@PathVariable("username") username: String): GithubUserResponse

src/main/kotlin/org/gitanimals/render/infra/RenderHttpClientConfigurer.kt

@@ -3,13 +3,14 @@ package org.gitanimals.render.infra
 import org.gitanimals.core.auth.InternalAuthRequestInterceptor
 import org.gitanimals.core.filter.MDCFilter
 import org.gitanimals.rank.infra.HttpClientErrorHandler
-import org.gitanimals.render.app.GithubOpenApi
+import org.gitanimals.render.app.GithubRestApi
 import org.gitanimals.render.app.IdentityApi
 import org.slf4j.MDC
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
+import org.springframework.http.HttpHeaders
 import org.springframework.web.client.RestClient
 import org.springframework.web.client.support.RestClientAdapter
 import org.springframework.web.service.invoker.HttpServiceProxyFactory
@@ -18,6 +19,7 @@ import org.springframework.web.service.invoker.HttpServiceProxyFactory
 @Profile("!test")
 class RenderHttpClientConfigurer(
     @Value("\${internal.secret}") private val internalSecret: String,
+    @Value("\${github.token}") private val token: String,
     private val internalAuthRequestInterceptor: InternalAuthRequestInterceptor,
 ) {
 
@@ -45,18 +47,22 @@ class RenderHttpClientConfigurer(
     }
 
     @Bean
-    fun renderGithubOpenApiHttpClient(): GithubOpenApi {
+    fun renderGithubRestApiHttpClient(): GithubRestApi {
         val restClient = RestClient
             .builder()
             .defaultStatusHandler(renderHttpClientErrorHandler())
+            .requestInterceptor { request, body, execution ->
+                request.headers.add(HttpHeaders.AUTHORIZATION, token)
+                execution.execute(request, body)
+            }
             .baseUrl("https://api.github.com")
             .build()
 
         val httpServiceProxyFactory = HttpServiceProxyFactory
             .builderFor(RestClientAdapter.create(restClient))
             .build()
 
-        return httpServiceProxyFactory.createClient(GithubOpenApi::class.java)
+        return httpServiceProxyFactory.createClient(GithubRestApi::class.java)
     }
 
     @Bean
@@ -88,7 +94,7 @@ class RenderTestHttpClientConfigurer {
     }
 
     @Bean
-    fun renderGithubOpenApiHttpClient(): GithubOpenApi {
+    fun renderGithubRestApiHttpClient(): GithubRestApi {
         val restClient = RestClient
             .builder()
             .defaultStatusHandler(renderHttpClientErrorHandler())
@@ -99,7 +105,7 @@ class RenderTestHttpClientConfigurer {
             .builderFor(RestClientAdapter.create(restClient))
             .build()
 
-        return httpServiceProxyFactory.createClient(GithubOpenApi::class.java)
+        return httpServiceProxyFactory.createClient(GithubRestApi::class.java)
     }
 
     @Bean