girder 5.0.18.dev8__tar.gz → 5.0.18.dev18__tar.gz

{girder-5.0.18.dev8 → girder-5.0.18.dev18}/.circleci/publish_npm.sh

@@ -16,11 +16,9 @@ readonly PUBLISHED_NPM_PACKAGES=(
 )
 for directory in "${PUBLISHED_NPM_PACKAGES[@]}"; do
   pushd "$directory"
-  # Trying to set the auth token via 'npm_config_' environment variables does not work
-  echo '//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}' > ./.npmrc
   npm ci
   npm version --allow-same-version --no-git-tag-version "$GIT_VERSION"
+  export NPM_ID_TOKEN=$(circleci run oidc get --claims '{"aud": "npm:registry.npmjs.org"}')
   npm publish --access public
-  rm --interactive=never ./.npmrc
   popd
 done

{girder-5.0.18.dev8/girder.egg-info → girder-5.0.18.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.18.dev8
+Version: 5.0.18.dev18
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.18.dev8 → girder-5.0.18.dev18}/girder/api/v1/system.py

@@ -148,6 +148,7 @@ class System(Resource):
             SettingKey.BANNER_COLOR,
             SettingKey.REGISTRATION_POLICY,
             SettingKey.ENABLE_PASSWORD_LOGIN,
+            SettingKey.SHOW_DOWNLOAD,
         ]
         return {k: Setting().get(k) for k in publicSettings}
 

{girder-5.0.18.dev8 → girder-5.0.18.dev18}/girder/settings.py

@@ -28,6 +28,7 @@ class SettingKey:
     CORS_ALLOW_METHODS = 'core.cors.allow_methods'
     CORS_ALLOW_ORIGIN = 'core.cors.allow_origin'
     CORS_EXPOSE_HEADERS = 'core.cors.expose_headers'
+    SHOW_DOWNLOAD = 'core.show_download'
     EMAIL_FROM_ADDRESS = 'core.email_from_address'
     EMAIL_HOST = 'core.email_host'
     EMAIL_VERIFICATION = 'core.email_verification'
@@ -76,6 +77,7 @@ class SettingDefault:
         SettingKey.CORS_ALLOW_METHODS: 'GET, POST, PUT, HEAD, DELETE',
         SettingKey.CORS_ALLOW_ORIGIN: '',
         SettingKey.CORS_EXPOSE_HEADERS: 'Girder-Total-Count, Content-Disposition',
+        SettingKey.SHOW_DOWNLOAD: 'all',
         # An apache server using reverse proxy would also need
         #  X-Requested-With, X-Forwarded-Server, X-Forwarded-For,
         #  X-Forwarded-Host, Remote-Addr
@@ -241,6 +243,17 @@ class SettingValidator:
         if not isinstance(doc['value'], str):
             raise ValidationException('CORS exposed headers must be a string', 'value')
 
+    @staticmethod
+    @setting_utilities.validator(SettingKey.SHOW_DOWNLOAD)
+    def _validateshowDownload(doc):
+        if not isinstance(doc['value'], str):
+            raise ValidationException(
+                'Show download must be "all", "user", "admin", or "none".', 'value')
+        doc['value'] = doc['value'].lower()
+        if doc['value'] not in ('all', 'user', 'admin', 'none'):
+            raise ValidationException(
+                'Show download must be "all", "user", "admin", or "none".', 'value')
+
     @staticmethod
     @setting_utilities.validator(SettingKey.EMAIL_FROM_ADDRESS)
     def _validateEmailFromAddress(doc):