Skip to content

A
apollo
Commit bec6a785 by Jason Song Committed by GitHub
Options

Merge pull request #301 from lepdou/0627_0701

已授权校验 & 创建app 用户模糊搜索
parents a474d5ca f763525b
Showing with 42 additions and 21 deletions
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/AppController.java
......@@ -8,9 +8,11 @@ import com.ctrip.framework.apollo.common.utils.InputValidator;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.exception.BadRequestException;
import com.ctrip.framework.apollo.portal.PortalSettings;
import com.ctrip.framework.apollo.portal.entity.po.UserInfo;
import com.ctrip.framework.apollo.portal.entity.vo.EnvClusterInfo;
import com.ctrip.framework.apollo.portal.listener.AppCreationEvent;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
......@@ -40,6 +42,8 @@ public class AppController {
@Autowired
private ApplicationEventPublisher publisher;
@Autowired
private UserService userService;
@RequestMapping("")
public List<App> findAllApp() {
......@@ -71,12 +75,17 @@ public class AppController {
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity<Void> create(@RequestBody App app) {
checkArgument(app.getName(), app.getAppId(), app.getOwnerEmail(), app.getOwnerName(),
checkArgument(app.getName(), app.getAppId(), app.getOwnerName(),
app.getOrgId(), app.getOrgName());
if (!InputValidator.isValidClusterNamespace(app.getAppId())) {
throw new BadRequestException(String.format("AppId格式错误: %s", InputValidator.INVALID_CLUSTER_NAMESPACE_MESSAGE));
}
UserInfo userInfo = userService.findByUserId(app.getOwnerName());
if (userInfo == null){
throw new BadRequestException("应用负责人不存在");
}
app.setOwnerEmail(userInfo.getEmail());
appService.enrichUserInfo(app);
App createdApp = appService.create(app);
......
apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PermissionController.java
......@@ -16,6 +16,7 @@ import com.ctrip.framework.apollo.portal.util.RoleUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -89,8 +90,11 @@ public class PermissionController {
if (!RoleType.isValidRoleType(roleType)){
throw new BadRequestException("role type is illegal");
}
rolePermissionService.assignRoleToUsers(RoleUtils.buildNamespaceRoleName(appId, namespaceName, roleType),
Set<String> assignedUser = rolePermissionService.assignRoleToUsers(RoleUtils.buildNamespaceRoleName(appId, namespaceName, roleType),
Sets.newHashSet(user), userInfoHolder.getUser().getUserId());
if (CollectionUtils.isEmpty(assignedUser)){
throw new BadRequestException(user + "已授权");
}
return ResponseEntity.ok().build();
}
......@@ -130,8 +134,11 @@ public class PermissionController {
if (!RoleType.isValidRoleType(roleType)){
throw new BadRequestException("role type is illegal");
}
rolePermissionService.assignRoleToUsers(RoleUtils.buildAppRoleName(appId, roleType),
Set<String> assignedUsers = rolePermissionService.assignRoleToUsers(RoleUtils.buildAppRoleName(appId, roleType),
Sets.newHashSet(user), userInfoHolder.getUser().getUserId());
if (CollectionUtils.isEmpty(assignedUsers)){
throw new BadRequestException(user + "已授权");
}
return ResponseEntity.ok().build();
}
......
apollo-portal/src/main/resources/static/app.html
......@@ -48,10 +48,7 @@
<div class="form-group">
<label class="col-sm-2 control-label"><apollorequiredfiled></apollorequiredfiled> 应用负责人</label>
<div class="col-sm-6">
<div class="input-group">
<input type="text" class="form-control" name="appOwner" ng-model="app.ownerName" required>
<div class="input-group-addon" ng-bind="emailPostfix"></div>
</div>
<apollouserselector apollo-id="userSelectWidgetId"></apollouserselector>
<small>(负责人具有项目管理的最高权限,比如分配配置的修改权,发布权等)</small>
</div>
</div>
......
apollo-portal/src/main/resources/static/namespace/role.html
......@@ -73,8 +73,8 @@
<button type="submit" class="btn btn-default" style="margin-left: 20px;">添加</button>
</form>
<!-- Split button -->
<div style="margin-top: 15px;">
<div class="btn-group" ng-repeat="user in rolesAssignedUsers.releaseRoleUsers">
<div class="user-container">
<div class="btn-group user-info" ng-repeat="user in rolesAssignedUsers.releaseRoleUsers">
<button type="button" class="btn btn-default" ng-bind="user.userId"></button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false" ng-click="removeUserRole('ReleaseNamespace', user.userId)">
......
apollo-portal/src/main/resources/static/scripts/controller/AppController.js
......@@ -26,7 +26,7 @@ create_app_module.controller('CreateAppController', ['$scope', '$window', 'toast
});
$scope.emailPostfix = "@ctrip.com";
$scope.userSelectWidgetId = "userSelectWidgetId";
$scope.create = function () {
var selectedOrg = $('#organization').select2('data')[0];
......@@ -38,7 +38,14 @@ create_app_module.controller('CreateAppController', ['$scope', '$window', 'toast
$scope.app.orgId = selectedOrg.id;
$scope.app.orgName = selectedOrg.name;
$scope.app.ownerEmail = $scope.app.ownerName + $scope.emailPostfix;
// ownerName
var user = $('.' + $scope.userSelectWidgetId).select2('data')[0];
if (!user){
toastr.warning("请输入应用负责人");
return;
}
$scope.app.ownerName = user.id;
AppService.create($scope.app).then(function (result) {
toastr.success('添加成功!');
......
apollo-portal/src/main/resources/static/scripts/controller/role/AppRoleController.js
......@@ -36,6 +36,7 @@ role_module.controller('AppRoleController',
.then(function (result) {
toastr.success("添加成功");
$scope.appRoleUsers.masterUsers.push({userId: toAssignMasterRoleUser});
$('.' + $scope.userSelectWidgetId).select2("val", "");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "添加失败");
});
......
apollo-portal/src/main/resources/static/scripts/controller/role/NamespaceRoleController.js
......@@ -9,7 +9,7 @@ role_module.controller('NamespaceRoleController',
appId: params.appid,
namespaceName: params.namespaceName
};
$scope.releaseRoleWidgetId = 'releaseRoleWidgetId';
$scope.modifyRoleWidgetId = 'modifyRoleWidgetId';
......@@ -24,16 +24,14 @@ role_module.controller('NamespaceRoleController',
$scope.pageContext.namespaceName)
.then(function (result) {
$scope.rolesAssignedUsers = result;
console.log(result);
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "加载授权用户出错");
});
$scope.assignRoleToUser = function (roleType) {
if ('ReleaseNamespace' == roleType) {
var user = $('.' + $scope.releaseRoleWidgetId).select2('data')[0];
if (!user){
if (!user) {
toastr.warning("请选择用户");
return;
}
......@@ -45,12 +43,13 @@ role_module.controller('NamespaceRoleController',
toastr.success("添加成功");
$scope.rolesAssignedUsers.releaseRoleUsers.push(
{userId: toAssignReleaseNamespaceRoleUser});
$('.' + $scope.releaseRoleWidgetId).select2("val", "");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "添加失败");
});
} else {
var user = $('.' + $scope.modifyRoleWidgetId).select2('data')[0];
if (!user){
if (!user) {
toastr.warning("请选择用户");
return;
}
......@@ -62,6 +61,7 @@ role_module.controller('NamespaceRoleController',
toastr.success("添加成功");
$scope.rolesAssignedUsers.modifyRoleUsers.push(
{userId: toAssignModifyNamespaceRoleUser});
$('.' + $scope.modifyRoleWidgetId).select2("val", "");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), "添加失败");
});
......@@ -102,5 +102,5 @@ role_module.controller('NamespaceRoleController',
}
list.splice(index, 1);
}
}]);
apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/ServiceExceptionTest.java
......@@ -26,7 +26,7 @@ import com.ctrip.framework.apollo.common.utils.ExceptionUtils;
import com.ctrip.framework.apollo.core.dto.AppDTO;
import com.ctrip.framework.apollo.core.exception.ServiceException;
import com.ctrip.framework.apollo.portal.controller.AppController;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.UserService;
import com.google.gson.Gson;
......@@ -35,12 +35,12 @@ public class ServiceExceptionTest extends AbstractPortalTest {
@Autowired
private AppController appController;
@Mock
private AppService appService;
private UserService userService;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ReflectionTestUtils.setField(appController, "appService", appService);
ReflectionTestUtils.setField(appController, "userService", userService);
}
private String getBaseAppUrl() {
......@@ -61,7 +61,7 @@ public class ServiceExceptionTest extends AbstractPortalTest {
new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "admin server error",
new Gson().toJson(errorAttributes).getBytes(), Charset.defaultCharset());
when(appService.create(any(App.class))).thenThrow(adminException);
when(userService.findByUserId(any(String.class))).thenThrow(adminException);
App app = generateSampleApp();
try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment