From e6f933a5311c832f5b84506ceec7fa970bcf8c6d Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Fri, 17 Sep 2021 18:51:36 +0800
Subject: [PATCH] core: move storage setting to ~/.hydro/env

---
 packages/hydrooj/package.json                       | 2 +-
 packages/hydrooj/src/service/storage.ts             | 2 +-
 packages/ui-default/package.json                    | 2 +-
 packages/ui-default/templates/partials/setting.html | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index bdae477bf..4413c0b52 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.36.2",
+    "version": "2.36.4",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/service/storage.ts b/packages/hydrooj/src/service/storage.ts
index a2c89f12c..d6a7c9ccf 100644
--- a/packages/hydrooj/src/service/storage.ts
+++ b/packages/hydrooj/src/service/storage.ts
@@ -99,7 +99,7 @@ class StorageService {
                 endPointForUser,
                 endPointForJudge,
             };
-            if (process.env.MINIO_ACCESS_KEY && process.env.MINIO_SECRET_KEY) {
+            if (process.env.MINIO_ACCESS_KEY) {
                 logger.info('Using MinIO key from environment variables');
                 this.opts.accessKey = process.env.MINIO_ACCESS_KEY;
                 this.opts.secretKey = process.env.MINIO_SECRET_KEY;
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 0d6a4b8fa..526ed2511 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.21.6",
+  "version": "4.21.7",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/partials/setting.html b/packages/ui-default/templates/partials/setting.html
index b165438de..9f7c8652f 100644
--- a/packages/ui-default/templates/partials/setting.html
+++ b/packages/ui-default/templates/partials/setting.html
@@ -8,14 +8,15 @@
   {% if not setting.flag|bitand(model.setting.FLAG_HIDDEN) %}
   {% set secret = setting.flag|bitand(model.setting.FLAG_SECRET) != 0 %}
   {% if setting.type == 'text' or setting.type == 'password' or setting.type == 'number' or setting.type == 'float' %}
+    {% set isFileConfig = (setting.name === 'file.accessKey' or setting.name === 'file.secretKey') and process.env.MINIO_ACCESS_KEY %}
     {{ form.form_text({
           type:setting.type,
           label:setting.name,
           help_text:setting.desc,
           name:setting.key,
-          value:'' if secret else (current[setting.key]|default(setting.value)),
+          value:'' if (secret or isFileConfig) else (current[setting.key]|default(setting.value)),
           disabled:setting.disabled,
-          placeholder:_('(Not changed)') if secret else ''
+          placeholder:'Please edit in ~/.hydro/env instead' if isFileConfig else (_('(Not changed)') if secret else '')
         }) }}
   {% elif setting.type == 'select' %}
     {{ form.form_select({