Oembed defaults had readonly set

cjmalloy · Jul 15, 2023 · 627cb7c · 627cb7c
1 parent 578970a
commit 627cb7c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/jasper/component/Ingest.java b/src/main/java/jasper/component/Ingest.java
@@ -15,6 +15,7 @@
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
+import java.util.List;
 
 @Component
 public class Ingest {
@@ -56,11 +57,11 @@ public void update(Ref ref, boolean force) {
 	}
 
 	@Timed(value = "jasper.ref", histogram = true)
-	public void push(Ref ref) {
+	public void push(Ref ref, List<String> metadataPlugins) {
 		var maybeExisting = refRepository.findOneByUrlAndOrigin(ref.getUrl(), ref.getOrigin());
 		ref.addHierarchicalTags();
 		validate.ref(ref, true);
-		meta.update(ref, maybeExisting.orElse(null), null);
+		meta.update(ref, maybeExisting.orElse(null), metadataPlugins);
 		refRepository.save(ref);
 	}
 

diff --git a/src/main/java/jasper/component/OembedProviders.java b/src/main/java/jasper/component/OembedProviders.java
@@ -6,6 +6,7 @@
 import jasper.config.Props;
 import jasper.domain.Ref;
 import jasper.plugin.Oembed;
+import jasper.repository.PluginRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,9 @@ public class OembedProviders {
 	@Autowired
 	Ingest ingest;
 
+	@Autowired
+	PluginRepository pluginRepository;
+
 	@Value("classpath:providers.json")
 	Resource defaultProviders;
 
@@ -38,7 +42,8 @@ public void defaults(String origin) throws IOException {
 	}
 
 	public void create(String origin, List<Oembed> providers) {
-		logger.info("Restoring default oEmbed providers...");
+		logger.info("Restoring default oEmbed providers... (\"{}\")", origin);
+		var metadataPlugins = pluginRepository.findAllByGenerateMetadataByOrigin(origin);
 		for (var p : providers) {
 			var ref = new Ref();
 			ref.setUrl(p.getProvider_url());
@@ -48,7 +53,7 @@ public void create(String origin, List<Oembed> providers) {
 			plugins.set("+plugin/oembed", objectMapper.convertValue(p, JsonNode.class));
 			ref.setPlugins(plugins);
 			ref.setOrigin(origin);
-			ingest.push(ref);
+			ingest.push(ref, metadataPlugins);
 		}
 		logger.info("Done restoring default oEmbed providers.");
 	}

diff --git a/src/main/java/jasper/service/OembedService.java b/src/main/java/jasper/service/OembedService.java
@@ -24,7 +24,6 @@
 import java.util.regex.Pattern;
 
 @Service
-@Transactional(readOnly = true)
 public class OembedService {
 	private static final Logger logger = LoggerFactory.getLogger(OembedService.class);
 
@@ -47,6 +46,7 @@ public class OembedService {
 	ObjectMapper objectMapper;
 
 	@Cacheable("oembed")
+	@Transactional(readOnly = true)
 	@PreAuthorize("hasRole('VIEWER')")
 	@Timed(value = "jasper.service", extraTags = {"service", "oembed"}, histogram = true)
 	public JsonNode get(Map<String, String> params) {
@@ -67,6 +67,7 @@ public void restoreDefaults() throws IOException {
 	}
 
 	@Cacheable("oembed-provider")
+	@Transactional(readOnly = true)
 	@PreAuthorize("hasRole('VIEWER')")
 	@Timed(value = "jasper.service", extraTags = {"service", "oembed"}, histogram = true)
 	public Oembed.Endpoints getProvider(String origin, String url) {

diff --git a/src/main/java/jasper/service/RefService.java b/src/main/java/jasper/service/RefService.java
@@ -80,7 +80,7 @@ public void push(Ref ref) {
 		if (ref.getSources() != null && ref.getSources().size() > props.getMaxSources()) {
 			logger.warn("Ignoring max count for push. Max count is set to {}. Ref contains {} sources.", props.getMaxSources(), ref.getSources().size());
 		}
-		ingest.push(ref);
+		ingest.push(ref, null);
 	}
 
 	@Transactional(readOnly = true)