diff --git a/README.md b/README.md index 3b25c2e..2d3fd7a 100644 --- a/README.md +++ b/README.md @@ -324,7 +324,7 @@ kri: #### `com.kri.common.endpoint.auth.apikey.ApiKeyAdminController` -- 노출 조건: `kri.auth.apikey.admin-api-enabled=true` +- 노출 조건: `kri.auth.apikey.admin-api-enabled=true` 그리고 `PreloadedApiKeyUserClaimsProvider` 빈 존재 - 경로: `/internal/apikey/reload`, `/internal/apikey/cache` - 설명: preload 캐시 재적재와 현재 캐시 조회를 위한 내부 관리용 endpoint입니다. diff --git a/build.gradle b/build.gradle index a6d2e22..5a3602f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } //버전 변경은 여기서 -def commonVer = "beta.1.1.01" +def commonVer = "beta.1.1.02" group = 'com.kri.common' version = commonVer diff --git a/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyAdminAutoConfiguration.java b/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyAdminAutoConfiguration.java index 6b5f0a6..b6e43dd 100644 --- a/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyAdminAutoConfiguration.java +++ b/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyAdminAutoConfiguration.java @@ -1,13 +1,16 @@ package com.kri.common.autoconfigure.auth.apikey; import com.kri.common.endpoint.auth.apikey.ApiKeyAdminController; +import com.kri.common.runtime.auth.apikey.PreloadedApiKeyUserClaimsProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Import; @AutoConfiguration @ConditionalOnClass(ApiKeyAdminController.class) +@ConditionalOnBean(PreloadedApiKeyUserClaimsProvider.class) @ConditionalOnProperty(prefix = "kri.auth.apikey", name = "admin-api-enabled", havingValue = "true") @Import(ApiKeyAdminController.class) // 컴포넌트 스캔 없이도 Bean 등록 public class ApiKeyAdminAutoConfiguration { diff --git a/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyJpaAutoConfiguration.java b/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyJpaAutoConfiguration.java index 87d08b8..1ea49ee 100644 --- a/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyJpaAutoConfiguration.java +++ b/src/main/java/com/kri/common/autoconfigure/auth/apikey/ApiKeyJpaAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.transaction.PlatformTransactionManager; }) @ConditionalOnProperty(prefix = "kri.auth.apikey", name = "enabled", havingValue = "true") @EnableJpaRepositories( - basePackages = "com.kri.common.auth.persistence.repository", + basePackages = "com.kri.common.runtime.auth.apikey.persistence.repository", entityManagerFactoryRef = "apiKeyEntityManagerFactory", transactionManagerRef = "apiKeyTransactionManager" ) @@ -76,7 +76,7 @@ public class ApiKeyJpaAutoConfiguration { LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean(); emf.setDataSource(ds); emf.setJpaVendorAdapter(vendorAdapter); - emf.setPackagesToScan("com.kri.common.auth.persistence.entity"); + emf.setPackagesToScan("com.kri.common.runtime.auth.apikey.persistence.entity"); emf.setPersistenceUnitName("apikey"); PersistenceUnitManager pum = pumProvider.getIfAvailable(); @@ -111,4 +111,4 @@ public class ApiKeyJpaAutoConfiguration { // FactoryBean으로 등록하면 내부에서 EntityManagerFactory들을 찾아 Metamodel을 구성함 return new JpaMetamodelMappingContextFactoryBean(); } -} \ No newline at end of file +}