Remove redundant users path for PAT endpoint (#4662)

#### What type of PR is this?

/kind improvement
/kind api-change
/area core

#### What this PR does / why we need it:

This PR refines route paths created from <https://github.com/halo-dev/halo/pull/4598>. Because the user scope is not necessary here.

#### Special notes for your reviewer:

Try to manage your PATs.

#### Does this PR introduce a user-facing change?

```release-note
None
```

application/src/main/java/run/halo/app/security/authentication/pat/PatEndpoint.java

@@ -26,7 +26,7 @@ public class PatEndpoint implements CustomEndpoint {
     @Override
     public RouterFunction<ServerResponse> endpoint() {
         var tag = groupVersion().toString() + "/" + PersonalAccessToken.KIND;
-        return route().nest(path("/users/-/personalaccesstokens"),
+        return route().nest(path("/personalaccesstokens"),
                 () -> route()
                     .POST(patHandler::create,
                         builder -> builder

application/src/main/java/run/halo/app/security/authentication/pat/impl/UserScopedPatHandlerImpl.java

@@ -1,6 +1,5 @@
 package run.halo.app.security.authentication.pat.impl;
 
-import static org.apache.commons.lang3.StringUtils.startsWith;
 import static run.halo.app.extension.Comparators.compareCreationTimestamp;
 import static run.halo.app.security.authentication.pat.PatServerWebExchangeMatcher.PAT_TOKEN_PREFIX;
 
@@ -12,7 +11,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
@@ -48,8 +46,6 @@ import run.halo.app.security.authorization.AuthorityUtils;
 @Service
 public class UserScopedPatHandlerImpl implements UserScopedPatHandler {
 
-    private static final String ROLE_PREFIX = AuthorityUtils.ROLE_PREFIX;
-
     private static final String ACCESS_TOKEN_ANNO_NAME = "security.halo.run/access-token";
 
     private static final NotFoundException PAT_NOT_FOUND_EX =
@@ -257,22 +253,6 @@ public class UserScopedPatHandlerImpl implements UserScopedPatHandler {
         return roleService.contains(grantedRoles, requestRoles);
     }
 
-    private static boolean containsIllegalRoles(
-        Collection<? extends GrantedAuthority> grantedAuthorities,
-        List<String> roles) {
-        if (CollectionUtils.isEmpty(roles)) {
-            return false;
-        }
-        var roleSet = roles.stream()
-            .map(role -> ROLE_PREFIX + role)
-            .collect(Collectors.toSet());
-        var grantedRoleSet = grantedAuthorities.stream()
-            .map(GrantedAuthority::getAuthority)
-            .filter(authority -> startsWith(authority, ROLE_PREFIX))
-            .collect(Collectors.toSet());
-        return !grantedRoleSet.containsAll(roleSet);
-    }
-
     private Mono<PersonalAccessToken> getPat(String name, String username) {
         return client.get(PersonalAccessToken.class, name)
             .filter(pat -> Objects.equals(pat.getSpec().getUsername(), username)

application/src/main/resources/extensions/role-template-authenticated.yaml

@@ -105,11 +105,9 @@ metadata:
     halo.run/role-template: "true"
     halo.run/hidden: "true"
 rules:
-  - apiGroups: [ "api.console.security.halo.run" ]
-    resources: [ "users/personalaccesstokens" ]
-    resourceNames: [ "-" ]
+  - apiGroups: [ "api.security.halo.run" ]
+    resources: [ "personalaccesstokens" ]
     verbs: [ "*" ]
-  - apiGroups: [ "api.console.security.halo.run" ]
-    resources: [ "users/personalaccesstokens/actions" ]
-    resourceNames: [ "-" ]
+  - apiGroups: [ "api.security.halo.run" ]
+    resources: [ "personalaccesstokens/actions" ]
     verbs: [ "update" ]

application/src/test/java/run/halo/app/security/authentication/pat/PatTest.java

@@ -26,7 +26,7 @@ class PatTest {
         spec.setRoles(List.of("super-role"));
         spec.setName("Fake PAT");
         webClient.post()
-            .uri("/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens")
+            .uri("/apis/api.security.halo.run/v1alpha1/personalaccesstokens")
             .bodyValue(requestPat)
             .exchange()
             .expectStatus().isOk()

console/packages/api-client/src/.openapi-generator/FILES

@@ -14,7 +14,6 @@ api/api-console-halo-run-v1alpha1-system-api.ts
 api/api-console-halo-run-v1alpha1-theme-api.ts
 api/api-console-halo-run-v1alpha1-user-api.ts
 api/api-console-migration-halo-run-v1alpha1-migration-api.ts
-api/api-console-security-halo-run-v1alpha1-personal-access-token-api.ts
 api/api-content-halo-run-v1alpha1-category-api.ts
 api/api-content-halo-run-v1alpha1-post-api.ts
 api/api-content-halo-run-v1alpha1-single-page-api.ts
@@ -26,6 +25,7 @@ api/api-halo-run-v1alpha1-stats-api.ts
 api/api-halo-run-v1alpha1-tracker-api.ts
 api/api-halo-run-v1alpha1-user-api.ts
 api/api-plugin-halo-run-v1alpha1-plugin-api.ts
+api/api-security-halo-run-v1alpha1-personal-access-token-api.ts
 api/auth-halo-run-v1alpha1-auth-provider-api.ts
 api/auth-halo-run-v1alpha1-user-connection-api.ts
 api/content-halo-run-v1alpha1-category-api.ts

console/packages/api-client/src/api.ts

@@ -25,7 +25,6 @@ export * from "./api/api-console-halo-run-v1alpha1-system-api";
 export * from "./api/api-console-halo-run-v1alpha1-theme-api";
 export * from "./api/api-console-halo-run-v1alpha1-user-api";
 export * from "./api/api-console-migration-halo-run-v1alpha1-migration-api";
-export * from "./api/api-console-security-halo-run-v1alpha1-personal-access-token-api";
 export * from "./api/api-content-halo-run-v1alpha1-category-api";
 export * from "./api/api-content-halo-run-v1alpha1-post-api";
 export * from "./api/api-content-halo-run-v1alpha1-single-page-api";
@@ -37,6 +36,7 @@ export * from "./api/api-halo-run-v1alpha1-stats-api";
 export * from "./api/api-halo-run-v1alpha1-tracker-api";
 export * from "./api/api-halo-run-v1alpha1-user-api";
 export * from "./api/api-plugin-halo-run-v1alpha1-plugin-api";
+export * from "./api/api-security-halo-run-v1alpha1-personal-access-token-api";
 export * from "./api/auth-halo-run-v1alpha1-auth-provider-api";
 export * from "./api/auth-halo-run-v1alpha1-user-connection-api";
 export * from "./api/content-halo-run-v1alpha1-category-api";

console/packages/api-client/src/api/api-security-halo-run-v1alpha1-personal-access-token-api.ts

@@ -40,10 +40,10 @@ import {
 // @ts-ignore
 import { PersonalAccessToken } from "../models";
 /**
- * ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi - axios parameter creator
+ * ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi - axios parameter creator
  * @export
  */
-export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCreator =
+export const ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCreator =
   function (configuration?: Configuration) {
     return {
       /**
@@ -59,7 +59,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
         // verify required parameter 'name' is not null or undefined
         assertParamExists("deletePat", "name", name);
         const localVarPath =
-          `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens/{name}`.replace(
+          `/apis/api.security.halo.run/v1alpha1/personalaccesstokens/{name}`.replace(
             `{${"name"}}`,
             encodeURIComponent(String(name))
           );
@@ -116,7 +116,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
           "personalAccessToken",
           personalAccessToken
         );
-        const localVarPath = `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens`;
+        const localVarPath = `/apis/api.security.halo.run/v1alpha1/personalaccesstokens`;
         // use dummy base URL string because the URL constructor only accepts absolute URLs.
         const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
         let baseOptions;
@@ -174,7 +174,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
         // verify required parameter 'name' is not null or undefined
         assertParamExists("obtainPat", "name", name);
         const localVarPath =
-          `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens/{name}`.replace(
+          `/apis/api.security.halo.run/v1alpha1/personalaccesstokens/{name}`.replace(
             `{${"name"}}`,
             encodeURIComponent(String(name))
           );
@@ -223,7 +223,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
       obtainPats: async (
         options: AxiosRequestConfig = {}
       ): Promise<RequestArgs> => {
-        const localVarPath = `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens`;
+        const localVarPath = `/apis/api.security.halo.run/v1alpha1/personalaccesstokens`;
         // use dummy base URL string because the URL constructor only accepts absolute URLs.
         const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
         let baseOptions;
@@ -274,7 +274,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
         // verify required parameter 'name' is not null or undefined
         assertParamExists("restorePat", "name", name);
         const localVarPath =
-          `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens/{name}/actions/restoration`.replace(
+          `/apis/api.security.halo.run/v1alpha1/personalaccesstokens/{name}/actions/restoration`.replace(
             `{${"name"}}`,
             encodeURIComponent(String(name))
           );
@@ -328,7 +328,7 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
         // verify required parameter 'name' is not null or undefined
         assertParamExists("revokePat", "name", name);
         const localVarPath =
-          `/apis/api.security.halo.run/v1alpha1/users/-/personalaccesstokens/{name}/actions/revocation`.replace(
+          `/apis/api.security.halo.run/v1alpha1/personalaccesstokens/{name}/actions/revocation`.replace(
             `{${"name"}}`,
             encodeURIComponent(String(name))
           );
@@ -373,181 +373,182 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCr
   };
 
 /**
- * ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi - functional programming interface
+ * ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi - functional programming interface
  * @export
  */
-export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp =
-  function (configuration?: Configuration) {
-    const localVarAxiosParamCreator =
-      ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCreator(
+export const ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp = function (
+  configuration?: Configuration
+) {
+  const localVarAxiosParamCreator =
+    ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiAxiosParamCreator(
+      configuration
+    );
+  return {
+    /**
+     * Delete a PAT
+     * @param {string} name
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async deletePat(
+      name: string,
+      options?: AxiosRequestConfig
+    ): Promise<
+      (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.deletePat(
+        name,
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
         configuration
       );
-    return {
-      /**
-       * Delete a PAT
-       * @param {string} name
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async deletePat(
-        name: string,
-        options?: AxiosRequestConfig
-      ): Promise<
-        (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.deletePat(
-          name,
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-      /**
-       * Generate a PAT.
-       * @param {PersonalAccessToken} personalAccessToken
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async generatePat(
-        personalAccessToken: PersonalAccessToken,
-        options?: AxiosRequestConfig
-      ): Promise<
-        (
-          axios?: AxiosInstance,
-          basePath?: string
-        ) => AxiosPromise<PersonalAccessToken>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.generatePat(
-          personalAccessToken,
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-      /**
-       * Obtain a PAT.
-       * @param {string} name
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async obtainPat(
-        name: string,
-        options?: AxiosRequestConfig
-      ): Promise<
-        (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.obtainPat(
-          name,
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-      /**
-       * Obtain PAT list.
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async obtainPats(
-        options?: AxiosRequestConfig
-      ): Promise<
-        (
-          axios?: AxiosInstance,
-          basePath?: string
-        ) => AxiosPromise<Array<PersonalAccessToken>>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.obtainPats(
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-      /**
-       * Restore a PAT.
-       * @param {string} name
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async restorePat(
-        name: string,
-        options?: AxiosRequestConfig
-      ): Promise<
-        (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.restorePat(
-          name,
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-      /**
-       * Revoke a PAT
-       * @param {string} name
-       * @param {*} [options] Override http request option.
-       * @throws {RequiredError}
-       */
-      async revokePat(
-        name: string,
-        options?: AxiosRequestConfig
-      ): Promise<
-        (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
-      > {
-        const localVarAxiosArgs = await localVarAxiosParamCreator.revokePat(
-          name,
-          options
-        );
-        return createRequestFunction(
-          localVarAxiosArgs,
-          globalAxios,
-          BASE_PATH,
-          configuration
-        );
-      },
-    };
+    },
+    /**
+     * Generate a PAT.
+     * @param {PersonalAccessToken} personalAccessToken
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async generatePat(
+      personalAccessToken: PersonalAccessToken,
+      options?: AxiosRequestConfig
+    ): Promise<
+      (
+        axios?: AxiosInstance,
+        basePath?: string
+      ) => AxiosPromise<PersonalAccessToken>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.generatePat(
+        personalAccessToken,
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
+        configuration
+      );
+    },
+    /**
+     * Obtain a PAT.
+     * @param {string} name
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async obtainPat(
+      name: string,
+      options?: AxiosRequestConfig
+    ): Promise<
+      (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.obtainPat(
+        name,
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
+        configuration
+      );
+    },
+    /**
+     * Obtain PAT list.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async obtainPats(
+      options?: AxiosRequestConfig
+    ): Promise<
+      (
+        axios?: AxiosInstance,
+        basePath?: string
+      ) => AxiosPromise<Array<PersonalAccessToken>>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.obtainPats(
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
+        configuration
+      );
+    },
+    /**
+     * Restore a PAT.
+     * @param {string} name
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async restorePat(
+      name: string,
+      options?: AxiosRequestConfig
+    ): Promise<
+      (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.restorePat(
+        name,
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
+        configuration
+      );
+    },
+    /**
+     * Revoke a PAT
+     * @param {string} name
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     */
+    async revokePat(
+      name: string,
+      options?: AxiosRequestConfig
+    ): Promise<
+      (axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>
+    > {
+      const localVarAxiosArgs = await localVarAxiosParamCreator.revokePat(
+        name,
+        options
+      );
+      return createRequestFunction(
+        localVarAxiosArgs,
+        globalAxios,
+        BASE_PATH,
+        configuration
+      );
+    },
   };
+};
 
 /**
- * ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi - factory interface
+ * ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi - factory interface
  * @export
  */
-export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
+export const ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
   function (
     configuration?: Configuration,
     basePath?: string,
     axios?: AxiosInstance
   ) {
     const localVarFp =
-      ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(configuration);
+      ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(configuration);
     return {
       /**
        * Delete a PAT
-       * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest} requestParameters Request parameters.
+       * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest} requestParameters Request parameters.
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
       deletePat(
-        requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest,
+        requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest,
         options?: AxiosRequestConfig
       ): AxiosPromise<void> {
         return localVarFp
@@ -556,12 +557,12 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
       },
       /**
        * Generate a PAT.
-       * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest} requestParameters Request parameters.
+       * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest} requestParameters Request parameters.
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
       generatePat(
-        requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest,
+        requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest,
         options?: AxiosRequestConfig
       ): AxiosPromise<PersonalAccessToken> {
         return localVarFp
@@ -570,12 +571,12 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
       },
       /**
        * Obtain a PAT.
-       * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest} requestParameters Request parameters.
+       * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest} requestParameters Request parameters.
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
       obtainPat(
-        requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest,
+        requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest,
         options?: AxiosRequestConfig
       ): AxiosPromise<void> {
         return localVarFp
@@ -596,12 +597,12 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
       },
       /**
        * Restore a PAT.
-       * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest} requestParameters Request parameters.
+       * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest} requestParameters Request parameters.
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
       restorePat(
-        requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest,
+        requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest,
         options?: AxiosRequestConfig
       ): AxiosPromise<void> {
         return localVarFp
@@ -610,12 +611,12 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
       },
       /**
        * Revoke a PAT
-       * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest} requestParameters Request parameters.
+       * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest} requestParameters Request parameters.
        * @param {*} [options] Override http request option.
        * @throws {RequiredError}
        */
       revokePat(
-        requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest,
+        requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest,
         options?: AxiosRequestConfig
       ): AxiosPromise<void> {
         return localVarFp
@@ -626,94 +627,94 @@ export const ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFactory =
   };
 
 /**
- * Request parameters for deletePat operation in ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi.
+ * Request parameters for deletePat operation in ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi.
  * @export
- * @interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest
+ * @interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest
  */
-export interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest {
+export interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest {
   /**
    *
    * @type {string}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePat
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePat
    */
   readonly name: string;
 }
 
 /**
- * Request parameters for generatePat operation in ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi.
+ * Request parameters for generatePat operation in ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi.
  * @export
- * @interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest
+ * @interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest
  */
-export interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest {
+export interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest {
   /**
    *
    * @type {PersonalAccessToken}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePat
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePat
    */
   readonly personalAccessToken: PersonalAccessToken;
 }
 
 /**
- * Request parameters for obtainPat operation in ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi.
+ * Request parameters for obtainPat operation in ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi.
  * @export
- * @interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest
+ * @interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest
  */
-export interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest {
+export interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest {
   /**
    *
    * @type {string}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPat
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPat
    */
   readonly name: string;
 }
 
 /**
- * Request parameters for restorePat operation in ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi.
+ * Request parameters for restorePat operation in ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi.
  * @export
- * @interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest
+ * @interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest
  */
-export interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest {
+export interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest {
   /**
    *
    * @type {string}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePat
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePat
    */
   readonly name: string;
 }
 
 /**
- * Request parameters for revokePat operation in ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi.
+ * Request parameters for revokePat operation in ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi.
  * @export
- * @interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest
+ * @interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest
  */
-export interface ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest {
+export interface ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest {
   /**
    *
    * @type {string}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePat
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePat
    */
   readonly name: string;
 }
 
 /**
- * ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi - object-oriented interface
+ * ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi - object-oriented interface
  * @export
- * @class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+ * @class ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
  * @extends {BaseAPI}
  */
-export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends BaseAPI {
+export class ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi extends BaseAPI {
   /**
    * Delete a PAT
-   * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest} requestParameters Request parameters.
+   * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest} requestParameters Request parameters.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public deletePat(
-    requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest,
+    requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiDeletePatRequest,
     options?: AxiosRequestConfig
   ) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .deletePat(requestParameters.name, options)
@@ -722,16 +723,16 @@ export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends Bas
 
   /**
    * Generate a PAT.
-   * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest} requestParameters Request parameters.
+   * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest} requestParameters Request parameters.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public generatePat(
-    requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest,
+    requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiGeneratePatRequest,
     options?: AxiosRequestConfig
   ) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .generatePat(requestParameters.personalAccessToken, options)
@@ -740,16 +741,16 @@ export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends Bas
 
   /**
    * Obtain a PAT.
-   * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest} requestParameters Request parameters.
+   * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest} requestParameters Request parameters.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public obtainPat(
-    requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest,
+    requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiObtainPatRequest,
     options?: AxiosRequestConfig
   ) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .obtainPat(requestParameters.name, options)
@@ -760,10 +761,10 @@ export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends Bas
    * Obtain PAT list.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public obtainPats(options?: AxiosRequestConfig) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .obtainPats(options)
@@ -772,16 +773,16 @@ export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends Bas
 
   /**
    * Restore a PAT.
-   * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest} requestParameters Request parameters.
+   * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest} requestParameters Request parameters.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public restorePat(
-    requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest,
+    requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRestorePatRequest,
     options?: AxiosRequestConfig
   ) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .restorePat(requestParameters.name, options)
@@ -790,16 +791,16 @@ export class ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi extends Bas
 
   /**
    * Revoke a PAT
-   * @param {ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest} requestParameters Request parameters.
+   * @param {ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest} requestParameters Request parameters.
    * @param {*} [options] Override http request option.
    * @throws {RequiredError}
-   * @memberof ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi
+   * @memberof ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi
    */
   public revokePat(
-    requestParameters: ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest,
+    requestParameters: ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiRevokePatRequest,
     options?: AxiosRequestConfig
   ) {
-    return ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
+    return ApiSecurityHaloRunV1alpha1PersonalAccessTokenApiFp(
       this.configuration
     )
       .revokePat(requestParameters.name, options)

console/src/utils/api-client.ts

@@ -40,7 +40,7 @@ import {
   ApiHaloRunV1alpha1UserApi,
   MigrationHaloRunV1alpha1BackupApi,
   ApiConsoleMigrationHaloRunV1alpha1MigrationApi,
-  ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi,
+  ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi,
   SecurityHaloRunV1alpha1PersonalAccessTokenApi,
 } from "@halo-dev/api-client";
 import type { AxiosError, AxiosInstance } from "axios";
@@ -221,7 +221,7 @@ function setupApiClient(axios: AxiosInstance) {
       axios
     ),
     system: new ApiConsoleHaloRunV1alpha1SystemApi(undefined, baseURL, axios),
-    pat: new ApiConsoleSecurityHaloRunV1alpha1PersonalAccessTokenApi(
+    pat: new ApiSecurityHaloRunV1alpha1PersonalAccessTokenApi(
       undefined,
       baseURL,
       axios