Merge branch 'module/wiki'

core/src/main/java/de/srsoftware/umbrella/core/Constants.java

@@ -101,6 +101,7 @@ public class Constants {
 	public static final String FULLTEXT = "fulltext";
 
 	public static final String GET	          = "GET";
+	public static final String GUEST_ALLOWED = "guest_allowed";
 
 	public static final String HASH = "hash";
 

core/src/main/java/de/srsoftware/umbrella/core/model/Member.java

@@ -5,12 +5,17 @@ package de.srsoftware.umbrella.core.model;
 import static de.srsoftware.umbrella.core.Constants.*;
 
 import de.srsoftware.tools.Mappable;
+
+import java.util.HashMap;
 import java.util.Map;
 
 public record Member(UmbrellaUser user, Permission permission) implements Mappable {
 	@Override
 	public Map<String, Object> toMap() {
-		return Map.of(USER,user.toMap(),PERMISSION,permission.toMap());
+		var map = new HashMap<String,Object>();
+		map.put(USER,user == null ? null : user.toMap());
+		map.put(PERMISSION,permission.toMap());
+		return map;
 	}
 
 	public boolean mayWrite() {

core/src/main/java/de/srsoftware/umbrella/core/model/WikiPage.java

@@ -22,6 +22,7 @@ public class WikiPage implements Mappable {
 	private final Map<Long,Member> members = new HashMap<>();
 	private String content;
 	private Set<String> dirtyFields = new HashSet<>();
+	private boolean guestAllowed = false;
 
 	public WikiPage(long id, String title, int version, String content) {
 		this.id = id;
@@ -46,6 +47,15 @@ public class WikiPage implements Mappable {
 		return Set.copyOf(dirtyFields);
 	}
 
+	public boolean guestAllowed() {
+		return guestAllowed;
+	}
+
+	public void guestAllowed(boolean guestAllowed) {
+		this.guestAllowed = guestAllowed;
+		dirtyFields.add(GUEST_ALLOWED);
+	}
+
 	public long id(){
 		return id;
 	}
@@ -72,6 +82,10 @@ public class WikiPage implements Mappable {
 					if (!(val instanceof String s)) throw invalidFieldException(CONTENT,"String");
 					content(s);
 					break;
+				case GUEST_ALLOWED:
+					if (!(val instanceof Boolean b)) throw invalidFieldException(GUEST_ALLOWED,"Boolean");
+					guestAllowed(b);
+					break;
 				case MEMBERS:
 					if (!(val instanceof JSONObject membersJson)) throw invalidFieldException(MEMBERS,"Json");
 					for (var uid   : membersJson.keySet()){
@@ -131,6 +145,7 @@ public class WikiPage implements Mappable {
 		return Map.of(
 				ID,id,
 				CONTENT,Map.of(SOURCE,content,RENDERED,markdown(content)),
+				GUEST_ALLOWED,guestAllowed,
 				MEMBERS,memberMap,
 				TITLE,title,
 				VERSION,version,

frontend/src/App.svelte

@@ -35,6 +35,7 @@
     import ViewTask    from "./routes/task/View.svelte";
     import WikiIndex   from "./routes/wiki/Index.svelte";
     import WikiPage    from "./routes/wiki/View.svelte"
+    import WikiGuest   from "./routes/wiki/GuestView.svelte"
 
     let translations_ready = $state(false);
 
@@ -100,11 +101,12 @@
         </Router>
     {:else}
         <Router>
-        <Route path="/user/reset/pw" component={ResetPw} />
+            <Route path="/user/reset/pw"  component={ResetPw} />
-        <Route path="/oidc_callback" component={Callback} />
+            <Route path="/oidc_callback"  component={Callback} />
-        <Route>
+            <Route path="/wiki/:key/view" component={WikiGuest} />
-            <Login />
+            <Route>
-        </Route>
+                <Login />
+            </Route>
         </Router>
     {/if}
     <Footer />

frontend/src/routes/wiki/GuestView.svelte

@@ -0,0 +1,51 @@
+<script>
+    import { onMount }       from 'svelte';
+    import { useTinyRouter } from 'svelte-tiny-router';
+    import { api }           from '../../urls.svelte';
+    import { t }             from '../../translations.svelte';
+
+    let { key } = $props();
+
+
+    let error = $state(null);
+    let page = $state(null);
+    let router = useTinyRouter();
+
+    async function loadContent(res){
+        if (res.ok){
+            page  = null;
+            page  = await res.json();
+            error = null;
+            return true;
+        } else {
+            error = await res.text();
+            return false;
+        }
+    }
+
+    async function loadPage(){
+        const url = api(`wiki/page/${key}`);
+        const res = await fetch(url,{credentials:'include'});
+        loadContent(res);
+    }
+
+    function onclick(e){
+        e.preventDefault();
+        let href = e.target.getAttribute('href');
+        if (href) router.navigate(href);
+        return false;
+    }
+
+    $effect(loadPage);
+</script>
+{#if error}
+<span class="error">{error}</span>
+{/if}
+{#if page}
+<div class="wiki page">
+    <h2>{page.title}</h2>
+    <div class="markdown">
+        {@html page.content.rendered}
+    </div>
+</div>
+{/if}

frontend/src/routes/wiki/View.svelte

@@ -107,6 +107,12 @@
         return loadContent(res);
     }
 
+    async function patchGuestPermissions(ev){
+        let data = {guest_allowed:page.guest_allowed};
+        console.log(data);
+        return patch(data);
+    }
+
     async function patchTitle(t){
         var result = await(patch({title:t}));
         router.navigate(`/wiki/${page.id}/view`);
@@ -146,6 +152,10 @@
     {#if detail}
     {#if editable}
     <PermissionEditor members={page.members} {addMember} {dropMember} {getCandidates} {updatePermission} />
+    <label>
+        <input type="checkbox" bind:checked={page.guest_allowed} onchange={patchGuestPermissions} />
+        {t('visible_to_guests')}
+    </label>
     {:else}
     <table>
         <thead>

translations/src/main/resources/de.json

@@ -272,6 +272,7 @@
 
   "version": "Version",
   "version_of": "Version {version} von {element}",
+  "visible_to_guests": "Für Besucher sichtbar",
 
   "year": "Jahr",
   "your_password_reset_token" : "Ihr Token zum Erstellen eines neuen Passworts",

wiki/src/main/java/de/srsoftware/umbrella/wiki/SqliteDb.java

@@ -278,11 +278,18 @@ public class SqliteDb extends BaseDb implements WikiDb {
 			if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT)
 					.values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
 			if (page.isDirty(MEMBERS)){
-				Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.title())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
+				Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.id())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
 				var query = replaceInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS);
 				for (var member : page.members().entrySet()) query.values(page.id(),member.getKey(),wikiPermissionCode(member.getValue().permission()));
 				query.execute(db).close();
 			}
+			if (page.isDirty(GUEST_ALLOWED)){
+				if (page.guestAllowed()) {
+					insertInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS).values(page.id(),0, wikiPermissionCode(READ_ONLY)).execute(db).close();
+				} else {
+					Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID,equal(page.id())).where(USER_ID,equal(0)).execute(db);
+				}
+			}
 			return page;
 		} catch (SQLException e) {
 			throw databaseException("Failed to write wiki page \"{0}\" to database",page.title(),e);

wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java

@@ -9,6 +9,7 @@ import static de.srsoftware.umbrella.core.Paths.*;
 import static de.srsoftware.umbrella.core.Util.mapValues;
 import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
 import static de.srsoftware.umbrella.core.model.Permission.EDIT;
+import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
 import static de.srsoftware.umbrella.wiki.Constants.*;
 
 import com.sun.net.httpserver.HttpExchange;
@@ -70,11 +71,16 @@ public class WikiModule extends BaseHandler implements WikiService {
 		try {
 			Optional<Token> token = SessionToken.from(ex).map(Token::of);
 			var user = userService().loadUser(token);
-			if (user.isEmpty()) return unauthorized(ex);
 			var head = path.pop();
+			if (user.isEmpty()) {
+				return switch (head){
+					case PAGE -> getPage(path, null, ex);
+					case null, default -> unauthorized(ex);
+				};
+			}
 			return switch (head) {
 				case null -> getUserPages(user.get(),ex);
-		                case AVAILABLE -> getAvailability(path,ex);
+				case AVAILABLE -> getAvailability(path,ex);
 				case PAGE -> getPage(path, user.get(), ex);
 				default -> super.doGet(path,ex);
 			};
@@ -143,6 +149,7 @@ public class WikiModule extends BaseHandler implements WikiService {
 			}
 		}
 		var page = loadPage(id,version);
+		if (page.guestAllowed()) return sendContent(ex,page);
 		var permission = page.members().get(user.id());
 		if (permission == null) throw forbidden("You are not allowed to access \"{0}\"!",id);
 		return sendContent(ex, page);
@@ -160,6 +167,10 @@ public class WikiModule extends BaseHandler implements WikiService {
 		for (var entry : members.entrySet()){
 			var userId = entry.getKey();
 			var permission = entry.getValue();
+			if (userId == 0){
+				if (permission == READ_ONLY) page.guestAllowed(true);
+				continue;
+			}
 			var user = users.get(userId);
 			pageMembers.put(userId,new Member(user,permission));
 		}