N21-1298 tool context restrictions (#235)

hpi-schul-cloud · Dec 1, 2023 · ee5d896 · ee5d896
1 parent 439bec3
commit ee5d896
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 42 deletions.
diff --git a/controllers/ctltools.js b/controllers/ctltools.js
@@ -27,6 +27,7 @@ const sanitizeToolInputs = (id, body) => {
     body.openNewTab = !!body.openNewTab;
     body.isHidden = !!body.isHidden;
     body.config.baseUrl = body.config.baseUrl || undefined;
+    body.restrictToContexts = [].concat(body.restrictToContexts || []);
 
     switch (body.config.type) {
         case 'oauth2':
@@ -217,15 +218,20 @@ const showTools = (req, res) => {
         }
     }
 
-    api(req, { version: 'v3' }).get('/tools/external-tools', {
-        qs: {
-            name: req.query.q,
-            limit: itemsPerPage,
-            skip: itemsPerPage * (currentPage - 1),
-            sortOrder,
-            sortBy,
-        },
-    }).then((tools) => {
+    Promise.all([
+        api(req, {version: 'v3'}).get('/tools/context-types'),
+        api(req, {version: 'v3'}).get('/tools/external-tools', {
+            qs: {
+                name: req.query.q,
+                limit: itemsPerPage,
+                skip: itemsPerPage * (currentPage - 1),
+                sortOrder,
+                sortBy,
+            },
+        })
+    ]).then(([contextTypes, tools]) => {
+        const toolContextTypes = contextTypes.data;
+
         const body = tools.data.map(item => {
             return [
                 item.id || "",
@@ -265,40 +271,11 @@ const showTools = (req, res) => {
             toolTypes,
             customParameterTypes,
             customParameterScopes,
-            customParameterLocations
-        });
-    }).catch(() => {
-        res.render('ctltools/ctltools', {
-            title: 'Tools',
-            head,
-            body: [],
-            user: res.locals.currentUser,
-            limit: true,
-            themeTitle: process.env.SC_NAV_TITLE || 'Schul-Cloud',
-            messageTypes,
-            privacies,
-            authMethods,
-            toolTypes,
-            customParameterTypes,
-            customParameterScopes,
-            customParameterLocations
-        });
-    }).catch(() => {
-        res.render('ctltools/ctltools', {
-            title: 'Tools',
-            head,
-            body: [],
-            user: res.locals.currentUser,
-            limit: true,
-            themeTitle: process.env.SC_NAV_TITLE || 'Schul-Cloud',
-            messageTypes,
-            privacies,
-            authMethods,
-            toolTypes,
-            customParameterTypes,
-            customParameterScopes,
-            customParameterLocations
+            customParameterLocations,
+            toolContextTypes
         });
+    }).catch(err => {
+        next(err);
     });
 };
 

diff --git a/views/ctltools/forms/add-ctl-tool.hbs b/views/ctltools/forms/add-ctl-tool.hbs
@@ -29,6 +29,14 @@
         Ja, es soll es ausgeblendet werden
     </label>
 </div>
+<div class="form-group">
+    <label class="control-label" for="restrictToContexts">Nutzung des Tools auf folgende Kontexte beschränken:</label>
+    <select id="restrictToContexts" name="restrictToContexts" multiple>
+        {{#each toolContextTypes}}
+            <option value="{{this}}">{{this}}</option>
+        {{/each}}
+    </select>
+</div>
 <h3>Konfiguration</h3>
 <div class="form-group">
     <label class="control-label" for="baseUrl">BaseURL *</label>