KAA-244: Use unified plugin structures for user verifiers and log app…

…enders. Implement user verifiers Admin Web UI

server/admin/pom.xml

@@ -211,6 +211,10 @@
             <groupId>org.kaaproject.kaa.server.common</groupId>
             <artifactId>log-shared</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kaaproject.kaa.server.common</groupId>
+            <artifactId>verifier-shared</artifactId>
+        </dependency>        
         <dependency>
             <groupId>org.versly</groupId>
             <artifactId>versly-wsdoc</artifactId>
@@ -286,6 +290,13 @@
             <classifier>flume</classifier>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.kaaproject.kaa.server.verifiers.trustful</groupId>
+            <artifactId>config</artifactId>
+            <version>${project.version}</version>
+            <classifier>trustful</classifier>
+            <scope>runtime</scope>
+        </dependency>        
     </dependencies>
     <dependencyManagement>
         <dependencies>

server/admin/src/main/java/com/google/gwt/i18n/client/LocalizableResource.properties

@@ -39,6 +39,8 @@ addNewTenant = Add a tenant
 
 addNewUser = Add a new user
 
+addNewUserVerifier = Add new user verifier
+
 addNotificationSchema = Add a notification schema
 
 addNotificationTopic = Add a notification topic
@@ -49,6 +51,8 @@ addProfileSchema = Add a profile schema
 
 addSchema = Add schema
 
+addUserVerifier = Add user verifier
+
 add_topic_to_ep = Add a topic to the endpoint group
 
 aefMap = Event family mapping
@@ -103,6 +107,8 @@ configurationSchemas = Configuration schemas
 
 configurations = Configurations
 
+confirmDelivery = Confirm delivery
+
 cpp = C++
 
 dateCreated = Date created
@@ -213,8 +219,6 @@ login = Login
 
 mandatory = Mandatory
 
-confirmDelivery = Confirm delivery
-
 maxVersion = Max schema version
 
 minVersion = Min schema version
@@ -359,6 +363,8 @@ tenants = Tenants
 
 title = Title
 
+type = Type
+
 upload = Upload
 
 uploadFromFile = Upload from file
@@ -369,6 +375,12 @@ userDetails = User details
 
 userName = Username
 
+userVerifier = User Verifier
+
+userVerifierDetails = User Verifier details
+
+userVerifiers = User Verifiers
+
 user_email_not_defined = Requested user doesn't have email
 
 user_email_not_found = There is no registered user with specified email
@@ -385,6 +397,8 @@ username_exists = Entered user name already in use, please choose another
 
 users = Users
 
+verifierToken = Verifier token
+
 version = Version
 
 weight = Weight

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/KaaAdminConstants.java

@@ -668,4 +668,25 @@ public interface KaaAdminConstants extends ConstantsWithLookup {
     @DefaultStringValue("Server is unreachable")
     String serverIsUnreachable();
 
+    @DefaultStringValue("Type")
+    String type();
+
+    @DefaultStringValue("Verifier token")
+    String verifierToken();
+
+    @DefaultStringValue("Add user verifier")
+    String addUserVerifier();
+
+    @DefaultStringValue("User Verifier")
+    String userVerifier();
+
+    @DefaultStringValue("User Verifiers")
+    String userVerifiers();
+
+    @DefaultStringValue("Add new user verifier")
+    String addNewUserVerifier();
+
+    @DefaultStringValue("User Verifier details")
+    String userVerifierDetails();
+
 }

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/i18n/KaaAdminMessages.java

@@ -88,5 +88,11 @@ public interface KaaAdminMessages extends Messages {
 
     @DefaultMessage("An error occurred while communicating with the server. Possible causes are:<br>a) Server is not running, or <br>b) Network problem.<br>Check your network connection or try again later.")
     String serverIsUnreacheableMessage();
+
+    @DefaultMessage("Remove user verifier")
+    String removeUserVerifierTitle();
+
+    @DefaultMessage("Are you sure you want to delete selected user verifier?")
+    String removeUserVerifierQuestion();
 
 }

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/i18n/KaaAdminMessages.properties

@@ -27,6 +27,10 @@ removeTopicFromEndpointGroupQuestion = Are you sure you want to unassign selecte
 
 removeTopicFromEndpointGroupTitle = Unassign notification topic
 
+removeUserVerifierQuestion = Are you sure you want to delete selected user verifier?
+
+removeUserVerifierTitle = Remove user verifier
+
 requiredFieldsNote = Fields marked with <span class="{0}"></span> are mandatory.
 
 resetPasswordLinkWasSent = Email has been sent with further instruction to reset your password.

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactory.java

@@ -30,6 +30,7 @@
 import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto;
 import org.kaaproject.kaa.common.dto.logs.LogAppenderDto;
 import org.kaaproject.kaa.common.dto.logs.LogSchemaDto;
+import org.kaaproject.kaa.common.dto.user.UserVerifierDto;
 import org.kaaproject.kaa.server.admin.client.mvp.view.AefMapView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.ApplicationView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.BaseListView;
@@ -46,6 +47,7 @@
 import org.kaaproject.kaa.server.admin.client.mvp.view.TenantView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.TopicView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.UserProfileView;
+import org.kaaproject.kaa.server.admin.client.mvp.view.UserVerifierView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.UserView;
 import org.kaaproject.kaa.server.admin.shared.config.ConfigurationRecordFormDto;
 
@@ -122,17 +124,13 @@ public interface ClientFactory {
 
     Place getHomePlace();
     void setHomePlace(Place homePlace);
-    /**
-     * @return
-     */
+
     BaseListView<LogAppenderDto> getAppendersView();
-    /**
-     * @return
-     */
     LogAppenderView getAppenderView();
-    /**
-     * @return
-     */
     LogAppenderView getCreateAppenderView();
 
+    BaseListView<UserVerifierDto> getUserVerifiersView();
+    UserVerifierView getUserVerifierView();
+    UserVerifierView getCreateUserVerifierView();
+
 }

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/ClientFactoryImpl.java

@@ -31,6 +31,7 @@
 import org.kaaproject.kaa.common.dto.event.EventClassFamilyDto;
 import org.kaaproject.kaa.common.dto.logs.LogAppenderDto;
 import org.kaaproject.kaa.common.dto.logs.LogSchemaDto;
+import org.kaaproject.kaa.common.dto.user.UserVerifierDto;
 import org.kaaproject.kaa.server.admin.client.KaaAdmin;
 import org.kaaproject.kaa.server.admin.client.mvp.view.AefMapView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.ApplicationView;
@@ -48,6 +49,7 @@
 import org.kaaproject.kaa.server.admin.client.mvp.view.TenantView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.TopicView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.UserProfileView;
+import org.kaaproject.kaa.server.admin.client.mvp.view.UserVerifierView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.UserView;
 import org.kaaproject.kaa.server.admin.client.mvp.view.appender.LogAppenderViewImpl;
 import org.kaaproject.kaa.server.admin.client.mvp.view.appender.LogAppendersViewImpl;
@@ -82,6 +84,8 @@
 import org.kaaproject.kaa.server.admin.client.mvp.view.user.UserProfileViewImpl;
 import org.kaaproject.kaa.server.admin.client.mvp.view.user.UserViewImpl;
 import org.kaaproject.kaa.server.admin.client.mvp.view.user.UsersViewImpl;
+import org.kaaproject.kaa.server.admin.client.mvp.view.verifier.UserVerifierViewImpl;
+import org.kaaproject.kaa.server.admin.client.mvp.view.verifier.UserVerifiersViewImpl;
 import org.kaaproject.kaa.server.admin.shared.config.ConfigurationRecordFormDto;
 
 import com.google.gwt.place.shared.Place;
@@ -151,6 +155,10 @@ public class ClientFactoryImpl implements ClientFactory {
     private final LogAppenderView appenderView = new LogAppenderViewImpl(false);
     private final LogAppenderView createAppenderView = new LogAppenderViewImpl(true);
 
+    private final BaseListView<UserVerifierDto> userVerifiersView = new UserVerifiersViewImpl();
+    private final UserVerifierView userVerifierView = new UserVerifierViewImpl(false);
+    private final UserVerifierView createUserVerifierView = new UserVerifierViewImpl(true);
+
     private final BaseListView<EventClassFamilyDto> ecfsView = new EcfsViewImpl();
     private final EcfView ecfView = new EcfViewImpl(false);
     private final EcfView createEcfView = new EcfViewImpl(true);
@@ -418,4 +426,19 @@ public LogAppenderView getCreateAppenderView() {
         return createAppenderView;
     }
 
+    @Override
+    public BaseListView<UserVerifierDto> getUserVerifiersView() {
+        return userVerifiersView;
+    }
+
+    @Override
+    public UserVerifierView getUserVerifierView() {
+        return userVerifierView;
+    }
+
+    @Override
+    public UserVerifierView getCreateUserVerifierView() {
+        return createUserVerifierView;
+    }
+
 }

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AbstractPluginActivity.java

@@ -0,0 +1,73 @@
+
+package org.kaaproject.kaa.server.admin.client.mvp.activity;
+
+import java.util.List;
+
+import org.kaaproject.kaa.common.dto.plugin.PluginDto;
+import org.kaaproject.kaa.common.dto.plugin.PluginInfoDto;
+import org.kaaproject.kaa.server.admin.client.mvp.ClientFactory;
+import org.kaaproject.kaa.server.admin.client.mvp.place.AbstractPluginPlace;
+import org.kaaproject.kaa.server.admin.client.mvp.view.BasePluginView;
+import org.kaaproject.kaa.server.admin.client.util.Utils;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+
+public abstract class AbstractPluginActivity<T extends PluginDto, V extends BasePluginView, P extends AbstractPluginPlace> extends AbstractDetailsActivity<T, V, P> {
+
+    protected String applicationId;
+
+    public AbstractPluginActivity(P place, ClientFactory clientFactory) {
+        super(place, clientFactory);
+        this.applicationId = place.getApplicationId();
+    }
+
+    @Override
+    public void start(AcceptsOneWidget containerWidget, EventBus eventBus) {
+        super.start(containerWidget, eventBus);
+    }
+
+    @Override
+    protected String getEntityId(P place) {
+        return place.getPluginId();
+    }
+
+    protected abstract void loadPluginInfos(AsyncCallback<List<PluginInfoDto>> callback);
+
+    @Override
+    protected void onEntityRetrieved() {
+        loadPluginInfos(new AsyncCallback<List<PluginInfoDto>>() {
+            @Override
+            public void onSuccess(List<PluginInfoDto> result) {
+                detailsView.getPluginInfo().setAcceptableValues(result);
+            }
+            @Override
+            public void onFailure(Throwable caught) {
+                Utils.handleException(caught, detailsView);
+            }
+        });
+
+        if (!create) {
+            detailsView.getName().setValue(entity.getName());
+            detailsView.getDescription().setValue(entity.getDescription());
+            detailsView.getCreatedUsername().setValue(entity.getCreatedUsername());
+            detailsView.getCreatedDateTime().setValue(Utils.millisecondsToDateTimeString(entity.getCreatedTime()));
+            detailsView.getConfiguration().setValue(entity.getFieldConfiguration());
+            PluginInfoDto appenderInfo = 
+                    new PluginInfoDto(entity.getPluginTypeName(), entity.getFieldConfiguration(), entity.getPluginClassName());
+            detailsView.getPluginInfo().setValue(appenderInfo);
+        }
+    }
+
+    @Override
+    protected void onSave() {
+        entity.setName(detailsView.getName().getValue());
+        entity.setDescription(detailsView.getDescription().getValue());
+        PluginInfoDto appenderInfo = detailsView.getPluginInfo().getValue();
+        entity.setPluginTypeName(appenderInfo.getPluginTypeName());
+        entity.setPluginClassName(appenderInfo.getPluginClassName());
+        entity.setFieldConfiguration(detailsView.getConfiguration().getValue());
+    }
+
+}

server/admin/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/activity/AppActivityMapper.java

@@ -46,6 +46,8 @@
 import org.kaaproject.kaa.server.admin.client.mvp.place.TopicPlace;
 import org.kaaproject.kaa.server.admin.client.mvp.place.TopicsPlace;
 import org.kaaproject.kaa.server.admin.client.mvp.place.UserPlace;
+import org.kaaproject.kaa.server.admin.client.mvp.place.UserVerifierPlace;
+import org.kaaproject.kaa.server.admin.client.mvp.place.UserVerifiersPlace;
 import org.kaaproject.kaa.server.admin.client.mvp.place.UsersPlace;
 import org.kaaproject.kaa.server.admin.client.mvp.place.UserProfilePlace;
 
@@ -174,6 +176,12 @@ else if (clazz ==  LogAppendersPlace.class) {
             else if (clazz ==  LogAppenderPlace.class) {
                 return new LogAppenderActivity((LogAppenderPlace) place, clientFactory);
             }
+            else if (clazz ==  UserVerifiersPlace.class) {
+                return new UserVerifiersActivity((UserVerifiersPlace) place, clientFactory);
+            }
+            else if (clazz ==  UserVerifierPlace.class) {
+                return new UserVerifierActivity((UserVerifierPlace) place, clientFactory);
+            }
 
         }