add missing method to features

CondationCMS · Jun 4, 2024 · 917e988 · 917e988
1 parent 16ba72c
commit 917e988
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 21 deletions.
diff --git a/cms-api/pom.xml b/cms-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-auth/pom.xml b/cms-auth/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-auth</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-content/pom.xml b/cms-content/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-content</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-extensions/pom.xml b/cms-extensions/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-extensions</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-extensions/src/main/resources/com/github/thmarx/cms/extensions/system/features.mjs b/cms-extensions/src/main/resources/com/github/thmarx/cms/extensions/system/features.mjs
@@ -22,5 +22,8 @@ export const ThemeFeature = Java.type("com.github.thmarx.cms.api.feature.feature
 export const $features = {
 	get : (feature) => {
 		return requestContext.get(feature)
+	},
+	has : (feature) => {
+		return requestContext.has(feature)
 	}
 }
diff --git a/cms-extensions/src/test/java/com/github/thmarx/cms/extensions/ExtensionManagerTest.java b/cms-extensions/src/test/java/com/github/thmarx/cms/extensions/ExtensionManagerTest.java
@@ -24,6 +24,7 @@
 
 import com.github.thmarx.cms.api.ServerProperties;
 import com.github.thmarx.cms.api.db.DB;
+import com.github.thmarx.cms.api.feature.features.AuthFeature;
 import com.github.thmarx.cms.api.feature.features.HookSystemFeature;
 import com.github.thmarx.cms.api.hooks.HookSystem;
 import com.github.thmarx.cms.api.request.RequestContext;
@@ -80,17 +81,31 @@ public void shutdown () throws Exception {
 	}
 
 	@Test
-	public void testSomeMethod() throws IOException {
+	public void test_with_auth() throws IOException {
 
 		var requestContext = new RequestContext();
 		final HookSystem hookSystem = new HookSystem();
 		requestContext.add(HookSystemFeature.class, new HookSystemFeature(hookSystem));
+		requestContext.add(AuthFeature.class, new AuthFeature("thorsten"));
 		extensionManager.newContext(theme, requestContext);
 
 		Assertions.assertThat(hookSystem.execute("test").results())
 				.hasSize(1)
-				.containsExactly("hallo")
+				.containsExactly("Hallo thorsten")
 				;
 	}
 
+	@Test
+	public void test_without_auth() throws IOException {
+
+		var requestContext = new RequestContext();
+		final HookSystem hookSystem = new HookSystem();
+		requestContext.add(HookSystemFeature.class, new HookSystemFeature(hookSystem));
+		extensionManager.newContext(theme, requestContext);
+
+		Assertions.assertThat(hookSystem.execute("test").results())
+				.hasSize(1)
+				.containsExactly("Guten Tag")
+				;
+	}
 }
diff --git a/cms-extensions/src/test/resources/site/extensions/hook-test.js b/cms-extensions/src/test/resources/site/extensions/hook-test.js
@@ -22,9 +22,16 @@
 
 import { $hooks } from 'system/hooks.mjs';
 
+import { AuthFeature, $features } from 'system/features.mjs';
+
 $hooks.registerAction(
 	"test",
 	(context) => {
-		return 'hallo'
+
+		if ($features.has(AuthFeature)) {
+			return `Hallo ${$features.get(AuthFeature).username()}`
+		}
+
+		return 'Guten Tag'
 	}
-)
+)
diff --git a/cms-filesystem/pom.xml b/cms-filesystem/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-filesystem</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-git/pom.xml b/cms-git/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-git</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-media/pom.xml b/cms-media/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-media</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-sandbox/pom.xml b/cms-sandbox/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.github.thmarx.cms</groupId>
         <artifactId>cms-parent</artifactId>
-        <version>4.18.0</version>
+        <version>4.18.1</version>
     </parent>
     <artifactId>cms-sandbox</artifactId>
     <packaging>pom</packaging>

diff --git a/cms-server/pom.xml b/cms-server/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-server</artifactId>
 	<packaging>jar</packaging>

diff --git a/cms-template/pom.xml b/cms-template/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>cms-template</artifactId>
 	<packaging>jar</packaging>

diff --git a/distribution/build.xml b/distribution/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="distribution" default="distribution" basedir=".">
-	<property name="cms.version">4.18.0</property>
+	<property name="cms.version">4.18.1</property>
 
 	<property name="pebble.version">v1.1.0</property>
 	<property name="thymeleaf.version">v1.1.0</property>

diff --git a/modules-framework/api/pom.xml b/modules-framework/api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>modules-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules-framework/manager/pom.xml b/modules-framework/manager/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.module.framework</groupId>
 		<artifactId>module-framework</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>modules-manager</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules-framework/pom.xml b/modules-framework/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.module.framework</groupId>
 	<artifactId>module-framework</artifactId>

diff --git a/modules/example-module/pom.xml b/modules/example-module/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms.modules</groupId>
 		<artifactId>cms-modules</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<artifactId>example-module</artifactId>
 	<packaging>jar</packaging>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.github.thmarx.cms</groupId>
 		<artifactId>cms-parent</artifactId>
-		<version>4.18.0</version>
+		<version>4.18.1</version>
 	</parent>
 	<groupId>com.github.thmarx.cms.modules</groupId>
 	<artifactId>cms-modules</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.github.thmarx.cms</groupId>
 	<artifactId>cms-parent</artifactId>
-	<version>4.18.0</version>
+	<version>4.18.1</version>
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>