fix：response code

Author: rchen9

arex-storage-web-api/src/main/java/com/arextest/storage/aspect/AppAuthAspectExecutor.java

@@ -3,13 +3,13 @@
 import com.arextest.common.annotation.AppAuth;
 import com.arextest.common.context.ArexContext;
 import com.arextest.common.jwt.JWTService;
-import com.arextest.common.model.response.ResponseCode;
-import com.arextest.common.utils.ResponseUtils;
+import com.arextest.common.utils.ResponseUtils_New;
 import com.arextest.config.model.dao.config.SystemConfigurationCollection.KeySummary;
 import com.arextest.config.model.dto.application.ApplicationConfiguration;
 import com.arextest.config.model.dto.system.SystemConfiguration;
 import com.arextest.config.repository.impl.ApplicationConfigurationRepositoryImpl;
 import com.arextest.config.repository.impl.SystemConfigurationRepositoryImpl;
+import com.arextest.storage.model.ArexStorageResponseCode;
 import com.arextest.storage.service.config.ApplicationService;
 import java.util.List;
 import java.util.Optional;
@@ -61,18 +61,12 @@ public Object doAround(ProceedingJoinPoint point, AppAuth auth) throws Throwable
       // do aspect by appId
       if (context.getAppId() == null) {
         LOGGER.error("header has no appId");
-        return reject(point, auth, NO_APPID);
+        return reject(point, auth, NO_APPID, ArexStorageResponseCode.APP_AUTH_NO_APP_ID);
       }
 
       // do aspect by owner exist
       OwnerExistResult ownerExistResult = getOwnerExistResult();
-      if (ownerExistResult.getExist()) {
-        context.setPassAuth(true);
-        return point.proceed();
-      } else {
-        context.setPassAuth(false);
-        return reject(point, auth, ownerExistResult.getRemark());
-      }
+      return processOwnerExistVerify(ownerExistResult, context, point, auth);
 
     } finally {
       ArexContext.removeContext();
@@ -110,23 +104,39 @@ protected OwnerExistResult getOwnerExistResult() {
       List<ApplicationConfiguration> applications = applicationConfigurationRepository.listBy(
           context.getAppId());
       if (CollectionUtils.isEmpty(applications)) {
-        LOGGER.error("error appId");
-        return new OwnerExistResult(false, ERROR_APPID);
+        LOGGER.error("error appId, appId: {}", context.getAppId());
+        return new OwnerExistResult(false, ERROR_APPID,
+            ArexStorageResponseCode.APP_AUTH_ERROR_APP_ID);
       }
       ApplicationConfiguration application = applications.get(0);
       owners = application.getOwners();
     }
     if (CollectionUtils.isEmpty(owners) || owners.contains(userName)) {
-      return new OwnerExistResult(true, null);
+      return new OwnerExistResult(true, null, null);
     } else {
-      return new OwnerExistResult(false, NO_PERMISSION);
+      return new OwnerExistResult(false, NO_PERMISSION,
+          ArexStorageResponseCode.APP_AUTH_NO_PERMISSION);
     }
   }
 
-  private Object reject(ProceedingJoinPoint point, AppAuth auth, String remark) throws Throwable {
+  private Object processOwnerExistVerify(OwnerExistResult ownerExistResult, ArexContext context,
+      ProceedingJoinPoint point, AppAuth auth)
+      throws Throwable {
+    if (ownerExistResult.getExist()) {
+      context.setPassAuth(true);
+      return point.proceed();
+    } else {
+      context.setPassAuth(false);
+      return reject(point, auth, ownerExistResult.getRemark(), ownerExistResult.getResponseCode());
+    }
+  }
+
+
+  private Object reject(ProceedingJoinPoint point, AppAuth auth, String remark, int responseCode)
+      throws Throwable {
     switch (auth.rejectStrategy()) {
       case FAIL_RESPONSE:
-        return ResponseUtils.errorResponse(remark, ResponseCode.AUTHENTICATION_FAILED);
+        return ResponseUtils_New.errorResponse(remark, responseCode);
       case DOWNGRADE:
         ArexContext.getContext().setPassAuth(false);
         return point.proceed();
@@ -135,6 +145,7 @@ private Object reject(ProceedingJoinPoint point, AppAuth auth, String remark) th
     }
   }
 
+
   private void init() {
     authSwitch = Optional.ofNullable(
             systemConfigurationRepository.getSystemConfigByKey(KeySummary.AUTH_SWITCH))
@@ -149,5 +160,6 @@ public static class OwnerExistResult {
 
     private Boolean exist;
     private String remark;
+    private Integer responseCode;
   }
 }

arex-storage-web-api/src/main/java/com/arextest/storage/model/ArexStorageResponseCode.java

@@ -0,0 +1,16 @@
+package com.arextest.storage.model;
+
+import com.arextest.common.model.response.ResponseCode_New;
+
+public class ArexStorageResponseCode extends ResponseCode_New {
+
+
+
+
+  // app auth error codes start with 105xxx, shared with arex-saas-api
+  // com.arextest.web.common.exception.ArexApiResponseCode
+  public static final int APP_AUTH_NO_APP_ID = 105001;
+  public static final int APP_AUTH_ERROR_APP_ID = 105002;
+  public static final int APP_AUTH_NO_PERMISSION = 105003;
+
+}