Merge pull request #877 from clojars/tobias/jar-level-permissions

clojars · Dec 8, 2023 · fab7b2e · fab7b2e
2 parents d25bdcc + e4c49cd
commit fab7b2e
Show file tree

Hide file tree

Showing 19 changed files with 1,187 additions and 457 deletions.
diff --git a/resources/public/js/permissions.js b/resources/public/js/permissions.js
@@ -0,0 +1,14 @@
+const showHideNewJarInput = () => {
+  const tb = $('#scope_to_jar_new');
+  if ($('#scope_to_jar_select option:checked').val() === ':new') {
+    tb.show();
+  } else {
+    tb.hide();
+    tb.val('');
+  }
+};
+
+$(() => {
+  $('#scope_to_jar_select').on('change', showHideNewJarInput);
+  showHideNewJarInput();
+});
diff --git a/src/clojars/auth.clj b/src/clojars/auth.clj
@@ -20,22 +20,18 @@
 (defn with-account [f]
   (friend/authenticated (try-account f)))
 
-(defn authorized-admin? [db account group]
+(defn authorized-admin? [db account group scope]
   (when account
-    (let [adminnames (db/group-adminnames db group)
+    (let [adminnames (db/group-adminnames db group scope)
           allnames (db/group-allnames db group)]
       (or (some #{account} adminnames) (empty? allnames)))))
 
-(defn authorized-member? [db account group]
-  (when account
-    (some #{account} (db/group-membernames db group))))
-
 (defn authorized-group-access? [db account group]
   (when account
     (some #{account} (db/group-allnames db group))))
 
-(defn require-admin-authorization [db account group f]
-  (if (authorized-admin? db account group)
+(defn require-admin-authorization [db account group scope f]
+  (if (authorized-admin? db account group scope)
     (f)
     (friend/throw-unauthorized friend/*identity*
                                {:cemerick.friend/required-roles group})))