diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index e9e530d64..a225d7271 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -34,16 +34,29 @@ class DevConfig { @Transactional @PostConstruct - void createDevAdminUsers() { + void createDevUsers() { if (adminUserRepository.count() == 0) { - def user = new User().with { + def users = [new User().with { username = 'admin' password = '{noop}adminpass' + firstName = 'Joe' + lastName = 'Doe' + emailAddress = 'joe@institution.edu' roles.add(new Role(name: 'ROLE_ADMIN')) it + }, new User().with { + username = 'nonadmin' + password = '{noop}nonadminpass' + firstName = 'Peter' + lastName = 'Vandelay' + emailAddress = 'peter@institution.edu' + roles.add(new Role(name: 'ROLE_USER')) + it + }] + users.each { + adminUserRepository.save(it) } - adminUserRepository.save(user) } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java index fb60112f2..b9679866d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java @@ -7,6 +7,8 @@ import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository; import edu.internet2.tier.shibboleth.admin.ui.scheduled.EntityDescriptorFilesScheduledTasks; import edu.internet2.tier.shibboleth.admin.ui.scheduled.MetadataProvidersScheduledTasks; +import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; +import edu.internet2.tier.shibboleth.admin.ui.security.service.UserRoleService; import edu.internet2.tier.shibboleth.admin.ui.service.DefaultMetadataResolversPositionOrderContainerService; import edu.internet2.tier.shibboleth.admin.ui.service.DirectoryService; import edu.internet2.tier.shibboleth.admin.ui.service.DirectoryServiceImpl; @@ -194,4 +196,9 @@ public Module stringTrimModule() { public ModelRepresentationConversions modelRepresentationConversions() { return new ModelRepresentationConversions(customPropertiesConfiguration()); } + + @Bean + public UserRoleService userRoleService(RoleRepository roleRepository) { + return new UserRoleService(roleRepository); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ConfigurationController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ConfigurationController.java index f71e76cb5..3f85175e1 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ConfigurationController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/ConfigurationController.java @@ -1,12 +1,16 @@ package edu.internet2.tier.shibboleth.admin.ui.controller; import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration; +import edu.internet2.tier.shibboleth.admin.ui.security.model.Role; +import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.stream.Collectors; + /** * @author Bill Smith (wsmith@unicon.net) */ @@ -17,8 +21,16 @@ public class ConfigurationController { @Autowired CustomPropertiesConfiguration customPropertiesConfiguration; + @Autowired + RoleRepository roleRepository; + @GetMapping(value = "/customAttributes") public ResponseEntity getCustomAttributes() { return ResponseEntity.ok(customPropertiesConfiguration.getAttributes()); } + + @GetMapping(value = "/supportedRoles") + public ResponseEntity getSupportedRoles() { + return ResponseEntity.ok(roleRepository.findAll().stream().map(Role::getName).collect(Collectors.toList())); + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java index e210adc94..d918594db 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/support/RestControllersSupport.java @@ -35,13 +35,9 @@ public MetadataResolver findResolverOrThrowHttp404(String resolverResourceId) { return resolver; } - //TODO: Review this handler and update accordingly. Do we still need it? @ExceptionHandler(HttpClientErrorException.class) public ResponseEntity notFoundHandler(HttpClientErrorException ex) { - if(ex.getStatusCode() == NOT_FOUND) { - return ResponseEntity.status(NOT_FOUND).body(ex.getStatusText()); - } - throw ex; + return ResponseEntity.status(ex.getStatusCode()).body(new ErrorResponse(ex.getStatusCode().toString(), ex.getStatusText())); } @ExceptionHandler(ConstraintViolationException.class) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java new file mode 100644 index 000000000..0953d528c --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java @@ -0,0 +1,116 @@ +package edu.internet2.tier.shibboleth.admin.ui.security.controller; + +import edu.internet2.tier.shibboleth.admin.ui.controller.ErrorResponse; +import edu.internet2.tier.shibboleth.admin.ui.security.model.User; +import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; +import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository; +import edu.internet2.tier.shibboleth.admin.ui.security.service.UserRoleService; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.crypto.bcrypt.BCrypt; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.HttpClientErrorException; + +import java.util.List; +import java.util.Optional; + +import static org.springframework.http.HttpStatus.NOT_FOUND; + +/** + * Implementation of the REST resource endpoints exposing system users. + * + * @author Dmitriy Kopylenko + */ +@RestController +@RequestMapping("/api/admin/users") +public class UsersController { + + private static final Logger logger = LoggerFactory.getLogger(UsersController.class); + + private UserRepository userRepository; + private RoleRepository roleRepository; + private UserRoleService userRoleService; + + public UsersController(UserRepository userRepository, RoleRepository roleRepository, UserRoleService userRoleService) { + this.userRepository = userRepository; + this.roleRepository = roleRepository; + this.userRoleService = userRoleService; + } + + @Transactional(readOnly = true) + @GetMapping + public List getAll() { + return userRepository.findAll(); + } + + @Transactional(readOnly = true) + @GetMapping("/{username}") + public ResponseEntity getOne(@PathVariable String username) { + return ResponseEntity.ok(findUserOrThrowHttp404(username)); + } + + @Transactional + @DeleteMapping("/{username}") + public ResponseEntity deleteOne(@PathVariable String username) { + User user = findUserOrThrowHttp404(username); + userRepository.delete(user); + return ResponseEntity.noContent().build(); + } + + @Transactional + @PostMapping + ResponseEntity saveOne(@RequestBody User user) { + Optional persistedUser = userRepository.findByUsername(user.getUsername()); + if (persistedUser.isPresent()) { + return ResponseEntity + .status(HttpStatus.CONFLICT) + .body(new ErrorResponse(String.valueOf(HttpStatus.CONFLICT.value()), + String.format("A user with username [%s] already exists within the system.", user.getUsername()))); + } + //TODO: modify this such that additional encoders can be used + user.setPassword(BCrypt.hashpw(user.getPassword(), BCrypt.gensalt())); + userRoleService.updateUserRole(user); + User savedUser = userRepository.save(user); + return ResponseEntity.ok(savedUser); + } + + @Transactional + @PatchMapping("/{username}") + ResponseEntity updateOne(@PathVariable(value = "username") String username, @RequestBody User user) { + User persistedUser = findUserOrThrowHttp404(username); + if (StringUtils.isNotBlank(user.getFirstName())) { + persistedUser.setFirstName(user.getFirstName()); + } + if (StringUtils.isNotBlank(user.getLastName())) { + persistedUser.setLastName(user.getLastName()); + } + if (StringUtils.isNotBlank(user.getEmailAddress())) { + persistedUser.setEmailAddress(user.getEmailAddress()); + } + if (StringUtils.isNotBlank(user.getPassword())) { + persistedUser.setPassword(BCrypt.hashpw(user.getPassword(), BCrypt.gensalt())); + } + if (StringUtils.isNotBlank(user.getRole())) { + persistedUser.setRole(user.getRole()); + userRoleService.updateUserRole(persistedUser); + } + User savedUser = userRepository.save(persistedUser); + return ResponseEntity.ok(savedUser); + } + + private User findUserOrThrowHttp404(String username) { + return userRepository.findByUsername(username) + .orElseThrow(() -> new HttpClientErrorException(NOT_FOUND, String.format("User with username [%s] not found", username))); + } + } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java index 20564093d..c7f1112b3 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/Role.java @@ -1,5 +1,6 @@ package edu.internet2.tier.shibboleth.admin.ui.security.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -28,10 +29,23 @@ @ToString(exclude = "users") public class Role extends AbstractAuditable { + public Role(String name) { + this.name = name; + } + + public Role(String name, int rank) { + this.name = name; + this.rank = rank; + } + @Column(unique = true) private String name; - @ManyToMany(cascade = CascadeType.ALL, mappedBy = "roles", fetch = FetchType.EAGER) + private int rank; + + //Ignore properties annotation here is to prevent stack overflow recursive error during JSON serialization + @JsonIgnoreProperties("roles") + @ManyToMany(mappedBy = "roles", fetch = FetchType.EAGER) private Set users = new HashSet<>(); } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java index 9b24cf946..edb7c542a 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java @@ -1,8 +1,14 @@ package edu.internet2.tier.shibboleth.admin.ui.security.model; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable; -import lombok.*; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.apache.commons.lang.StringUtils; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -10,6 +16,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.Transient; import java.util.HashSet; import java.util.Set; @@ -37,8 +44,24 @@ public class User extends AbstractAuditable { private String lastName; - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) - @ManyToMany(cascade = CascadeType.ALL) + private String emailAddress; + + @Transient + private String role; + + @JsonIgnore + @ManyToMany(cascade = CascadeType.PERSIST) @JoinTable(name = "user_role", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id")) private Set roles = new HashSet<>(); + + public String getRole() { + if (StringUtils.isBlank(this.role)) { + Set roles = this.getRoles(); + if (roles.size() != 1) { + throw new RuntimeException(String.format("User with username [%s] does not have exactly one role!", this.getUsername())); + } + this.role = roles.iterator().next().getName(); + } + return this.role; + } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserRoleService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserRoleService.java new file mode 100644 index 000000000..87a6431d0 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserRoleService.java @@ -0,0 +1,46 @@ +package edu.internet2.tier.shibboleth.admin.ui.security.service; + +import edu.internet2.tier.shibboleth.admin.ui.security.model.Role; +import edu.internet2.tier.shibboleth.admin.ui.security.model.User; +import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.HashSet; +import java.util.Optional; +import java.util.Set; + +/** + * @author Bill Smith (wsmith@unicon.net) + */ +public class UserRoleService { + + private RoleRepository roleRepository; + + public UserRoleService(RoleRepository roleRepository) { + this.roleRepository = roleRepository; + } + + /** + * Given a user with a defined User.role, update the User.roles collection with that role. + * + * This currently exists because users should only ever have one role in the system at this time. However, user + * roles are persisted as a set of roles (for future-proofing). Once we start allowing a user to have multiple roles, + * this method and User.role can go away. + * @param user + */ + public void updateUserRole(User user) { + if (StringUtils.isNotBlank(user.getRole())) { + Optional userRole = roleRepository.findByName(user.getRole()); + if (userRole.isPresent()) { + Set userRoles = new HashSet<>(); + userRoles.add(userRole.get()); + user.setRoles(userRoles); + } else { + throw new RuntimeException(String.format("User with username [%s] is defined with role [%s] which does not exist in the system!", user.getUsername(), user.getRole())); + } + } else { + throw new RuntimeException(String.format("User with username [%s] has no role defined and therefor cannot be updated!", user.getUsername())); + } + } +} diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 5b39cb7b9..1c207ee38 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -69,6 +69,10 @@ value.signing=Signing value.encryption=Encryption value.both=Both +value.entity=Entity +value.condition-ref=ConditionRef +value.condition-script=ConditionScript + value.file-backed-http-metadata-provider=FileBackedHttpMetadataProvider value.file-system-metadata-provider=FileSystemMetadataProvider value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider @@ -130,6 +134,7 @@ label.clear-all-attributes=Clear All Attributes label.protocol-support-enumeration=Protocol Support Enumeration label.select-protocol=Select Protocol label.nameid-format=NameID Format +label.nameid-formats=NameID Formats label.name-and-entity-id=Name and Entity ID label.organization-information=Organization Information label.contact-information=Contact Information @@ -181,9 +186,9 @@ label.authentication-methods-to-use=Authentication Methods to Use label.auth-method-indexed=Authentication Method label.preview-provider=Preview XML label.search-entity-id=Search Entity Id -label.edit-filter=Edit EntityAttributesFilter +label.edit-filter=Edit Filter label.min-4-chars=Minimum 4 characters. -label.new-filter=New Filter - EntityAttributes +label.new-filter=New Filter label.service-provider=Metadata Source Name: label.created-date=Created Date: label.service-entity-id=Metadata Source Entity ID: @@ -299,7 +304,7 @@ label.metadata-provider-type=Metadata Provider Type label.metadata-provider-name=Metadata Provider Name label.select-metadata-type=Select a metadata provider type label.metadata-provider-status=Metadata Provider Status -label.enable-provider-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP +label.enable-provider-upon-saving=Enable Metadata Provider? label.certificate-type=Type label.metadata-file=Metadata File @@ -365,11 +370,37 @@ label.encoding-style=Encoding Style label.velocity-engine=Velocity Engine label.match=Match +label.remove-existing-formats=Remove Existing Formats? +label.nameid-formats-format=NameID Format +label.nameid-formats-value=NameID Value +label.nameid-formats-type=NameID Type + +label.select-filter-type=Select Filter Type + +label.admin=Admin +label.user-maintenance=User Maintenance +label.user-id=UserId +label.email=Email +label.role=Role +label.delete=Delete? + +message.delete-user-title=Delete User? +message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue? message.must-be-unique=Must be unique. message.name-must-be-unique=Name must be unique. message.uri-valid-format=URI must be valid format. message.id-unique=ID must be unique. +message.array-items-must-be-unique=Items in list must be unique. + +message.org-name-required=Organization Name is required. +message.org-displayName-required=Organization Name is required. +message.org-url-required=Organization Name is required. +message.org-incomplete=These three fields must all be entered if any single field has a value. + +message.type-required=Missing required property: Type +message.match-required=Missing required property: Match +message.value-required=Missing required property: Value message.conflict=Conflict message.data-version-contention=Data Version Contention @@ -416,8 +447,8 @@ tooltip.assertion-consumer-service-location=Assertion Consumer Service Location tooltip.assertion-consumer-service-location-binding=Assertion Consumer Service Location Binding tooltip.mark-as-default=Mark as Default tooltip.protocol-support-enumeration=Protocol Support Enumeration -tooltip.nameid-format=Add NameID Format -tooltip.enable-this-service-upon-saving=Enable this service upon saving +tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following or {{}}elements. +tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP tooltip.authentication-requests-signed=Authentication Requests Signed tooltip.want-assertions-signed=Want Assertions Signed tooltip.certificate-name=Certificate Name @@ -477,9 +508,9 @@ tooltip.enable-provider-upon-saving=If checkbox is clicked, the metadata provide tooltip.max-validity-interval=Defines the window within which the metadata is valid. tooltip.require-signed-root=If true, this fails to load metadata with no signature on the root XML element. tooltip.certificate-file=A key used to verify the signature. Conflicts with trustEngineRef and both of the child elements. -tooltip.retained-roles=Controls whether to keep entity descriptors that contain no roles -tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. -tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. +tooltip.retained-roles=Note that property replacement cannot be used on this element. +tooltip.remove-roleless-entity-descriptors=Controls whether to keep entity descriptors that contain no roles. Note: If this attribute is set to false, the resulting output may not be schema-valid since an element must include at least one role descriptor. +tooltip.remove-empty-entities-descriptors=Controls whether to keep entities descriptors that contain no entity descriptors. Note: If this attribute is set to false, the resulting output may not be schema-valid since an element must include at least one child element, either an element or an element. tooltip.min-refresh-delay=Lower bound on the next refresh from the time calculated based on the metadata\u0027s expiration. tooltip.max-refresh-delay=Upper bound on the next refresh from the time calculated based on the metadata\u0027s expiration. @@ -503,9 +534,14 @@ tooltip.source-directory=Convenience mechanism for wiring a FilesystemLoadSaveMa tooltip.remove-idle-entity-data=Flag indicating whether idle metadata should be removed. tooltip.do-resolver-initialization=Initialize this resolver? In the case of Filesystem resolvers, this will cause the system to read the file and index the resolver. -tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Template, 3) Regex. +tooltip.md-request-type=Options are 1) Metadata Query Protocol, 2) Regex. tooltip.md-request-value=Content of the element. tooltip.transform-ref=A reference to a transform function for the entityID. If used, the child element must be empty. tooltip.encoding-style=Determines whether and how the entityID value will be URL encoded prior to replacement. Allowed values are: 1) "none" - no encoding is performed, 2) "form" - encoded using URL form parameter encoding (for query parameters), 3) "path" - encoded using URL path encoding, or 4) "fragment" - encoded using URL fragment encoding. The precise definition of these terms is defined in the documentation for the methods of the Guava library\u0027s UrlEscapers class. tooltip.velocity-engine=This attribute may be used to specify the name of the Velocity engine defined within the application. -tooltip.match=A regular expression against which the entityID is evaluated. \ No newline at end of file +tooltip.match=A regular expression against which the entityID is evaluated. + +tooltip.remove-existing-formats=Whether to remove any existing formats from a role if any are added by the filter (unmodified roles will be untouched regardless of this setting) +tooltip.nameid-formats-format=Format +tooltip.nameid-formats-value=Value +tooltip.nameid-formats-type=Type \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties index 35aa48c2e..1c207ee38 100644 --- a/backend/src/main/resources/i18n/messages_en.properties +++ b/backend/src/main/resources/i18n/messages_en.properties @@ -377,6 +377,16 @@ label.nameid-formats-type=NameID Type label.select-filter-type=Select Filter Type +label.admin=Admin +label.user-maintenance=User Maintenance +label.user-id=UserId +label.email=Email +label.role=Role +label.delete=Delete? + +message.delete-user-title=Delete User? +message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue? + message.must-be-unique=Must be unique. message.name-must-be-unique=Name must be unique. message.uri-valid-format=URI must be valid format. diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy new file mode 100644 index 000000000..04aa033e9 --- /dev/null +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy @@ -0,0 +1,151 @@ +package edu.internet2.tier.shibboleth.admin.ui.security.controller + +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.SerializationFeature +import groovy.json.JsonOutput +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.test.web.client.TestRestTemplate +import org.springframework.http.HttpEntity +import org.springframework.http.HttpHeaders +import org.springframework.http.HttpMethod +import org.springframework.test.annotation.DirtiesContext +import org.springframework.test.context.ActiveProfiles +import spock.lang.Specification + +/** + * @author Dmitriy Kopylenko + */ +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles(["no-auth", "dev"]) +class UsersControllerIntegrationTests extends Specification { + + @Autowired + private TestRestTemplate restTemplate + + static RESOURCE_URI = '/api/admin/users' + + ObjectMapper mapper + + def setup() { + mapper = new ObjectMapper() + mapper.enable(SerializationFeature.INDENT_OUTPUT) + } + + def 'GET ALL users (when there are existing users)'() { + when: 'GET request is made for ALL users in the system, and system has users in it' + def result = this.restTemplate.getForEntity(RESOURCE_URI, Object) + + then: 'Request completed with HTTP 200 and returned a list of users' + result.statusCodeValue == 200 + result.body[0].username == 'admin' + result.body[0].role == 'ROLE_ADMIN' + } + + def 'GET ONE existing user'() { + when: 'GET request is made for one existing user' + def result = this.restTemplate.getForEntity("$RESOURCE_URI/admin", Map) + + then: 'Request completed with HTTP 200 and returned one user' + result.statusCodeValue == 200 + result.body.username == 'admin' + result.body.role == 'ROLE_ADMIN' + } + + def 'GET ONE NON-existing user'() { + when: 'GET request is made for one NON-existing user' + def result = this.restTemplate.getForEntity("$RESOURCE_URI/bogus", Map) + + then: 'Request completed with HTTP 404' + result.statusCodeValue == 404 + result.body.errorCode == '404' + result.body.errorMessage == 'User with username [bogus] not found' + } + + @DirtiesContext + def 'DELETE ONE existing user'() { + when: 'GET request is made for one existing user' + def result = this.restTemplate.getForEntity("$RESOURCE_URI/admin", Map) + + then: 'Request completed with HTTP 200' + result.statusCodeValue == 200 + + when: 'DELETE request is made' + this.restTemplate.delete("$RESOURCE_URI/admin") + result = this.restTemplate.getForEntity("$RESOURCE_URI/admin", Map) + + then: 'The deleted user is gone' + result.statusCodeValue == 404 + } + + def 'POST new user persists properly'() { + given: + def newUser = [firstName: 'Foo', + lastName: 'Bar', + username: 'FooBar', + password: 'somepass', + emailAddress: 'foo@institution.edu', + role: 'ROLE_USER'] + + when: + def result = this.restTemplate.postForEntity("$RESOURCE_URI", createRequestHttpEntityFor { JsonOutput.toJson(newUser) }, Map) + + then: + result.statusCodeValue == 200 + } + + def 'POST new duplicate username returns 409'() { + given: + def newUser = [firstName: 'Foo', + lastName: 'Bar', + username: 'DuplicateUser', + password: 'somepass', + emailAddress: 'foo@institution.edu', + role: 'ROLE_USER'] + + when: + this.restTemplate.postForEntity("$RESOURCE_URI", createRequestHttpEntityFor { JsonOutput.toJson(newUser) }, Map) + def result = this.restTemplate.postForEntity("$RESOURCE_URI", createRequestHttpEntityFor { JsonOutput.toJson(newUser) }, Map) + + then: + result.statusCodeValue == 409 + } + + def 'PUT updates user properly'() { + given: + def newUser = [firstName: 'Foo', + lastName: 'Bar', + username: 'FooBar', + password: 'somepass', + emailAddress: 'foo@institution.edu', + role: 'ROLE_USER'] + + when: + this.restTemplate.postForEntity("$RESOURCE_URI", createRequestHttpEntityFor { JsonOutput.toJson(newUser) }, Map) + newUser['firstName'] = 'Bob' + def result = this.restTemplate.exchange("$RESOURCE_URI/$newUser.username", HttpMethod.PATCH, createRequestHttpEntityFor { JsonOutput.toJson(newUser) }, Map) + + then: + result.statusCodeValue == 200 + } + + def 'PATCH detects unknown username'() { + given: + def newUser = [firstName: 'Foo', + lastName: 'Bar', + username: 'UnknownUser', + password: 'somepass', + emailAddress: 'foo@institution.edu', + role: 'ROLE_USER'] + + when: + def result = this.restTemplate.exchange("$RESOURCE_URI/$newUser.username", HttpMethod.PATCH, createRequestHttpEntityFor { mapper.writeValueAsString(newUser) }, Map) + + then: + result.statusCodeValue == 404 + } + + private HttpEntity createRequestHttpEntityFor(Closure jsonBodySupplier) { + new HttpEntity(jsonBodySupplier(), ['Content-Type': 'application/json'] as HttpHeaders) + } +} \ No newline at end of file diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index b7adb997b..fe988c62f 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -42,7 +42,7 @@
  • - + Dashboard diff --git a/ui/src/app/app.routing.ts b/ui/src/app/app.routing.ts index 9903039c9..99b8d88de 100644 --- a/ui/src/app/app.routing.ts +++ b/ui/src/app/app.routing.ts @@ -1,9 +1,12 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { Routes, RouterModule, PreloadAllModules } from '@angular/router'; const routes: Routes = [ - { path: '', redirectTo: 'metadata', pathMatch: 'full' }, - { path: 'dashboard', redirectTo: 'metadata', pathMatch: 'full' }, + { path: '', redirectTo: 'dashboard', pathMatch: 'full' }, + { + path: 'dashboard', + loadChildren: './dashboard/dashboard.module#DashboardModule' + }, { path: 'metadata', loadChildren: './metadata/metadata.module#MetadataModule' @@ -11,7 +14,9 @@ const routes: Routes = [ ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], + imports: [RouterModule.forRoot(routes, { + preloadingStrategy: PreloadAllModules + })], exports: [RouterModule] }) export class AppRoutingModule { } diff --git a/ui/src/app/core/action/configuration.action.ts b/ui/src/app/core/action/configuration.action.ts new file mode 100644 index 000000000..33c9e4c82 --- /dev/null +++ b/ui/src/app/core/action/configuration.action.ts @@ -0,0 +1,29 @@ +import { Action } from '@ngrx/store'; + +export enum ConfigurationActionTypes { + LOAD_ROLE_REQUEST = '[Config] Load User Role Request', + LOAD_ROLE_SUCCESS = '[Config] Load User Role Success', + LOAD_ROLE_FAIL = '[Config] Load User Role Fail' +} + +export class LoadRoleRequest implements Action { + readonly type = ConfigurationActionTypes.LOAD_ROLE_REQUEST; + + constructor() {} +} +export class LoadRoleSuccess implements Action { + readonly type = ConfigurationActionTypes.LOAD_ROLE_SUCCESS; + + constructor(public payload: string[]) { } +} +export class LoadRoleFail implements Action { + readonly type = ConfigurationActionTypes.LOAD_ROLE_FAIL; + + constructor() { } +} + +export type ConfigurationActionUnion = + | LoadRoleRequest + | LoadRoleSuccess + | LoadRoleFail +; diff --git a/ui/src/app/core/effect/user.effect.spec.ts b/ui/src/app/core/effect/user.effect.spec.ts index 9e67b9665..ac5827ae4 100644 --- a/ui/src/app/core/effect/user.effect.spec.ts +++ b/ui/src/app/core/effect/user.effect.spec.ts @@ -3,14 +3,10 @@ import { provideMockActions } from '@ngrx/effects/testing'; import { ReplaySubject } from 'rxjs/ReplaySubject'; import { UserEffects } from './user.effect'; -import { - UserLoadRequestAction, - UserLoadSuccessAction, - UserLoadErrorAction -} from '../action/user.action'; import { Subject, of, throwError } from 'rxjs'; import { UserService } from '../service/user.service'; -import { User } from '../model/user'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { LoadRoleSuccess, LoadRoleFail, LoadRoleRequest } from '../action/configuration.action'; describe('User Effects', () => { let effects: UserEffects; @@ -19,7 +15,9 @@ describe('User Effects', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [], + imports: [ + HttpClientTestingModule + ], providers: [ UserEffects, UserService, @@ -32,26 +30,25 @@ describe('User Effects', () => { }); it('should fire a success action', () => { - let user = {}; - spyOn(userService, 'get').and.returnValue(of(user)); + spyOn(userService, 'getRoles').and.returnValue(of(['ROLE_ADMIN'])); actions = new ReplaySubject(1); - actions.next(new UserLoadRequestAction()); + actions.next(new LoadRoleRequest()); - effects.loadUser$.subscribe(result => { - expect(result).toEqual(new UserLoadSuccessAction(user as User)); + effects.loadRoles$.subscribe(result => { + expect(result).toEqual(new LoadRoleSuccess(['ROLE_ADMIN'])); }); }); it('should fire an error action', () => { let err = new Error('404'); - spyOn(userService, 'get').and.returnValue(throwError(err)); + spyOn(userService, 'getRoles').and.returnValue(throwError(err)); actions = new ReplaySubject(1); - actions.next(new UserLoadRequestAction()); + actions.next(new LoadRoleRequest()); - effects.loadUser$.subscribe(result => { - expect(result).toEqual(new UserLoadErrorAction(err)); + effects.loadRoles$.subscribe(result => { + expect(result).toEqual(new LoadRoleFail()); }); }); }); diff --git a/ui/src/app/core/effect/user.effect.ts b/ui/src/app/core/effect/user.effect.ts index 72f3a8aac..095267bff 100644 --- a/ui/src/app/core/effect/user.effect.ts +++ b/ui/src/app/core/effect/user.effect.ts @@ -5,22 +5,24 @@ import { of } from 'rxjs'; import { map, tap, catchError, switchMap } from 'rxjs/operators'; import * as user from '../action/user.action'; +import { LoadRoleRequest, LoadRoleFail, LoadRoleSuccess, ConfigurationActionTypes } from '../action/configuration.action'; import { UserService } from '../service/user.service'; @Injectable() export class UserEffects { @Effect() - loadUser$ = this.actions$.pipe( - ofType(user.USER_LOAD_REQUEST), + loadRoles$ = this.actions$.pipe( + ofType(ConfigurationActionTypes.LOAD_ROLE_REQUEST), switchMap(() => - this.userService.get() + this.userService.getRoles() .pipe( - map(u => new user.UserLoadSuccessAction({ ...u })), - catchError(error => of(new user.UserLoadErrorAction(error))) + map(roles => new LoadRoleSuccess(roles)), + catchError(error => of(new LoadRoleFail())) ) ) ); + @Effect({dispatch: false}) redirect$ = this.actions$.pipe( ofType(user.REDIRECT), diff --git a/ui/src/app/core/reducer/configuration.reducer.ts b/ui/src/app/core/reducer/configuration.reducer.ts new file mode 100644 index 000000000..8f29e4126 --- /dev/null +++ b/ui/src/app/core/reducer/configuration.reducer.ts @@ -0,0 +1,25 @@ +import { ConfigurationActionUnion, ConfigurationActionTypes } from '../action/configuration.action'; + +export interface ConfigState { + roles: string[]; +} + +export const initialState: ConfigState = { + roles: [] +}; + +export function reducer(state = initialState, action: ConfigurationActionUnion): ConfigState { + switch (action.type) { + case ConfigurationActionTypes.LOAD_ROLE_SUCCESS: { + return { + roles: [...action.payload] + }; + } + default: { + return state; + } + } +} + + +export const getRoles = (state: ConfigState) => state.roles; diff --git a/ui/src/app/core/reducer/index.spec.ts b/ui/src/app/core/reducer/index.spec.ts index b6336a397..f14a08006 100644 --- a/ui/src/app/core/reducer/index.spec.ts +++ b/ui/src/app/core/reducer/index.spec.ts @@ -1,12 +1,14 @@ import * as fromIndex from './index'; import * as fromUser from './user.reducer'; import * as fromVersion from './version.reducer'; +import * as fromConfig from './configuration.reducer'; import { VersionInfo } from '../model/version'; describe('Core index reducers', () => { const state: fromIndex.CoreState = { user: fromUser.initialState as fromUser.UserState, - version: fromVersion.initialState as fromVersion.VersionState + version: fromVersion.initialState as fromVersion.VersionState, + config: fromConfig.initialState as fromConfig.ConfigState }; describe('getUserStateFn function', () => { diff --git a/ui/src/app/core/reducer/index.ts b/ui/src/app/core/reducer/index.ts index 15098e68e..9d9f91dec 100644 --- a/ui/src/app/core/reducer/index.ts +++ b/ui/src/app/core/reducer/index.ts @@ -5,11 +5,13 @@ import { import * as fromUser from './user.reducer'; import * as fromVersion from './version.reducer'; +import * as fromConfig from './configuration.reducer'; import * as fromRoot from '../../app.reducer'; export interface CoreState { user: fromUser.UserState; version: fromVersion.VersionState; + config: fromConfig.ConfigState; } export interface State extends fromRoot.State { @@ -18,19 +20,24 @@ export interface State extends fromRoot.State { export const reducers = { user: fromUser.reducer, - version: fromVersion.reducer + version: fromVersion.reducer, + config: fromConfig.reducer }; export const getCoreFeature = createFeatureSelector('core'); export const getUserStateFn = (state: CoreState) => state.user; export const getVersionStateFn = (state: CoreState) => state.version; +export const getConfigStateFn = (state: CoreState) => state.config; export const getUserState = createSelector(getCoreFeature, getUserStateFn); export const getUser = createSelector(getUserState, fromUser.getUser); export const isFetching = createSelector(getUserState, fromUser.isFetching); export const getUserError = createSelector(getUserState, fromUser.getError); -export const getVersionState = createSelector(getCoreFeature, (state: CoreState) => state.version); +export const getVersionState = createSelector(getCoreFeature, getVersionStateFn); export const getVersionInfo = createSelector(getVersionState, fromVersion.getVersionInfo); export const getVersionLoading = createSelector(getVersionState, fromVersion.getVersionIsLoading); export const getVersionError = createSelector(getVersionState, fromVersion.getVersionError); + +export const getConfigState = createSelector(getCoreFeature, getConfigStateFn); +export const getRoles = createSelector(getConfigState, fromConfig.getRoles); diff --git a/ui/src/app/core/service/user.service.spec.ts b/ui/src/app/core/service/user.service.spec.ts index 62ef7e5ad..55bad9bab 100644 --- a/ui/src/app/core/service/user.service.spec.ts +++ b/ui/src/app/core/service/user.service.spec.ts @@ -1,13 +1,16 @@ import { TestBed, async, inject } from '@angular/core/testing'; import { HttpModule } from '@angular/http'; import { UserService } from './user.service'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; describe('User Service', () => { let service: UserService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpModule], + imports: [ + HttpClientTestingModule + ], providers: [ UserService ] diff --git a/ui/src/app/core/service/user.service.ts b/ui/src/app/core/service/user.service.ts index 6570b4482..e44e16bce 100644 --- a/ui/src/app/core/service/user.service.ts +++ b/ui/src/app/core/service/user.service.ts @@ -1,21 +1,20 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; import { User } from '../model/user'; +import { HttpClient } from '@angular/common/http'; @Injectable() export class UserService { - constructor() { } + readonly base = `/api`; - get(): Observable { - const defUser = Object.assign({}, { - id: 'foo', - role: 'admin', - name: { - first: 'Ryan', - last: 'Mathis' - } - }); - return of(defUser); + constructor( + private http: HttpClient + ) { } + + getRoles(): Observable { + return this.http.get( + `${this.base}/supportedRoles` + ); } } /* istanbul ignore next */ diff --git a/ui/src/app/dashboard/container/dashboard.component.html b/ui/src/app/dashboard/container/dashboard.component.html new file mode 100644 index 000000000..0a9e4319f --- /dev/null +++ b/ui/src/app/dashboard/container/dashboard.component.html @@ -0,0 +1,29 @@ +
    + + +
    \ No newline at end of file diff --git a/ui/src/app/dashboard/container/dashboard.component.scss b/ui/src/app/dashboard/container/dashboard.component.scss new file mode 100644 index 000000000..5bfb3774a --- /dev/null +++ b/ui/src/app/dashboard/container/dashboard.component.scss @@ -0,0 +1,15 @@ +@import '../../../theme/palette'; + +:host { + .lead { + line-height: 36px; + } + + .nav-tabs, .nav-link.active { + border-color: $brand-primary; + } + + .nav-link:hover { + border-bottom-color: $brand-primary; + } +} \ No newline at end of file diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts new file mode 100644 index 000000000..645a19559 --- /dev/null +++ b/ui/src/app/dashboard/container/dashboard.component.ts @@ -0,0 +1,18 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Store } from '@ngrx/store'; + +import * as fromRoot from '../../app.reducer'; + +@Component({ + selector: 'dashboard-page', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './dashboard.component.html', + styleUrls: ['./dashboard.component.scss'] +}) +export class DashboardPageComponent { + + constructor( + private store: Store + ) { + } +} diff --git a/ui/src/app/dashboard/dashboard.module.ts b/ui/src/app/dashboard/dashboard.module.ts new file mode 100644 index 000000000..0b6d332b4 --- /dev/null +++ b/ui/src/app/dashboard/dashboard.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; + +import { I18nModule } from '../i18n/i18n.module'; +import { CustomWidgetRegistry } from '../schema-form/registry'; +import { WidgetRegistry } from 'ngx-schema-form'; +import { DashboardPageComponent } from './container/dashboard.component'; +import { DashboardRoutingModule } from './dashboard.routing'; +import { MetadataModule } from '../metadata/metadata.module'; +import { UserModule } from '../user/user.module'; + +@NgModule({ + imports: [ + DashboardRoutingModule, + MetadataModule, + UserModule, + I18nModule + ], + providers: [ + { provide: WidgetRegistry, useClass: CustomWidgetRegistry } + ], + declarations: [ + DashboardPageComponent + ] +}) +export class DashboardModule { } diff --git a/ui/src/app/dashboard/dashboard.routing.ts b/ui/src/app/dashboard/dashboard.routing.ts new file mode 100644 index 000000000..7030aa073 --- /dev/null +++ b/ui/src/app/dashboard/dashboard.routing.ts @@ -0,0 +1,62 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { DashboardPageComponent } from './container/dashboard.component'; +import { ManagerComponent } from '../metadata/manager/container/manager.component'; +import { MetadataPageComponent } from '../metadata/metadata.component'; +import { DashboardResolversListComponent } from '../metadata/manager/container/dashboard-resolvers-list.component'; +import { DashboardProvidersListComponent } from '../metadata/manager/container/dashboard-providers-list.component'; +import { UserPageComponent } from '../user/user.component'; +import { AdminComponent } from '../user/admin/admin.component'; +import { AdminManagementPageComponent } from '../user/admin/container/admin-management.component'; + +const routes: Routes = [ + { + path: '', + component: DashboardPageComponent, + children: [ + { path: '', redirectTo: 'metadata', pathMatch: 'prefix' }, + { + path: 'metadata', + component: MetadataPageComponent, + children: [ + { path: '', redirectTo: 'manager', pathMatch: 'prefix' }, + { + path: 'manager', + component: ManagerComponent, + children: [ + { path: '', redirectTo: 'resolvers', pathMatch: 'prefix' }, + { path: 'resolvers', component: DashboardResolversListComponent }, + { path: 'providers', component: DashboardProvidersListComponent }, + ] + } + ] + }, + { + path: 'users', + component: UserPageComponent, + children: [ + { path: '', redirectTo: 'admin', pathMatch: 'prefix' }, + { + path: 'admin', + component: AdminComponent, + children: [ + { path: '', redirectTo: 'management', pathMatch: 'prefix' }, + { + path: 'management', + component: AdminManagementPageComponent + } + ] + } + ] + } + ], + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + ], + exports: [RouterModule] +}) +export class DashboardRoutingModule { } diff --git a/ui/src/app/metadata/manager/container/manager.component.html b/ui/src/app/metadata/manager/container/manager.component.html index 7803d47e5..0680b43f9 100644 --- a/ui/src/app/metadata/manager/container/manager.component.html +++ b/ui/src/app/metadata/manager/container/manager.component.html @@ -1,11 +1 @@ -
    - - -
    + diff --git a/ui/src/app/metadata/manager/manager.routing.ts b/ui/src/app/metadata/manager/manager.routing.ts index 9f9c21179..67dbf9283 100644 --- a/ui/src/app/metadata/manager/manager.routing.ts +++ b/ui/src/app/metadata/manager/manager.routing.ts @@ -1,17 +1,3 @@ import { Routes } from '@angular/router'; -import { DashboardResolversListComponent } from './container/dashboard-resolvers-list.component'; -import { DashboardProvidersListComponent } from './container/dashboard-providers-list.component'; -import { ManagerComponent } from './container/manager.component'; -export const ManagerRoutes: Routes = [ - { path: '', redirectTo: 'manager', pathMatch: 'prefix' }, - { - path: 'manager', - component: ManagerComponent, - children: [ - { path: '', redirectTo: 'resolvers', pathMatch: 'prefix' }, - { path: 'resolvers', component: DashboardResolversListComponent }, - { path: 'providers', component: DashboardProvidersListComponent }, - ] - } -]; +export const ManagerRoutes: Routes = []; diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts index 6b437227a..19e101e75 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.ts +++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts @@ -95,7 +95,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate cancel(): void { this.clear(); - this.router.navigate(['metadata', 'manager', 'providers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'providers']); } canDeactivate( diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts index aa80ae3c9..c0a421188 100644 --- a/ui/src/app/metadata/provider/effect/collection.effect.ts +++ b/ui/src/app/metadata/provider/effect/collection.effect.ts @@ -130,7 +130,7 @@ export class CollectionEffects { createProviderSuccessRedirect$ = this.actions$.pipe( ofType(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata', 'manager', 'providers'])) + tap(provider => this.router.navigate(['dashboard', 'metadata', 'manager', 'providers'])) ); @Effect() @@ -162,7 +162,7 @@ export class CollectionEffects { map(action => action.payload), tap(provider => { this.store.dispatch(new ClearProvider()); - this.router.navigate(['metadata', 'manager', 'providers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'providers']); }) ); diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts new file mode 100644 index 000000000..bafe25f4b --- /dev/null +++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.spec.ts @@ -0,0 +1,125 @@ +import { DynamicHttpMetadataProviderWizard } from './dynamic-http.provider.form'; + + +describe('DynamicHttpMetadataProviderWizard', () => { + + const parser = DynamicHttpMetadataProviderWizard.parser; + const formatter = DynamicHttpMetadataProviderWizard.formatter; + const getValidators = DynamicHttpMetadataProviderWizard.getValidators; + + const requiredValidUntilFilter = { + maxValidityInterval: 1, + '@type': 'RequiredValidUntil' + }; + + const signatureValidationFilter = { + requireSignedRoot: true, + certificateFile: 'foo', + '@type': 'SignatureValidation' + }; + + const entityRoleWhiteListFilter = { + retainedRoles: ['foo', 'bar'], + removeRolelessEntityDescriptors: true, + removeEmptyEntitiesDescriptors: true, + '@type': 'EntityRoleWhiteList' + }; + + describe('parser', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'DynamicHttpMetadataResolver', + enabled: true, + resourceId: 'foo', + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + }; + expect( + parser(model) + ).toEqual( + { + ...model, + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'DynamicHttpMetadataResolver', + enabled: true, + resourceId: 'foo' + }; + expect( + parser(model) + ).toEqual( + model + ); + }); + }); + + describe('formatter', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'DynamicHttpMetadataResolver', + enabled: true, + resourceId: 'foo', + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + }; + expect( + formatter(model) + ).toEqual( + { + ...model, + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'DynamicHttpMetadataResolver', + enabled: true, + resourceId: 'foo' + }; + expect( + formatter(model) + ).toEqual( + model + ); + }); + }); + + describe('getValidators method', () => { + it('should return a list of validators for the ngx-schema-form', () => { + expect(Object.keys(getValidators([]))).toEqual([ + '/', + '/name', + '/xmlId', + '/metadataRequestURLConstructionScheme', + '/metadataRequestURLConstructionScheme/content', + '/metadataRequestURLConstructionScheme/@type', + '/metadataRequestURLConstructionScheme/match' + ]); + }); + }); +}); diff --git a/ui/src/app/metadata/provider/model/file-system.provider.form.spec.ts b/ui/src/app/metadata/provider/model/file-system.provider.form.spec.ts new file mode 100644 index 000000000..ae8fb4a9a --- /dev/null +++ b/ui/src/app/metadata/provider/model/file-system.provider.form.spec.ts @@ -0,0 +1,120 @@ +import { FileSystemMetadataProviderWizard } from './file-system.provider.form'; + +describe('FileSystemMetadataProviderWizard', () => { + + const parser = FileSystemMetadataProviderWizard.parser; + const formatter = FileSystemMetadataProviderWizard.formatter; + const getValidators = FileSystemMetadataProviderWizard.getValidators; + + const requiredValidUntilFilter = { + maxValidityInterval: 1, + '@type': 'RequiredValidUntil' + }; + + const signatureValidationFilter = { + requireSignedRoot: true, + certificateFile: 'foo', + '@type': 'SignatureValidation' + }; + + const entityRoleWhiteListFilter = { + retainedRoles: ['foo', 'bar'], + removeRolelessEntityDescriptors: true, + removeEmptyEntitiesDescriptors: true, + '@type': 'EntityRoleWhiteList' + }; + + describe('parser', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'FileSystemMetadataProvider', + enabled: true, + resourceId: 'foo', + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + }; + expect( + parser(model) + ).toEqual( + { + ...model, + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'FileSystemMetadataProvider', + enabled: true, + resourceId: 'foo' + }; + expect( + parser(model) + ).toEqual( + model + ); + }); + }); + + describe('formatter', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'FileSystemMetadataProvider', + enabled: true, + resourceId: 'foo', + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + }; + expect( + formatter(model) + ).toEqual( + { + ...model, + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'FileSystemMetadataProvider', + enabled: true, + resourceId: 'foo' + }; + expect( + formatter(model) + ).toEqual( + model + ); + }); + }); + + describe('getValidators method', () => { + it('should return a list of validators for the ngx-schema-form', () => { + expect(Object.keys(getValidators([]))).toEqual([ + '/', + '/name', + '/xmlId' + ]); + }); + }); +}); diff --git a/ui/src/app/metadata/provider/model/local-dynamic.provider.form.spec.ts b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.spec.ts new file mode 100644 index 000000000..3275f2f31 --- /dev/null +++ b/ui/src/app/metadata/provider/model/local-dynamic.provider.form.spec.ts @@ -0,0 +1,120 @@ +import { LocalDynamicMetadataProviderWizard } from './local-dynamic.provider.form'; + +describe('LocalDynamicMetadataProviderWizard', () => { + + const parser = LocalDynamicMetadataProviderWizard.parser; + const formatter = LocalDynamicMetadataProviderWizard.formatter; + const getValidators = LocalDynamicMetadataProviderWizard.getValidators; + + const requiredValidUntilFilter = { + maxValidityInterval: 1, + '@type': 'RequiredValidUntil' + }; + + const signatureValidationFilter = { + requireSignedRoot: true, + certificateFile: 'foo', + '@type': 'SignatureValidation' + }; + + const entityRoleWhiteListFilter = { + retainedRoles: ['foo', 'bar'], + removeRolelessEntityDescriptors: true, + removeEmptyEntitiesDescriptors: true, + '@type': 'EntityRoleWhiteList' + }; + + describe('parser', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'LocalDynamicMetadataResolver', + enabled: true, + resourceId: 'foo', + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + }; + expect( + parser(model) + ).toEqual( + { + ...model, + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'LocalDynamicMetadataResolver', + enabled: true, + resourceId: 'foo' + }; + expect( + parser(model) + ).toEqual( + model + ); + }); + }); + + describe('formatter', () => { + it('should transform the filters object to an array', () => { + let model = { + name: 'foo', + '@type': 'LocalDynamicMetadataResolver', + enabled: true, + resourceId: 'foo', + metadataFilters: [ + requiredValidUntilFilter, + signatureValidationFilter, + entityRoleWhiteListFilter + ] + }; + expect( + formatter(model) + ).toEqual( + { + ...model, + metadataFilters: { + RequiredValidUntil: requiredValidUntilFilter, + SignatureValidation: signatureValidationFilter, + EntityRoleWhiteList: entityRoleWhiteListFilter + } + } + ); + }); + + it('should return the object if metadataFilters is not provided', () => { + let model = { + name: 'foo', + '@type': 'LocalDynamicMetadataResolver', + enabled: true, + resourceId: 'foo' + }; + expect( + formatter(model) + ).toEqual( + model + ); + }); + }); + + describe('getValidators method', () => { + it('should return a list of validators for the ngx-schema-form', () => { + expect(Object.keys(getValidators([]))).toEqual([ + '/', + '/name', + '/xmlId' + ]); + }); + }); +}); diff --git a/ui/src/app/metadata/resolver/action/collection.action.ts b/ui/src/app/metadata/resolver/action/collection.action.ts index f0aebd69a..9ce6c31d4 100644 --- a/ui/src/app/metadata/resolver/action/collection.action.ts +++ b/ui/src/app/metadata/resolver/action/collection.action.ts @@ -10,6 +10,7 @@ export enum ResolverCollectionActionTypes { UPDATE_RESOLVER_REQUEST = '[Metadata Resolver] Update Request', UPDATE_RESOLVER_SUCCESS = '[Metadata Resolver] Update Success', UPDATE_RESOLVER_FAIL = '[Metadata Resolver] Update Fail', + UPDATE_RESOLVER_CONFLICT = '[Metadata Resolver] Update Conflict', LOAD_RESOLVER_REQUEST = '[Metadata Resolver Collection] Resolver REQUEST', LOAD_RESOLVER_SUCCESS = '[Metadata Resolver Collection] Resolver SUCCESS', @@ -76,6 +77,12 @@ export class UpdateResolverSuccess implements Action { export class UpdateResolverFail implements Action { readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL; + constructor(public payload: any) { } +} + +export class UpdateResolverConflict implements Action { + readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_CONFLICT; + constructor(public payload: MetadataResolver) { } } @@ -143,5 +150,6 @@ export type ResolverCollectionActionsUnion = | UpdateResolverRequest | UpdateResolverSuccess | UpdateResolverFail + | UpdateResolverConflict | UploadResolverRequest | CreateResolverFromUrlRequest; diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts index 013d5cd24..9b121c1b2 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts @@ -85,7 +85,7 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate cancel(): void { this.clear(); - this.router.navigate(['metadata', 'manager', 'resolvers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'resolvers']); } canDeactivate( @@ -97,7 +97,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate return of(true); } const diff = this.diffService.updatedDiff(this.resolver, this.latest); - console.log(diff, this.resolver, this.latest); if (diff && Object.keys(diff).length > 0) { let modal = this.modalService.open(UnsavedEntityComponent); modal.result.then( diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts index 46d2d0712..608d1d442 100644 --- a/ui/src/app/metadata/resolver/effect/collection.effects.ts +++ b/ui/src/app/metadata/resolver/effect/collection.effects.ts @@ -39,8 +39,6 @@ export class ResolverCollectionEffects { ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_REQUEST), map(action => action.payload), switchMap(provider => { - delete provider.modifiedDate; - delete provider.createdDate; return this.descriptorService .update(provider) .pipe( @@ -48,7 +46,16 @@ export class ResolverCollectionEffects { id: p.id, changes: p })), - catchError(err => of(new providerActions.UpdateResolverFail(provider))) + catchError(err => { + if (err.status === 409) { + return of(new providerActions.UpdateResolverConflict(provider)); + } + console.log(err); + return of(new providerActions.UpdateResolverFail({ + errorCode: err.status, + errorMessage: `${err.statusText} - ${err.message}` + })); + }) ); }) ); @@ -57,7 +64,7 @@ export class ResolverCollectionEffects { updateResolverSuccessRedirect$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata'])) + tap(provider => this.router.navigate(['dashboard'])) ); @Effect() @@ -67,6 +74,20 @@ export class ResolverCollectionEffects { map(provider => new providerActions.LoadResolverRequest()) ); + @Effect() + updateResolverFailNotification$ = this.actions$.pipe( + ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL), + map(action => action.payload), + withLatestFrom(this.store.select(fromI18n.getMessages)), + map(([error, messages]) => new AddNotification( + new Notification( + NotificationType.Danger, + `${error.errorCode}: ${this.i18nService.translate(error.errorMessage, null, messages)}`, + 8000 + ) + )) + ); + @Effect() selectResolver$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.SELECT), @@ -104,7 +125,7 @@ export class ResolverCollectionEffects { addResolverSuccessRedirect$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata'])) + tap(provider => this.router.navigate(['dashboard'])) ); @Effect() addResolverSuccessReload$ = this.actions$.pipe( diff --git a/ui/src/app/metadata/resolver/effect/entity.effect.ts b/ui/src/app/metadata/resolver/effect/entity.effect.ts index 1c487dec2..98a4b5891 100644 --- a/ui/src/app/metadata/resolver/effect/entity.effect.ts +++ b/ui/src/app/metadata/resolver/effect/entity.effect.ts @@ -28,11 +28,11 @@ export class EntityEffects { cancelChanges$ = this.actions$.pipe( ofType(ResolverEntityActionTypes.CANCEL), map(() => new provider.LoadResolverRequest()), - tap(() => this.router.navigate(['metadata'])) + tap(() => this.router.navigate(['dashboard'])) ); @Effect() - updateResolverSuccessRedirect$ = this.actions$.pipe( + updateResolverSuccessClear$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS), map(action => action.payload), map(p => new Clear()) @@ -40,7 +40,7 @@ export class EntityEffects { @Effect() openContention$ = this.actions$.pipe( - ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL), + ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_CONFLICT), map(action => action.payload), withLatestFrom(this.store.select(fromResolver.getSelectedResolver)), switchMap(([filter, current]) => { diff --git a/ui/src/app/user/admin/action/collection.action.ts b/ui/src/app/user/admin/action/collection.action.ts new file mode 100644 index 000000000..96c2ae937 --- /dev/null +++ b/ui/src/app/user/admin/action/collection.action.ts @@ -0,0 +1,141 @@ +import { Action } from '@ngrx/store'; +import { Update } from '@ngrx/entity'; +import { Admin } from '../model/admin'; + +export enum AdminCollectionActionTypes { + SELECT_ADMIN_REQUEST = '[Admin Collection] Select Admin Request', + SELECT_ADMIN_SUCCESS = '[Admin Collection] Select Admin Success', + SELECT_ADMIN_FAIL = '[Admin Collection] Select Admin Fail', + + UPDATE_ADMIN_REQUEST = '[Admin Collection] Update Admin Request', + UPDATE_ADMIN_SUCCESS = '[Admin Collection] Update Admin Success', + UPDATE_ADMIN_FAIL = '[Admin Collection] Update Admin Fail', + + LOAD_ADMIN_REQUEST = '[Admin Collection] Load Admin Request', + LOAD_ADMIN_SUCCESS = '[Admin Collection] Load Admin Success', + LOAD_ADMIN_ERROR = '[Admin Collection] Load Admin Error', + + ADD_ADMIN_REQUEST = '[Admin Collection] Add Admin Request', + ADD_ADMIN_SUCCESS = '[Admin Collection] Add Admin Success', + ADD_ADMIN_FAIL = '[Admin Collection] Add Admin Fail', + + REMOVE_ADMIN_REQUEST = '[Admin Collection] Remove Admin Request', + REMOVE_ADMIN_SUCCESS = '[Admin Collection] Remove Admin Success', + REMOVE_ADMIN_FAIL = '[Admin Collection] Remove Admin Fail', + + CLEAR_ADMINS = '[Admin Collection] Clear Admins' + +} + +export class SelectAdmin implements Action { + readonly type = AdminCollectionActionTypes.SELECT_ADMIN_REQUEST; + + constructor(public payload: string) { } +} + +export class SelectAdminSuccess implements Action { + readonly type = AdminCollectionActionTypes.SELECT_ADMIN_SUCCESS; + + constructor(public payload: Admin) { } +} + +export class SelectAdminFail implements Action { + readonly type = AdminCollectionActionTypes.SELECT_ADMIN_FAIL; + + constructor(public payload: Error) { } +} + +export class LoadAdminRequest implements Action { + readonly type = AdminCollectionActionTypes.LOAD_ADMIN_REQUEST; + + constructor() { } +} + +export class LoadAdminSuccess implements Action { + readonly type = AdminCollectionActionTypes.LOAD_ADMIN_SUCCESS; + + constructor(public payload: Admin[]) { } +} + +export class LoadAdminError implements Action { + readonly type = AdminCollectionActionTypes.LOAD_ADMIN_ERROR; + + constructor(public payload: any) { } +} + +export class UpdateAdminRequest implements Action { + readonly type = AdminCollectionActionTypes.UPDATE_ADMIN_REQUEST; + + constructor(public payload: Admin) { } +} + +export class UpdateAdminSuccess implements Action { + readonly type = AdminCollectionActionTypes.UPDATE_ADMIN_SUCCESS; + + constructor(public payload: Update) { } +} + +export class UpdateAdminFail implements Action { + readonly type = AdminCollectionActionTypes.UPDATE_ADMIN_FAIL; + + constructor(public payload: Admin) { } +} + +export class AddAdminRequest implements Action { + readonly type = AdminCollectionActionTypes.ADD_ADMIN_REQUEST; + + constructor(public payload: Admin) { } +} + +export class AddAdminSuccess implements Action { + readonly type = AdminCollectionActionTypes.ADD_ADMIN_SUCCESS; + + constructor(public payload: Admin) { } +} + +export class AddAdminFail implements Action { + readonly type = AdminCollectionActionTypes.ADD_ADMIN_FAIL; + + constructor(public payload: any) { } +} + +export class RemoveAdminRequest implements Action { + readonly type = AdminCollectionActionTypes.REMOVE_ADMIN_REQUEST; + + constructor(public payload: string) { } +} + +export class RemoveAdminSuccess implements Action { + readonly type = AdminCollectionActionTypes.REMOVE_ADMIN_SUCCESS; + + constructor(public payload: string) { } +} + +export class RemoveAdminFail implements Action { + readonly type = AdminCollectionActionTypes.REMOVE_ADMIN_FAIL; + + constructor(public error: Error) { } +} + +export class ClearAdmins implements Action { + readonly type = AdminCollectionActionTypes.CLEAR_ADMINS; +} + + +export type AdminCollectionActionsUnion = + | LoadAdminRequest + | LoadAdminSuccess + | LoadAdminError + | AddAdminRequest + | AddAdminSuccess + | AddAdminFail + | RemoveAdminRequest + | RemoveAdminSuccess + | RemoveAdminFail + | SelectAdmin + | SelectAdminSuccess + | SelectAdminFail + | UpdateAdminRequest + | UpdateAdminSuccess + | UpdateAdminFail + | ClearAdmins; diff --git a/ui/src/app/user/admin/admin.component.html b/ui/src/app/user/admin/admin.component.html new file mode 100644 index 000000000..90c6b6463 --- /dev/null +++ b/ui/src/app/user/admin/admin.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/ui/src/app/user/admin/admin.component.spec.ts b/ui/src/app/user/admin/admin.component.spec.ts new file mode 100644 index 000000000..4cb5cb3e0 --- /dev/null +++ b/ui/src/app/user/admin/admin.component.spec.ts @@ -0,0 +1,28 @@ +import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { AdminComponent } from './admin.component'; +import { RouterTestingModule } from '@angular/router/testing'; + +describe('Admin Root Component', () => { + let fixture: ComponentFixture; + let instance: AdminComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule + ], + declarations: [ + AdminComponent + ], + }); + + fixture = TestBed.createComponent(AdminComponent); + instance = fixture.componentInstance; + }); + + it('should compile', () => { + fixture.detectChanges(); + + expect(fixture).toBeDefined(); + }); +}); diff --git a/ui/src/app/user/admin/admin.component.ts b/ui/src/app/user/admin/admin.component.ts new file mode 100644 index 000000000..b3314e7ec --- /dev/null +++ b/ui/src/app/user/admin/admin.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'admin-page', + templateUrl: './admin.component.html', + styleUrls: [] +}) +export class AdminComponent { + constructor() { } +} diff --git a/ui/src/app/user/admin/admin.module.ts b/ui/src/app/user/admin/admin.module.ts new file mode 100644 index 000000000..f15e062dc --- /dev/null +++ b/ui/src/app/user/admin/admin.module.ts @@ -0,0 +1,56 @@ +import { NgModule, ModuleWithProviders } from '@angular/core'; +import { HttpClientModule } from '@angular/common/http'; +import { RouterModule } from '@angular/router'; +import { CommonModule } from '@angular/common'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { StoreModule } from '@ngrx/store'; + +import { SharedModule } from '../../shared/shared.module'; +import { I18nModule } from '../../i18n/i18n.module'; +import { AdminManagementPageComponent } from './container/admin-management.component'; +import { AdminComponent } from './admin.component'; +import { reducers } from './reducer'; +import { AdminService } from './service/admin.service'; +import { AdminCollectionEffects } from './effect/collection.effect'; +import { EffectsModule } from '@ngrx/effects'; +import { DeleteUserDialogComponent } from './component/delete-user-dialog.component'; +import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; + +@NgModule({ + declarations: [ + AdminManagementPageComponent, + AdminComponent, + DeleteUserDialogComponent + ], + entryComponents: [ + DeleteUserDialogComponent + ], + imports: [ + CommonModule, + FormsModule, + RouterModule, + HttpClientModule, + SharedModule, + I18nModule, + NgbModalModule + ] +}) +export class UserAdminModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: RootUserAdminModule, + providers: [ + AdminService + ] + }; + } +} + +@NgModule({ + imports: [ + UserAdminModule, + StoreModule.forFeature('admin', reducers), + EffectsModule.forFeature([AdminCollectionEffects]), + ], +}) +export class RootUserAdminModule { } diff --git a/ui/src/app/user/admin/component/delete-user-dialog.component.html b/ui/src/app/user/admin/component/delete-user-dialog.component.html new file mode 100644 index 000000000..98030428c --- /dev/null +++ b/ui/src/app/user/admin/component/delete-user-dialog.component.html @@ -0,0 +1,13 @@ +
    +

    Delete User?

    +
    +
    +
    + +

    You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?

    +
    +
    +
    + + +
    \ No newline at end of file diff --git a/ui/src/app/user/admin/component/delete-user-dialog.component.ts b/ui/src/app/user/admin/component/delete-user-dialog.component.ts new file mode 100644 index 000000000..68c733517 --- /dev/null +++ b/ui/src/app/user/admin/component/delete-user-dialog.component.ts @@ -0,0 +1,14 @@ +import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core'; + +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'delete-user-dialog', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './delete-user-dialog.component.html' +}) +export class DeleteUserDialogComponent { + constructor( + public activeModal: NgbActiveModal + ) { } +} /* istanbul ignore next */ diff --git a/ui/src/app/user/admin/container/admin-management.component.html b/ui/src/app/user/admin/container/admin-management.component.html new file mode 100644 index 000000000..3f0706a7b --- /dev/null +++ b/ui/src/app/user/admin/container/admin-management.component.html @@ -0,0 +1,44 @@ +
    +
    +
    +
    +
    + User Maintenance +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    UserIdNameEmailRoleDelete?
    {{ user.username }}{{ user.firstName }} {{ user.lastName }}{{ user.emailAddress }} + + + +
    +
    +
    +
    \ No newline at end of file diff --git a/ui/src/app/user/admin/container/admin-management.component.spec.ts b/ui/src/app/user/admin/container/admin-management.component.spec.ts new file mode 100644 index 000000000..d12a61632 --- /dev/null +++ b/ui/src/app/user/admin/container/admin-management.component.spec.ts @@ -0,0 +1,57 @@ +import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { FormsModule } from '@angular/forms'; +import { StoreModule, Store, combineReducers } from '@ngrx/store'; +import * as fromAdmin from '../reducer'; +import { AdminManagementPageComponent } from './admin-management.component'; +import { MockI18nModule } from '../../../../testing/i18n.stub'; + +describe('Admin Management Page Component', () => { + let fixture: ComponentFixture; + let store: Store; + let instance: AdminManagementPageComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + StoreModule.forRoot({ + 'admin': combineReducers(fromAdmin.reducers), + }), + FormsModule, + MockI18nModule + ], + declarations: [ + AdminManagementPageComponent + ], + }); + + fixture = TestBed.createComponent(AdminManagementPageComponent); + instance = fixture.componentInstance; + store = TestBed.get(Store); + + spyOn(store, 'dispatch').and.callThrough(); + }); + + it('should compile', () => { + fixture.detectChanges(); + + expect(fixture).toBeDefined(); + }); + + /* + describe('cancel method', () => { + it('should dispatch a cancel changes action', () => { + fixture.detectChanges(); + instance.cancel(); + expect(store.dispatch).toHaveBeenCalled(); + }); + }); + + describe('preview method', () => { + it('should dispatch a cancel changes action', () => { + fixture.detectChanges(); + instance.cancel(); + expect(store.dispatch).toHaveBeenCalled(); + }); + }); + */ +}); diff --git a/ui/src/app/user/admin/container/admin-management.component.ts b/ui/src/app/user/admin/container/admin-management.component.ts new file mode 100644 index 000000000..54af32a13 --- /dev/null +++ b/ui/src/app/user/admin/container/admin-management.component.ts @@ -0,0 +1,57 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Store } from '@ngrx/store'; +import { Observable, of } from 'rxjs'; + +import * as fromRoot from '../../../app.reducer'; +import * as fromCore from '../../../core/reducer'; +import * as fromAdmin from '../reducer'; + +import { LoadAdminRequest, UpdateAdminRequest, RemoveAdminRequest } from '../action/collection.action'; +import { Admin } from '../model/admin'; +import { LoadRoleRequest } from '../../../core/action/configuration.action'; +import { ModalService } from '../../../core/service/modal.service'; +import { DeleteUserDialogComponent } from '../component/delete-user-dialog.component'; +import { map } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'admin-management-page', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './admin-management.component.html', + styleUrls: [] +}) +export class AdminManagementPageComponent { + + users$: Observable; + roles$: Observable; + + constructor( + private store: Store, + private modal: NgbModal + ) { + this.store.dispatch(new LoadAdminRequest()); + this.store.dispatch(new LoadRoleRequest()); + + this.users$ = this.store.select(fromAdmin.getAllAdmins); + this.roles$ = this.store.select(fromCore.getRoles); + } + + setUserRole(user: Admin, change: string): void { + this.store.dispatch(new UpdateAdminRequest({ + ...user, + role: change + })); + } + + deleteUser(user: string): void { + this.modal + .open(DeleteUserDialogComponent) + .result + .then( + result => this.store.dispatch(new RemoveAdminRequest(user)) + ) + .catch( + err => err + ); + } +} diff --git a/ui/src/app/user/admin/effect/collection.effect.ts b/ui/src/app/user/admin/effect/collection.effect.ts new file mode 100644 index 000000000..4958f1d8e --- /dev/null +++ b/ui/src/app/user/admin/effect/collection.effect.ts @@ -0,0 +1,63 @@ +import { Injectable } from '@angular/core'; +import { Effect, Actions, ofType } from '@ngrx/effects'; +import { Store } from '@ngrx/store'; +import { switchMap, map } from 'rxjs/operators'; + +import * as fromAdmin from '../reducer'; +import { + LoadAdminRequest, + AdminCollectionActionTypes, + LoadAdminSuccess, + UpdateAdminRequest, + UpdateAdminSuccess, + RemoveAdminRequest, + RemoveAdminSuccess +} from '../action/collection.action'; +import { AdminService } from '../service/admin.service'; + + +/* istanbul ignore next */ +@Injectable() +export class AdminCollectionEffects { + + @Effect() + loadAdminRequest$ = this.actions$.pipe( + ofType(AdminCollectionActionTypes.LOAD_ADMIN_REQUEST), + switchMap(() => this.adminService.query().pipe( + map(users => new LoadAdminSuccess(users)) + )) + ); + + @Effect() + updateAdminRequest$ = this.actions$.pipe( + ofType(AdminCollectionActionTypes.UPDATE_ADMIN_REQUEST), + map(action => action.payload), + switchMap(changes => this.adminService.update(changes).pipe( + map(user => new UpdateAdminSuccess({ + id: changes.username, + changes + })) + )) + ); + + @Effect() + removeAdminRequest$ = this.actions$.pipe( + ofType(AdminCollectionActionTypes.REMOVE_ADMIN_REQUEST), + map(action => action.payload), + switchMap(id => this.adminService.remove(id).pipe( + map(user => new RemoveAdminSuccess(id)) + )) + ); + + @Effect() + removeAdminSuccessReload$ = this.actions$.pipe( + ofType(AdminCollectionActionTypes.REMOVE_ADMIN_SUCCESS), + map(action => new LoadAdminRequest()) + ); + + constructor( + private actions$: Actions, + private adminService: AdminService, + private store: Store + ) { } +} diff --git a/ui/src/app/user/admin/model/admin-entity.ts b/ui/src/app/user/admin/model/admin-entity.ts new file mode 100644 index 000000000..8993660b2 --- /dev/null +++ b/ui/src/app/user/admin/model/admin-entity.ts @@ -0,0 +1,17 @@ +import { Admin } from './admin'; + +export class AdminEntity implements Admin { + + username: string; + firstName: string; + lastName: string; + emailAddress: string; + + role: string; + + constructor( + properties: Admin + ) { + Object.assign(this, properties); + } +} diff --git a/ui/src/app/user/admin/model/admin.ts b/ui/src/app/user/admin/model/admin.ts new file mode 100644 index 000000000..b7cd90296 --- /dev/null +++ b/ui/src/app/user/admin/model/admin.ts @@ -0,0 +1,11 @@ +export interface Admin { + createdDate?: string; + updatedDate?: string; + username: string; + firstName: string; + lastName: string; + + role: string; + + emailAddress: string; +} diff --git a/ui/src/app/user/admin/reducer/collection.reducer.spec.ts b/ui/src/app/user/admin/reducer/collection.reducer.spec.ts new file mode 100644 index 000000000..ac0349889 --- /dev/null +++ b/ui/src/app/user/admin/reducer/collection.reducer.spec.ts @@ -0,0 +1,79 @@ +import { reducer, initialState as snapshot } from './collection.reducer'; +import * as fromAdmin from './collection.reducer'; +import { + AdminCollectionActionTypes, + LoadAdminSuccess, + UpdateAdminSuccess, + RemoveAdminSuccess +} from '../action/collection.action'; +import { Admin } from '../model/admin'; + +let users = [ + { + username: 'abc', + role: 'ROLE_ADMIN', + emailAddress: 'foo@bar.com', + firstName: 'Jane', + lastName: 'Doe' + }, + { + username: 'def', + role: 'ROLE_USER', + emailAddress: 'bar@baz.com', + firstName: 'John', + lastName: 'Doe' + } +]; + +describe('Admin Collection Reducer', () => { + describe('undefined action', () => { + it('should return the default state', () => { + const result = reducer(snapshot, {} as any); + + expect(result).toEqual(snapshot); + }); + }); + + describe(`${AdminCollectionActionTypes.LOAD_ADMIN_SUCCESS}`, () => { + it('should add the loaded filters to the collection', () => { + spyOn(fromAdmin.adapter, 'addAll').and.callThrough(); + const action = new LoadAdminSuccess(users); + const result = reducer(snapshot, action); + expect(fromAdmin.adapter.addAll).toHaveBeenCalled(); + }); + }); + + describe(`${AdminCollectionActionTypes.UPDATE_ADMIN_SUCCESS}`, () => { + it('should update the filter in the collection', () => { + spyOn(fromAdmin.adapter, 'updateOne').and.callThrough(); + const update = { + id: 'abc', + changes: { role: 'DELEGATED_ADMIN' } + }; + const action = new UpdateAdminSuccess(update); + const result = reducer(snapshot, action); + expect(fromAdmin.adapter.updateOne).toHaveBeenCalled(); + }); + }); + + describe(`${AdminCollectionActionTypes.REMOVE_ADMIN_SUCCESS}`, () => { + it('should set saving to false', () => { + const action = new RemoveAdminSuccess('abc'); + expect(reducer(snapshot, action).saving).toBe(false); + }); + }); + + describe('selector methods', () => { + describe('getSelectedAdminId', () => { + it('should return the state selectedAdminId', () => { + expect(fromAdmin.getSelectedAdminId(snapshot)).toBe(snapshot.selectedAdminId); + }); + }); + + describe('getError', () => { + it('should return the state saving', () => { + expect(fromAdmin.getIsSaving(snapshot)).toBe(snapshot.saving); + }); + }); + }); +}); diff --git a/ui/src/app/user/admin/reducer/collection.reducer.ts b/ui/src/app/user/admin/reducer/collection.reducer.ts new file mode 100644 index 000000000..70d8ba9a4 --- /dev/null +++ b/ui/src/app/user/admin/reducer/collection.reducer.ts @@ -0,0 +1,54 @@ +import { EntityState, EntityAdapter, createEntityAdapter } from '@ngrx/entity'; +import { Admin } from '../model/admin'; +import { AdminCollectionActionsUnion, AdminCollectionActionTypes } from '../action/collection.action'; + +export interface CollectionState extends EntityState { + selectedAdminId: string | null; + saving: boolean; +} + +export const adapter: EntityAdapter = createEntityAdapter({ + selectId: (model: Admin) => model.username +}); + +export const initialState: CollectionState = adapter.getInitialState({ + selectedAdminId: null, + saving: false +}); + +export function reducer(state = initialState, action: AdminCollectionActionsUnion): CollectionState { + switch (action.type) { + case AdminCollectionActionTypes.LOAD_ADMIN_SUCCESS: { + let s = adapter.addAll(action.payload, { + ...state, + selectedAdminId: state.selectedAdminId + }); + return s; + } + case AdminCollectionActionTypes.UPDATE_ADMIN_SUCCESS: { + return adapter.updateOne(action.payload, { + ...state, + saving: false + }); + } + case AdminCollectionActionTypes.REMOVE_ADMIN_SUCCESS: { + return adapter.removeOne(action.payload, { + ...state, + saving: false + }); + } + + default: { + return state; + } + } +} + +export const getSelectedAdminId = (state: CollectionState) => state.selectedAdminId; +export const getIsSaving = (state: CollectionState) => state.saving; +export const { + selectIds: selectAdminIds, + selectEntities: selectAdminEntities, + selectAll: selectAllAdmins, + selectTotal: selectAdminTotal +} = adapter.getSelectors(); diff --git a/ui/src/app/user/admin/reducer/index.ts b/ui/src/app/user/admin/reducer/index.ts new file mode 100644 index 000000000..ad9dfd93f --- /dev/null +++ b/ui/src/app/user/admin/reducer/index.ts @@ -0,0 +1,33 @@ +import { createSelector, createFeatureSelector } from '@ngrx/store'; +import * as fromRoot from '../../../core/reducer'; +import * as fromCollection from './collection.reducer'; + +export interface AdminState { + collection: fromCollection.CollectionState; +} + +export const reducers = { + collection: fromCollection.reducer +}; + +export interface State extends fromRoot.State { + 'admin': AdminState; +} + +export const getCollectionFromStateFn = (state: AdminState) => state.collection; + +export const getAdminState = createFeatureSelector('admin'); + +/* + * Select pieces of Admin Collection +*/ +export const getCollectionState = createSelector(getAdminState, getCollectionFromStateFn); +export const getAllAdmins = createSelector(getCollectionState, fromCollection.selectAllAdmins); +export const getCollectionSaving = createSelector(getCollectionState, fromCollection.getIsSaving); + +export const getAdminEntities = createSelector(getCollectionState, fromCollection.selectAdminEntities); +export const getSelectedAdminId = createSelector(getCollectionState, fromCollection.getSelectedAdminId); +export const getSelectedAdmin = createSelector(getAdminEntities, getSelectedAdminId, (entities, selectedId) => { + return selectedId && entities[selectedId]; +}); +export const getAdminIds = createSelector(getCollectionState, fromCollection.selectAdminIds); diff --git a/ui/src/app/user/admin/service/admin.service.spec.ts b/ui/src/app/user/admin/service/admin.service.spec.ts new file mode 100644 index 000000000..de2a943a1 --- /dev/null +++ b/ui/src/app/user/admin/service/admin.service.spec.ts @@ -0,0 +1,76 @@ +import { TestBed, async, inject } from '@angular/core/testing'; +import { AdminService } from './admin.service'; +import { HttpTestingController, HttpClientTestingModule } from '@angular/common/http/testing'; +import { HttpRequest, HttpClientModule } from '@angular/common/http'; +import { Admin } from '../model/admin'; + +let users = [ + { + username: 'abc', + role: 'ROLE_ADMIN', + emailAddress: 'foo@bar.com', + firstName: 'Jane', + lastName: 'Doe' + }, + { + username: 'def', + role: 'ROLE_USER', + emailAddress: 'bar@baz.com', + firstName: 'John', + lastName: 'Doe' + } +]; + +describe('Admin Service', () => { + // let service: AdminService; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule, + HttpClientTestingModule + ], + providers: [ + AdminService + ] + }); + // service = TestBed.get(AdminService); + }); + + describe('query', () => { + it(`should send an expected query request`, async(inject([AdminService, HttpTestingController], + (service: AdminService, backend: HttpTestingController) => { + service.query().subscribe(); + + backend.expectOne((req: HttpRequest) => { + return req.url === '/api/admin/users' + && req.method === 'GET'; + }, `GET admin collection`); + } + ))); + }); + describe('update method', () => { + it(`should send an expected patch request`, async(inject([AdminService, HttpTestingController], + (service: AdminService, backend: HttpTestingController) => { + service.update({...users[0]}).subscribe(); + + backend.expectOne((req: HttpRequest) => { + return req.url === '/api/admin/users/abc' + && req.method === 'PATCH'; + }, `PATCH admin user`); + } + ))); + }); + describe('remove method', () => { + it(`should send an expected delete request`, async(inject([AdminService, HttpTestingController], + (service: AdminService, backend: HttpTestingController) => { + service.remove(users[0].username).subscribe(); + + backend.expectOne((req: HttpRequest) => { + return req.url === '/api/admin/users/abc' + && req.method === 'DELETE'; + }, `DELETE admin user`); + } + ))); + }); +}); diff --git a/ui/src/app/user/admin/service/admin.service.ts b/ui/src/app/user/admin/service/admin.service.ts new file mode 100644 index 000000000..7226f3de2 --- /dev/null +++ b/ui/src/app/user/admin/service/admin.service.ts @@ -0,0 +1,39 @@ +import { Injectable } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { Admin } from '../model/admin'; +import { HttpClient } from '@angular/common/http'; +import { map, catchError } from 'rxjs/operators'; +import { AdminEntity } from '../model/admin-entity'; + +@Injectable() +export class AdminService { + + private endpoint = '/admin/users'; + private base = '/api'; + + constructor( + private http: HttpClient + ) { } + query(): Observable { + return this.http.get( + `${this.base}${this.endpoint}`, {} + ).pipe( + map(users => users.map(u => new AdminEntity(u))) + ); + } + + update(user: Admin): Observable { + return this.http.patch( + `${this.base}${this.endpoint}/${user.username}`, {...user} + ); + } + + remove(userId: string): Observable { + return this.http.delete( + `${this.base}${this.endpoint}/${userId}` + ).pipe( + map(response => !!response), + catchError(() => of(false)) + ); + } +} diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html new file mode 100644 index 000000000..0680b43f9 --- /dev/null +++ b/ui/src/app/user/user.component.html @@ -0,0 +1 @@ + diff --git a/ui/src/app/user/user.component.spec.ts b/ui/src/app/user/user.component.spec.ts new file mode 100644 index 000000000..173e1409a --- /dev/null +++ b/ui/src/app/user/user.component.spec.ts @@ -0,0 +1,28 @@ +import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { UserPageComponent } from './user.component'; +import { RouterTestingModule } from '@angular/router/testing'; + +describe('User Root Component', () => { + let fixture: ComponentFixture; + let instance: UserPageComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule + ], + declarations: [ + UserPageComponent + ], + }); + + fixture = TestBed.createComponent(UserPageComponent); + instance = fixture.componentInstance; + }); + + it('should compile', () => { + fixture.detectChanges(); + + expect(fixture).toBeDefined(); + }); +}); diff --git a/ui/src/app/user/user.component.ts b/ui/src/app/user/user.component.ts new file mode 100644 index 000000000..1c571d4b0 --- /dev/null +++ b/ui/src/app/user/user.component.ts @@ -0,0 +1,12 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; + +@Component({ + selector: 'user-page', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './user.component.html', + styleUrls: [] +}) +export class UserPageComponent { + + constructor() {} +} diff --git a/ui/src/app/user/user.module.ts b/ui/src/app/user/user.module.ts new file mode 100644 index 000000000..7d83b289c --- /dev/null +++ b/ui/src/app/user/user.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; + +import { UserRoutingModule } from './user.routing'; +import { I18nModule } from '../i18n/i18n.module'; +import { CustomWidgetRegistry } from '../schema-form/registry'; +import { WidgetRegistry } from 'ngx-schema-form'; +import { UserPageComponent } from './user.component'; +import { UserAdminModule } from './admin/admin.module'; +import { CommonModule } from '@angular/common'; + + +@NgModule({ + imports: [ + UserRoutingModule, + UserAdminModule.forRoot(), + CommonModule, + I18nModule + ], + providers: [ + { provide: WidgetRegistry, useClass: CustomWidgetRegistry } + ], + declarations: [ + UserPageComponent + ] +}) +export class UserModule { } diff --git a/ui/src/app/user/user.routing.ts b/ui/src/app/user/user.routing.ts new file mode 100644 index 000000000..431d0dddd --- /dev/null +++ b/ui/src/app/user/user.routing.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { UserPageComponent } from './user.component'; + + +const routes: Routes = [ + { + path: '', + component: UserPageComponent, + children: [] + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + ], + exports: [RouterModule] +}) +export class UserRoutingModule { }