feat: adapt NON-ADMIN users

README.md

@@ -14,7 +14,12 @@ AList 存储库插件，支持创建 AList 类型的存储库
 ![](docs/img/4.png)
 根据提示填写以下信息
 ![](docs/img/5.png)
+注意：这里建议填写 `ADMIN` 用户的用户名和密码，因为部分 AList 接口只有 `ADMIN` 用户才能访问，否则将验证失败
 ![](docs/img/6.png)
+如果你确信你的配置完全正确，并且你填写的非 `ADMIN` 用户至少拥有以下权限，尽管无法完成验证，但是并不影响使用
+![](docs/img/9.png)
+![](docs/img/10.png)
+`ADMIN` 用户可以正常验证
 ![](docs/img/7.png)
 
 ## 注意事项
@@ -26,6 +31,7 @@ AList 存储库插件，支持创建 AList 类型的存储库
     client_max_body_size 0;
     ```
    ![](docs/img/8.png)
+3. 修改用户状态后需要重新验证来刷新缓存，如：修改用户密码
 ## 开发环境
 
 插件开发的详细文档请查阅：<https://docs.halo.run/developer-guide/plugin/introduction>
@@ -55,14 +61,6 @@ cd path/to/plugin-alist
 
 > 此方式需要本地安装 Docker
 
-```bash
-# macOS / Linux
-./gradlew pnpmInstall
-
-# Windows
-./gradlew.bat pnpmInstall
-```
-
 ```bash
 # macOS / Linux
 ./gradlew haloServer

build.gradle

@@ -31,7 +31,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 halo {
-    version = '2.17'
+    version = '2.18'
     superAdminUsername = 'admin'
     superAdminPassword = 'admin'
     externalUrl = 'http://localhost:8090'

gradle.properties

@@ -1 +1 @@
-version=1.0.0
+version=1.0.1

src/main/java/run/halo/alist/config/AListProperties.java

@@ -25,6 +25,10 @@ public class AListProperties {
      * AList 挂载路径.
      */
     private String path;
+    /**
+     * AList 基本路径.
+     */
+    private String basePath;
     /**
      * Secret name.
      */

src/main/java/run/halo/alist/controller/PolicyConfigValidationController.java

@@ -4,6 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +40,7 @@ public Mono<Void> validatePolicyConfig(@RequestBody AListProperties properties)
                         .get(properties.getSite())
                         .get()
                         .uri("/api/admin/storage/list")
-                        .header("Authorization", token)
+                        .header(HttpHeaders.AUTHORIZATION, token)
                         .retrieve()
                         .bodyToMono(
                             new ParameterizedTypeReference<AListResult<AListStorageListRes>>() {
@@ -56,6 +57,9 @@ public Mono<Void> validatePolicyConfig(@RequestBody AListProperties properties)
                                     .switchIfEmpty(Mono.error(new AListIllegalArgumentException(
                                         "The storage is disabled")))
                                     .then();
+                            } else if (response.getCode().equals("403")) {
+                                return Mono.error(new AListIllegalArgumentException(
+                                    "You are not an admin"));
                             }
                             return Mono.error(new AListIllegalArgumentException(
                                 "Wrong Username Or Password"));

src/main/java/run/halo/alist/endpoint/AListAttachmentHandler.java

@@ -265,12 +265,13 @@ public Mono<URI> getPermalink(Attachment attachment, Policy policy, ConfigMap co
                     return Mono.error(new AListRequestErrorException(response.getMessage()));
                 }))
             .map(response -> UriComponentsBuilder.fromHttpUrl(properties.getSite())
-                .path("/d/{path}/{name}")
+                .path("/d{path}{basePath}/{name}")
                 .queryParamIfPresent("sign",
                     Optional.ofNullable(response.getData().getSign()).filter(s -> !s.isEmpty()))
                 .buildAndExpand(
-                    UriUtils.encodePath(properties.getPath(), StandardCharsets.UTF_8),
-                    UriUtils.encodePath(response.getData().getName(), StandardCharsets.UTF_8)
+                    properties.getPath(),
+                    properties.getBasePath(),
+                    response.getData().getName()
                 )
                 .toUri());
     }

src/main/resources/extensions/policy-template-alist.yaml

@@ -28,6 +28,10 @@ spec:
               label: 挂载路径
               validation: required
               help: AList 存储中的挂载路径，必须以 / 开头，如 /aliyun
+            - $formkit: text
+              name: basePath
+              label: 基本路径
+              help: 所填用户的基本路径，可在 AList 管理 -> 用户 查看，必须以 / 开头，如 /aliyun，为 / 时留空即可
             - $formkit: secret
               name: secretName
               required: true