[type:feat]Auth adapts to namespace transformation (#5667)

* auth

* reset

* fix cr

* fix

---------

Co-authored-by: ‘xcsnx’ <‘[email protected]’>

Author: xcsnx

db/init/mysql/schema.sql

@@ -2375,4 +2375,6 @@ ALTER TABLE `shenyu`.`selector` ADD COLUMN `namespace_id` varchar(50) NULL COMME
 
 ALTER TABLE `shenyu`.`rule` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId' AFTER `match_restful`;
 
-ALTER TABLE `shenyu`.`meta_data` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId';
+ALTER TABLE `shenyu`.`meta_data` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId';
+
+ALTER TABLE `shenyu`.`app_auth` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId' AFTER `enabled`;

db/init/ob/schema.sql

@@ -2375,4 +2375,6 @@ ALTER TABLE `shenyu`.`selector` ADD COLUMN `namespace_id` varchar(50) NULL COMME
 
 ALTER TABLE `shenyu`.`rule` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId' AFTER `match_restful`;
 
-ALTER TABLE `shenyu`.`meta_data` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId';
+ALTER TABLE `shenyu`.`meta_data` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId';
+
+ALTER TABLE `shenyu`.`app_auth` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId' AFTER `enabled`;

db/init/og/create-table.sql

@@ -2681,4 +2681,7 @@ ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NULL;
 COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespaceId';
 
 ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NULL;
-COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
+COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
+
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NULL;
+COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';

db/init/oracle/schema.sql

@@ -2866,4 +2866,7 @@ ALTER TABLE rule ADD namespace_id VARCHAR2(50) NULL;
 COMMENT ON COLUMN rule.namespace_id IS 'namespaceId';
 
 ALTER TABLE meta_data ADD namespace_id VARCHAR2(50) NULL;
-COMMENT ON COLUMN meta_data.namespace_id IS 'namespaceId';
+COMMENT ON COLUMN meta_data.namespace_id IS 'namespaceId';
+
+ALTER TABLE app_auth ADD namespace_id VARCHAR2(50) NULL;
+COMMENT ON COLUMN app_auth.namespace_id IS 'namespaceId';

db/init/pg/create-table.sql

@@ -2798,4 +2798,7 @@ ALTER TABLE "public"."rule" ADD COLUMN namespace_id VARCHAR(50) NULL;
 COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespaceId';
 
 ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NULL;
-COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
+COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
+
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NULL;
+COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';

db/upgrade/2.6.1-upgrade-2.7.0-mysql.sql

@@ -189,3 +189,8 @@ UPDATE meta_data
 SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
 WHERE namespace_id IS NULL;
 
+ALTER TABLE `shenyu`.`app_auth` ADD COLUMN `namespace_id` varchar(50) NULL COMMENT 'namespaceId' AFTER `enabled`;
+
+UPDATE app_auth
+SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
+WHERE namespace_id IS NULL;

db/upgrade/2.6.1-upgrade-2.7.0-og.sql

@@ -206,4 +206,10 @@ UPDATE "public"."rule" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
 ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NULL;
 COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
 
-UPDATE "public"."meta_data" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+UPDATE "public"."meta_data" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NULL;
+COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';
+
+UPDATE "public"."app_auth" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+

db/upgrade/2.6.1-upgrade-2.7.0-oracle.sql

@@ -232,4 +232,9 @@ UPDATE rule SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE name
 ALTER TABLE meta_data ADD namespace_id VARCHAR2(50) NULL;
 COMMENT ON COLUMN meta_data.namespace_id IS 'namespaceId';
 
-UPDATE meta_data SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+UPDATE meta_data SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+
+ALTER TABLE app_auth ADD namespace_id VARCHAR2(50) NULL;
+COMMENT ON COLUMN app_auth.namespace_id IS 'namespaceId';
+
+UPDATE app_auth SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;

db/upgrade/2.6.1-upgrade-2.7.0-pg.sql

@@ -207,4 +207,10 @@ UPDATE "public"."rule" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385'
 ALTER TABLE "public"."meta_data" ADD COLUMN namespace_id VARCHAR(50) NULL;
 COMMENT ON COLUMN "public"."meta_data"."namespace_id" IS 'namespaceId';
 
-UPDATE "public"."meta_data" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+UPDATE "public"."meta_data" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+
+ALTER TABLE "public"."app_auth" ADD COLUMN namespace_id VARCHAR(50) NULL;
+COMMENT ON COLUMN "public"."app_auth"."namespace_id" IS 'namespaceId';
+
+UPDATE "public"."app_auth" SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' WHERE namespace_id IS NULL;
+

shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/AppAuthController.java

@@ -21,6 +21,7 @@
 import org.apache.shenyu.admin.aspect.annotation.RestApi;
 import org.apache.shenyu.admin.mapper.AppAuthMapper;
 import org.apache.shenyu.admin.mapper.AuthPathMapper;
+import org.apache.shenyu.admin.mapper.NamespaceMapper;
 import org.apache.shenyu.admin.model.dto.AppAuthDTO;
 import org.apache.shenyu.admin.model.dto.AuthApplyDTO;
 import org.apache.shenyu.admin.model.dto.AuthPathWarpDTO;
@@ -96,17 +97,21 @@ public ShenyuAdminResult updateSk(@RequestParam("appKey")
      * @param phone       specific phone
      * @param currentPage current page of list
      * @param pageSize    page size of query
+     * @param namespaceId namespaceId
      * @return the shenyu result
      */
     @GetMapping("/findPageByQuery")
     @RequiresPermissions("system:authen:list")
     public ShenyuAdminResult findPageByQuery(final String appKey, final String phone,
                                              @RequestParam @NotNull(message = "currentPage not null") final Integer currentPage,
-                                             @RequestParam @NotNull(message = "pageSize not null") final Integer pageSize) {
+                                             @RequestParam @NotNull(message = "pageSize not null") final Integer pageSize,
+                                             @Valid @Existed(message = "namespaceId is not existed",
+                                                     provider = NamespaceMapper.class) final String namespaceId) {
         AppAuthQuery query = new AppAuthQuery();
         query.setPhone(phone);
         query.setAppKey(appKey);
         query.setPageParameter(new PageParameter(currentPage, pageSize));
+        query.setNamespaceId(namespaceId);
         CommonPager<AppAuthVO> commonPager = appAuthService.listByPage(query);
         return ShenyuAdminResult.success(ShenyuResultMessage.QUERY_SUCCESS, commonPager);
     }