From bda150221003b75c245a7f926dafee0132df5a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Tue, 17 Aug 2021 15:11:31 +0200
Subject: [PATCH] prosody: simplify code

We no longer need to use token based auth (but allow empty tokens) when
WebSockets are used.
---
 .../rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
index f3b23f6..0bb0f5c 100644
--- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
+++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua
@@ -80,7 +80,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
     authentication = "{{ $JWT_AUTH_TYPE }}"
     app_id = "{{ .Env.JWT_APP_ID }}"
     app_secret = "{{ .Env.JWT_APP_SECRET }}"
-    allow_empty_token = {{ if $JWT_ALLOW_EMPTY }}true{{ else }}false{{ end }}
+    allow_empty_token = {{ $JWT_ALLOW_EMPTY }}
     {{ if $JWT_ASAP_KEYSERVER }}
     asap_key_server = "{{ .Env.JWT_ASAP_KEYSERVER }}"
     {{ end }}
@@ -93,15 +93,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
     authentication = "internal_hashed"
   {{ end }}
 {{ else }}
-    -- https://github.com/jitsi/docker-jitsi-meet/pull/502#issuecomment-619146339
-    {{ if $ENABLE_XMPP_WEBSOCKET }}
-    authentication = "token"
-    {{ else }}
-    authentication = "anonymous"
-    {{ end }}
-    app_id = ""
-    app_secret = ""
-    allow_empty_token = true
+    authentication = "jitsi-anonymous"
 {{ end }}
     ssl = {
         key = "/config/certs/{{ .Env.XMPP_DOMAIN }}.key";
@@ -153,15 +145,7 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
 
 {{ if $ENABLE_GUEST_DOMAIN }}
 VirtualHost "{{ .Env.XMPP_GUEST_DOMAIN }}"
-    -- https://github.com/jitsi/docker-jitsi-meet/pull/502#issuecomment-619146339
-    {{ if $ENABLE_XMPP_WEBSOCKET }}
-    authentication = "token"
-    {{ else }}
-    authentication = "anonymous"
-    {{ end }}
-    app_id = ""
-    app_secret = ""
-    allow_empty_token = true
+    authentication = "jitsi-anonymous"
 
     c2s_require_encryption = false
 {{ end }}