Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support obtaining the configuration of halo.external-url for themes and plugins #2714

Merged
merged 2 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import run.halo.app.extension.DefaultSchemeManager;
import run.halo.app.extension.ExtensionClient;
import run.halo.app.extension.ReactiveExtensionClient;
import run.halo.app.infra.ExternalUrlSupplier;

/**
* <p>This {@link SharedApplicationContextHolder} class is used to hold a singleton instance of
Expand Down Expand Up @@ -61,6 +62,8 @@ SharedApplicationContext createSharedApplicationContext() {
DefaultSchemeManager defaultSchemeManager =
rootApplicationContext.getBean(DefaultSchemeManager.class);
beanFactory.registerSingleton("schemeManager", defaultSchemeManager);
beanFactory.registerSingleton("externalUrlSupplier",
rootApplicationContext.getBean(ExternalUrlSupplier.class));
// TODO add more shared instance here

return sharedApplicationContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package run.halo.app.theme;

import java.util.Map;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import run.halo.app.infra.ExternalUrlSupplier;
import run.halo.app.infra.SystemConfigurableEnvironmentFetcher;
import run.halo.app.theme.finders.vo.SiteSettingVo;

Expand All @@ -14,20 +16,19 @@
* @since 2.0.0
*/
@Component
@AllArgsConstructor
public class SiteSettingVariablesAcquirer implements ViewContextBasedVariablesAcquirer {

private final SystemConfigurableEnvironmentFetcher environmentFetcher;

public SiteSettingVariablesAcquirer(SystemConfigurableEnvironmentFetcher environmentFetcher) {
this.environmentFetcher = environmentFetcher;
}
private final ExternalUrlSupplier externalUrlSupplier;

@Override
public Mono<Map<String, Object>> acquire(ServerWebExchange exchange) {
return environmentFetcher.getConfigMap()
.filter(configMap -> configMap.getData() != null)
.map(configMap -> {
SiteSettingVo siteSettingVo = SiteSettingVo.from(configMap);
SiteSettingVo siteSettingVo = SiteSettingVo.from(configMap)
.withUrl(externalUrlSupplier.get());
return Map.of("site", siteSettingVo);
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package run.halo.app.theme.finders.vo;

import java.net.URI;
import java.util.Map;
import lombok.Builder;
import lombok.Value;
import lombok.With;
import org.springframework.util.Assert;
import run.halo.app.extension.ConfigMap;
import run.halo.app.infra.SystemSetting;
Expand All @@ -20,6 +22,9 @@ public class SiteSettingVo {

String title;

@With
URI url;

String subtitle;

String logo;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package run.halo.app.theme;

import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.when;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.web.server.ServerWebExchange;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import run.halo.app.extension.ConfigMap;
import run.halo.app.infra.ExternalUrlSupplier;
import run.halo.app.infra.SystemConfigurableEnvironmentFetcher;
import run.halo.app.theme.finders.vo.SiteSettingVo;

/**
* Tests for {@link SiteSettingVariablesAcquirer}.
*
* @author guqing
* @since 2.0.0
*/
@ExtendWith(MockitoExtension.class)
public class SiteSettingVariablesAcquirerTest {
@Mock
private ExternalUrlSupplier externalUrlSupplier;
@Mock
private SystemConfigurableEnvironmentFetcher environmentFetcher;

@InjectMocks
private SiteSettingVariablesAcquirer siteSettingVariablesAcquirer;

@Test
void acquire() throws URISyntaxException {
ConfigMap configMap = new ConfigMap();
configMap.setData(Map.of());

URI uri = new URI("https://halo.run");
when(externalUrlSupplier.get()).thenReturn(uri);
when(environmentFetcher.getConfigMap()).thenReturn(Mono.just(configMap));

siteSettingVariablesAcquirer.acquire(Mockito.mock(ServerWebExchange.class))
.as(StepVerifier::create)
.consumeNextWith(result -> {
assertThat(result).containsKey("site");
assertThat(result.get("site")).isInstanceOf(SiteSettingVo.class);
assertThat((SiteSettingVo) result.get("site"))
.extracting(SiteSettingVo::getUrl)
.isEqualTo(uri);
})
.verifyComplete();
}
}