add Oidc preferred username

apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java

@@ -295,7 +295,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
     when(pollResponse.getBody()).thenReturn(Lists.newArrayList(someNotification));
     when(someResponse.getBody()).thenReturn(newApolloConfig);
 
-    longPollFinished.get(5000, TimeUnit.MILLISECONDS);
+    longPollFinished.get(10000, TimeUnit.MILLISECONDS);
 
     remoteConfigLongPollService.stopLongPollingRefresh();
 

apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/AppDTO.java

@@ -21,6 +21,8 @@ public class AppDTO extends BaseDTO{
 
   private String ownerName;
 
+  private String ownerPreferredUsername;
+
   private String ownerEmail;
 
   public long getId() {
@@ -31,52 +33,59 @@ public void setId(long id) {
     this.id = id;
   }
 
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
   public String getAppId() {
     return appId;
   }
 
-  public String getName() {
-    return name;
+  public void setAppId(String appId) {
+    this.appId = appId;
   }
 
   public String getOrgId() {
     return orgId;
   }
 
+  public void setOrgId(String orgId) {
+    this.orgId = orgId;
+  }
+
   public String getOrgName() {
     return orgName;
   }
 
-  public String getOwnerEmail() {
-    return ownerEmail;
+  public void setOrgName(String orgName) {
+    this.orgName = orgName;
   }
 
   public String getOwnerName() {
     return ownerName;
   }
 
-  public void setAppId(String appId) {
-    this.appId = appId;
+  public void setOwnerName(String ownerName) {
+    this.ownerName = ownerName;
   }
 
-  public void setName(String name) {
-    this.name = name;
+  public String getOwnerPreferredUsername() {
+    return ownerPreferredUsername;
   }
 
-  public void setOrgId(String orgId) {
-    this.orgId = orgId;
+  public void setOwnerPreferredUsername(String ownerPreferredUsername) {
+    this.ownerPreferredUsername = ownerPreferredUsername;
   }
 
-  public void setOrgName(String orgName) {
-    this.orgName = orgName;
+  public String getOwnerEmail() {
+    return ownerEmail;
   }
 
   public void setOwnerEmail(String ownerEmail) {
     this.ownerEmail = ownerEmail;
   }
-
-  public void setOwnerName(String ownerName) {
-    this.ownerName = ownerName;
-  }
-
 }

apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/BaseDTO.java

@@ -9,6 +9,10 @@ public class BaseDTO {
 
   protected String dataChangeLastModifiedBy;
 
+  protected String dataChangeCreatedByPreferredUsername;
+
+  protected String dataChangeLastModifiedByPreferredUsername;
+
   protected Date dataChangeCreatedTime;
 
   protected Date dataChangeLastModifiedTime;
@@ -29,6 +33,24 @@ public void setDataChangeLastModifiedBy(String dataChangeLastModifiedBy) {
     this.dataChangeLastModifiedBy = dataChangeLastModifiedBy;
   }
 
+  public String getDataChangeCreatedByPreferredUsername() {
+    return dataChangeCreatedByPreferredUsername;
+  }
+
+  public void setDataChangeCreatedByPreferredUsername(
+      String dataChangeCreatedByPreferredUsername) {
+    this.dataChangeCreatedByPreferredUsername = dataChangeCreatedByPreferredUsername;
+  }
+
+  public String getDataChangeLastModifiedByPreferredUsername() {
+    return dataChangeLastModifiedByPreferredUsername;
+  }
+
+  public void setDataChangeLastModifiedByPreferredUsername(
+      String dataChangeLastModifiedByPreferredUsername) {
+    this.dataChangeLastModifiedByPreferredUsername = dataChangeLastModifiedByPreferredUsername;
+  }
+
   public Date getDataChangeCreatedTime() {
     return dataChangeCreatedTime;
   }

apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/PreferredUsernameUtil.java

@@ -0,0 +1,75 @@
+package com.ctrip.framework.apollo.common.utils;
+
+import com.ctrip.framework.apollo.common.dto.BaseDTO;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author vdisk <vdisk@foxmail.com>
+ */
+public class PreferredUsernameUtil {
+
+  /**
+   * extract operator id from the dto list
+   *
+   * @param dtoList dto list with operator id
+   * @return operator id set
+   */
+  public static Set<String> extractOperatorId(List<? extends BaseDTO> dtoList) {
+    if (CollectionUtils.isEmpty(dtoList)) {
+      return Collections.emptySet();
+    }
+    Set<String> operatorIdSet = new HashSet<>();
+    for (BaseDTO dto : dtoList) {
+      operatorIdSet.add(dto.getDataChangeCreatedBy());
+      operatorIdSet.add(dto.getDataChangeLastModifiedBy());
+    }
+    return operatorIdSet;
+  }
+
+  /**
+   * extract operator id from the dto
+   *
+   * @param dto dto with operator id
+   * @return operator id set
+   */
+  public static Set<String> extractOperatorId(BaseDTO dto) {
+    Set<String> operatorIdSet = new HashSet<>();
+    operatorIdSet.add(dto.getDataChangeCreatedBy());
+    operatorIdSet.add(dto.getDataChangeLastModifiedBy());
+    return operatorIdSet;
+  }
+
+  /**
+   * set the preferred username
+   *
+   * @param dto                  dto with operator id
+   * @param preferredUsernameMap (userId - preferredUsername) prepared preferred username map
+   */
+  public static void setPreferredUsername(BaseDTO dto,
+      Map<String, String> preferredUsernameMap) {
+    if (dto == null) {
+      return;
+    }
+    if (CollectionUtils.isEmpty(preferredUsernameMap)) {
+      return;
+    }
+    if (StringUtils.hasText(dto.getDataChangeCreatedBy())) {
+      String preferredUsername = preferredUsernameMap.get(dto.getDataChangeCreatedBy());
+      if (StringUtils.hasText(preferredUsername)) {
+        dto.setDataChangeCreatedByPreferredUsername(preferredUsername);
+      }
+    }
+    if (StringUtils.hasText(dto.getDataChangeLastModifiedBy())) {
+      String preferredUsername = preferredUsernameMap.get(dto.getDataChangeLastModifiedBy());
+      if (StringUtils.hasText(preferredUsername)) {
+        dto.setDataChangeLastModifiedByPreferredUsername(preferredUsername);
+      }
+    }
+  }
+}

apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/AbstractBaseIntegrationTest.java

@@ -18,13 +18,15 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.Duration;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -46,7 +48,8 @@ public abstract class AbstractBaseIntegrationTest {
 
   private static final Gson GSON = new Gson();
 
-  protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
+  protected RestTemplate restTemplate = (new TestRestTemplate(new RestTemplateBuilder()
+      .setConnectTimeout(Duration.ofSeconds(5)))).getRestTemplate();
 
   @PostConstruct
   private void postConstruct() {

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java

@@ -1,14 +1,17 @@
 package com.ctrip.framework.apollo.portal.controller;
 
 
+import com.ctrip.framework.apollo.common.dto.AppDTO;
 import com.ctrip.framework.apollo.common.dto.PageDTO;
 import com.ctrip.framework.apollo.common.entity.App;
 import com.ctrip.framework.apollo.common.exception.BadRequestException;
 import com.ctrip.framework.apollo.common.http.MultiResponseEntity;
 import com.ctrip.framework.apollo.common.http.RichResponseEntity;
+import com.ctrip.framework.apollo.common.utils.BeanUtils;
 import com.ctrip.framework.apollo.core.ConfigConsts;
 import com.ctrip.framework.apollo.portal.environment.Env;
 import com.ctrip.framework.apollo.portal.component.PortalSettings;
+import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
 import com.ctrip.framework.apollo.portal.entity.model.AppModel;
 import com.ctrip.framework.apollo.portal.entity.po.Role;
 import com.ctrip.framework.apollo.portal.entity.vo.EnvClusterInfo;
@@ -19,6 +22,7 @@
 import com.ctrip.framework.apollo.portal.service.RoleInitializationService;
 import com.ctrip.framework.apollo.portal.service.RolePermissionService;
 import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
+import com.ctrip.framework.apollo.portal.spi.UserService;
 import com.ctrip.framework.apollo.portal.util.RoleUtils;
 import com.google.common.collect.Sets;
 import org.springframework.context.ApplicationEventPublisher;
@@ -55,20 +59,23 @@ public class AppController {
   private final ApplicationEventPublisher publisher;
   private final RolePermissionService rolePermissionService;
   private final RoleInitializationService roleInitializationService;
+  private final UserService userService;
 
   public AppController(
       final UserInfoHolder userInfoHolder,
       final AppService appService,
       final PortalSettings portalSettings,
       final ApplicationEventPublisher publisher,
       final RolePermissionService rolePermissionService,
-      final RoleInitializationService roleInitializationService) {
+      final RoleInitializationService roleInitializationService,
+      final UserService userService) {
     this.userInfoHolder = userInfoHolder;
     this.appService = appService;
     this.portalSettings = portalSettings;
     this.publisher = publisher;
     this.rolePermissionService = rolePermissionService;
     this.roleInitializationService = roleInitializationService;
+    this.userService = userService;
   }
 
   @GetMapping
@@ -166,9 +173,14 @@ public ResponseEntity<Void> create(@PathVariable String env, @Valid @RequestBody
   }
 
   @GetMapping("/{appId:.+}")
-  public App load(@PathVariable String appId) {
-
-    return appService.load(appId);
+  public AppDTO load(@PathVariable String appId) {
+    App app = appService.load(appId);
+    AppDTO appDto = BeanUtils.transform(AppDTO.class, app);
+    UserInfo userInfo = userService.findByUserId(app.getOwnerName());
+    if (userInfo != null) {
+      appDto.setOwnerPreferredUsername(userInfo.getName());
+    }
+    return appDto;
   }
 
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/CommitController.java

@@ -1,31 +1,41 @@
 package com.ctrip.framework.apollo.portal.controller;
 
 import com.ctrip.framework.apollo.common.dto.CommitDTO;
-import com.ctrip.framework.apollo.portal.environment.Env;
+import com.ctrip.framework.apollo.common.utils.PreferredUsernameUtil;
 import com.ctrip.framework.apollo.portal.component.PermissionValidator;
+import com.ctrip.framework.apollo.portal.environment.Env;
 import com.ctrip.framework.apollo.portal.service.CommitService;
+import com.ctrip.framework.apollo.portal.spi.UserService;
 import javax.validation.Valid;
 import javax.validation.constraints.Positive;
 import javax.validation.constraints.PositiveOrZero;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Validated
 @RestController
 public class CommitController {
 
   private final CommitService commitService;
   private final PermissionValidator permissionValidator;
+  private final UserService userService;
 
-  public CommitController(final CommitService commitService, final PermissionValidator permissionValidator) {
+  public CommitController(final CommitService commitService,
+      final PermissionValidator permissionValidator,
+      final UserService userService) {
     this.commitService = commitService;
     this.permissionValidator = permissionValidator;
+    this.userService = userService;
   }
 
   @GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits")
@@ -36,7 +46,18 @@ public List<CommitDTO> find(@PathVariable String appId, @PathVariable String env
     if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
       return Collections.emptyList();
     }
-
-    return commitService.find(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
+    List<CommitDTO> dtoList = commitService
+        .find(appId, Env.valueOf(env), clusterName, namespaceName, page, size);
+    if (CollectionUtils.isEmpty(dtoList)) {
+      return Collections.emptyList();
+    }
+    Set<String> operatorIdSet = PreferredUsernameUtil.extractOperatorId(dtoList);
+    Map<String, String> preferredUsernameMap = userService
+        .findPreferredUsernameMapByUserIds(new ArrayList<>(operatorIdSet));
+    if (CollectionUtils.isEmpty(preferredUsernameMap)) {
+      return dtoList;
+    }
+    dtoList.forEach(dto -> PreferredUsernameUtil.setPreferredUsername(dto, preferredUsernameMap));
+    return dtoList;
   }
 }