From 38d7933409931af374aca392d399c975e041b848 Mon Sep 17 00:00:00 2001
From: Jannik Stehle <jannik.stehle@kiteworks.com>
Date: Fri, 16 Aug 2024 15:56:28 +0200
Subject: [PATCH] feat: enable app-store web app per default

---
 deployments/examples/ocis_full/config/ocis/csp.yaml     | 2 ++
 deployments/examples/ocis_keycloak/config/ocis/csp.yaml | 2 ++
 services/proxy/pkg/config/csp.yaml                      | 2 ++
 services/web/pkg/config/defaults/defaultconfig.go       | 2 +-
 tests/config/drone/ocis-config.json                     | 3 ++-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/deployments/examples/ocis_full/config/ocis/csp.yaml b/deployments/examples/ocis_full/config/ocis/csp.yaml
index ffb8bcdeca..d8615b85a6 100644
--- a/deployments/examples/ocis_full/config/ocis/csp.yaml
+++ b/deployments/examples/ocis_full/config/ocis/csp.yaml
@@ -5,6 +5,7 @@ directives:
     - '''self'''
     - 'https://${COMPANION_DOMAIN|companion.owncloud.test}/'
     - 'wss://${COMPANION_DOMAIN|companion.owncloud.test}/'
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
   default-src:
     - '''none'''
   font-src:
@@ -22,6 +23,7 @@ directives:
     - '''self'''
     - 'data:'
     - 'blob:'
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
     # In contrary to bash and docker the default is given after the | character
     - 'https://${ONLYOFFICE_DOMAIN|onlyoffice.owncloud.test}/'
     - 'https://${COLLABORA_DOMAIN|collabora.owncloud.test}/'
diff --git a/deployments/examples/ocis_keycloak/config/ocis/csp.yaml b/deployments/examples/ocis_keycloak/config/ocis/csp.yaml
index ac417f923e..2ba7ee2445 100644
--- a/deployments/examples/ocis_keycloak/config/ocis/csp.yaml
+++ b/deployments/examples/ocis_keycloak/config/ocis/csp.yaml
@@ -3,6 +3,7 @@ directives:
     - '''self'''
   connect-src:
     - '''self'''
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
     # In contrary to bash and docker the default is given after the | character
     - 'https://${KEYCLOAK_DOMAIN|keycloak.owncloud.test}/'
   default-src:
@@ -19,6 +20,7 @@ directives:
     - '''self'''
     - 'data:'
     - 'blob:'
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
   manifest-src:
     - '''self'''
   media-src:
diff --git a/services/proxy/pkg/config/csp.yaml b/services/proxy/pkg/config/csp.yaml
index 6eab1f860d..58cd0645fe 100644
--- a/services/proxy/pkg/config/csp.yaml
+++ b/services/proxy/pkg/config/csp.yaml
@@ -3,6 +3,7 @@ directives:
     - '''self'''
   connect-src:
     - '''self'''
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
   default-src:
     - '''none'''
   font-src:
@@ -17,6 +18,7 @@ directives:
     - '''self'''
     - 'data:'
     - 'blob:'
+    - 'https://raw.githubusercontent.com/owncloud/awesome-ocis/'
   manifest-src:
     - '''self'''
   media-src:
diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go
index f442df70a4..b2eb2b28a4 100644
--- a/services/web/pkg/config/defaults/defaultconfig.go
+++ b/services/web/pkg/config/defaults/defaultconfig.go
@@ -98,7 +98,7 @@ func DefaultConfig() *config.Config {
 					ResponseType: "code",
 					Scope:        "openid profile email",
 				},
-				Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "preview"},
+				Apps: []string{"files", "search", "text-editor", "pdf-viewer", "external", "admin-settings", "epub-reader", "preview", "app-store"},
 				Options: config.Options{
 					ContextHelpersReadMore: true,
 					AccountEditLink:        &config.AccountEditLink{},
diff --git a/tests/config/drone/ocis-config.json b/tests/config/drone/ocis-config.json
index 7749116ff5..cc6ac0483e 100644
--- a/tests/config/drone/ocis-config.json
+++ b/tests/config/drone/ocis-config.json
@@ -24,6 +24,7 @@
     "preview",
     "pdf-viewer",
     "search",
-    "admin-settings"
+    "admin-settings",
+    "app-store"
   ]
 }