maded applications editable, made UUID visible

account-ui/src/main/filters/production.properties

@@ -4,14 +4,14 @@ ldap.url = ldaps://host:port
 ## we will use provided username / password from webapplication
 ldap.user = user
 ldap.password = secret
-ldap.suffix = @diebold.com
+ldap.principalSuffix = @primarySuffix
-ldap.fallbackSuffix = @dieboldnixdorf.com
+ldap.fallbackPrincipalSuffixes = @fallback1, @fallback2
-ldap.searchBase = dc=ad,dc=diebold,dc=com
+ldap.searchBase = dc=domain,dc=com
 ldap.searchFilter = (&(objectClass=*)(mail={0}))
 
 ## NO CHANGES BEHIND THIS LINE REQUIRED
 shiro.contextFactory = contextFactory = org.apache.shiro.realm.ldap.JndiLdapContextFactory${line.separator}contextFactory.url = ${ldap.url}${line.separator}contextFactory.systemUsername = ${ldap.user}${line.separator}contextFactory.systemPassword = ${ldap.password}${line.separator}contextFactory.environment[java.naming.security.protocol] = ssl
 shiro.passwordMatcher= passwordMatcher=org.apache.shiro.authc.credential.AllowAllCredentialsMatcher
-shiro.ldapRealm = ldapRealm = de.muehlencord.shared.account.shiro.realm.UserNameActiveDirectoryRealm${line.separator}ldapRealm.principalSuffix = ${ldap.suffix}${line.separator}ldapRealm.fallbackPrincipalSuffix = ${ldap.fallbackSuffix}${line.separator}ldapRealm.ldapContextFactory = $contextFactory${line.separator}ldapRealm.searchBase = ${ldap.searchBase}${line.separator}ldapRealm.searchFilter = ${ldap.searchFilter}${line.separator}ldapRealm.permissionsLookupEnabled=false
+shiro.ldapRealm = ldapRealm = de.muehlencord.shared.account.shiro.realm.UserNameActiveDirectoryRealm${line.separator}ldapRealm.principalSuffix = ${ldap.principalSuffix}${line.separator}ldapRealm.fallbackPrincipalSuffixes = ${ldap.fallbackPrincipalSuffixes}${line.separator}ldapRealm.ldapContextFactory = $contextFactory${line.separator}ldapRealm.searchBase = ${ldap.searchBase}${line.separator}ldapRealm.searchFilter = ${ldap.searchFilter}${line.separator}ldapRealm.permissionsLookupEnabled=false
 shiro.authcStrategy  = org.apache.shiro.authc.pam.AllSuccessfulStrategy
 shiro.realms=$jdbcRealm,$ldapRealm

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/ApplicationView.java

@@ -90,6 +90,10 @@ public class ApplicationView implements Serializable {
         }
     }
     
+    public void startEditApplication() {
+        this.editApplication = currentApplication;
+    }
+
     public void newApplication() {
         this.editApplication = new ApplicationEntity();
     }

account-ui/src/main/resources/admin-config.properties

@@ -3,20 +3,15 @@ admin.indexPage=web/index.xhtml
 #admin.dateFormat=
 #admin.breadcrumbSize=5
 admin.renderMessages=true
-#admin.renderAjaxStatus=true 
+admin.renderAjaxStatus=false
-## disable filter to redirect to login page - shiro security filter is already doing this
 admin.disableFilter=true
-#admin.renderBreadCrumb=true 
+admin.renderBreadCrumb=false
+#admin.extensionLessUrls=false
 #admin.enableSlideMenu=true
 #admin.enableRipple=true
-#admin.rippleElements= .ripplelink,button.ui-button,.ui-selectlistbox-item,.ui-multiselectlistbox-item,.ui-selectonemenu-label,.ui-selectcheckboxmenu,\
+#admin.rippleMobileOnly=true
-#.ui-autocomplete-dropdown, .ui-autocomplete-item ... (the list goes on) 
+admin.renderMenuSearch=false
-admin.skin=skin-purple-light
+#admin.renderControlSidebar=false
-#admin.autoShowNavbar=true 
-#admin.ignoredResources= 
-#admin.loadingImage=ajaxloadingbar.gif 
-#admin.extensionLessUrls=false 
-admin.renderControlSidebar=false
 #admin.controlSidebar.showOnMobile=false
 #admin.controlSidebar.leftMenuTemplate=true
 #admin.controlSidebar.fixedLayout=false
@@ -24,9 +19,20 @@ admin.renderControlSidebar=false
 #admin.controlSidebar.sidebarCollapsed=false
 #admin.controlSidebar.expandOnHover=false
 #admin.controlSidebar.fixed=false
-#admin.controlSidebar.darkSkin=true 
+admin.controlSidebar.darkSkin=false
-#admin.rippleMobileOnly=true 
-admin.renderMenuSearch=false
-## do not autohide
 admin.autoHideMessages=false
+admin.renderFormAsterisks=true
+#admin.enableMobileHeader=true
+#admin.closableLoading=true
 #admin.messagesHideTimeout=2500
+admin.skin=skin-purple-light
+#admin.autoShowNavbar=true
+#admin.loadingImage=ajaxloadingbar.gif
+#admin.iconsEffect=true
+#admin.rippleElements=.ripplelink,button.ui-button:not([class*=ui-picklist]):not([class*=ui-orderlist]),li.ui-selectlistbox-item,li.ui-multiselectlistbox-item,.ui-selectonemenu-label,.ui-selectcheckboxmenu,\
+#  .ui-autocomplete-dropdown, .ui-autocomplete-item, .ui-splitbutton-menubutton, .ui-splitbutton button.ui-button,.input-group, .ui-selectbooleanbutton, \
+#  div.ui-button,.ui-chkbox-icon, .ui-link, .form-control, .btn, .ui-sortable-column,.ui-link, .ui-tabs-nav > li,.ui-selectonemenu-trigger, \
+#  .ui-accordion-header, .treeview, .sidebar-toggle, .ui-radiobutton-icon, td[role="gridcell"], .ui-selectcheckboxmenu-trigger,.ui-paginator-page, \
+#  .ui-panelmenu-header > a, a#layout-setup, .control-sidebar div#restore-defaults > a, .control-sidebar div.ui-selectbooleancheckbox .ui-chkbox, \
+#  .control-sidebar span.control-sidebar-subheading > label, .control-sidebar a.skin-link, button.navbar-toggle, li.dropdown > a
+

account-ui/src/main/webapp/WEB-INF/web.xml

@@ -36,7 +36,7 @@
         </session-timeout>
     </session-config>
     <welcome-file-list>
-        <welcome-file>web/index.xhtml</welcome-file>
+        <welcome-file>index.xhtml</welcome-file>
     </welcome-file-list>
     <!-- Shiro Web Environment -->
     <listener>

account-ui/src/main/webapp/index.xhtml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                template="/resources/templates/template.xhtml"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
+                xmlns:shiro="http://shiro.apache.org/tags">
+
+    <ui:define name="head">
+        <meta http-equiv="refresh" content="0; URL=web/index.xhtml" />
+    </ui:define>
+    
+    <ui:define name="body">
+        <p:panel id = "redirectPanel" header="Redirect" styleClass="card box-info">
+            <h:form id="redirectForm">
+                <p:link href="web/index.xhtml" value="Home" />
+            </h:form>
+        </p:panel>
+
+    </ui:define>
+
+</ui:composition>

account-ui/src/main/webapp/web/applications.xhtml

@@ -19,7 +19,7 @@
             <h:form id="applicationForm" prependId="false">           
 
                 <div class="ui-g ui-fluid">
-                    <div class="col-sm-12 col-md-6">
+                    <div class="col-sm-12 col-md-4">
                         <p:selectOneMenu id="applicationSelect" value="#{applicationView.currentApplication}" converter="omnifaces.SelectItemsConverter" required="true">
                             <f:selectItems value="#{applicationView.allApplications}" var="app" itemLabel="#{app.applicationName}" itemValue="#{app}" />
                         </p:selectOneMenu>
@@ -27,6 +27,12 @@
                     <div class="col-sm-12 col-md-2">
                         <p:commandButton value="Select" styleClass="btn-primary btn-solid}" actionListener="#{applicationView.selectApplication}" />
                     </div>
+                    <div class="col-sm-12 col-md-2">                        
+                        <p:commandButton value="Edit" id="editButton" icon="fa fa-pen" 
+                                         update="editDialog" oncomplete="PF('editDialogVar').show();"
+                                         actionListener="#{applicationView.startEditApplication}" styleClass="btn-teal btn-block" />
+                    </div>                    
+                    
                     <div class="col-sm-12 col-md-2">                        
                         <p:commandButton value="New" id="newButton" icon="fa fa-plus" 
                                          update="editDialog" oncomplete="PF('editDialogVar').show();"
@@ -52,11 +58,22 @@
                 </p:messages>
 
                 <div class="ui-g ui-fluid">
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="applicationId" value="ID" />   
+                    </div>
+                    <div class="col-sm-12 col-md-9">
+                        <c:if test="#{empty applicationView.editApplication.id}">
+                            <p:inputText id="applicationId" value="#{applicationView.editApplication.id}" required="false"/>
+                        </c:if>
+                        <c:if test="#{!empty applicationView.editApplication.id}">
+                            <p:outputLabel id="applicationId" value="#{applicationView.editApplication.id}" />                                
+                        </c:if>                        
+                    </div>                    
                     <div class="col-sm-12 col-md-3">
                         <p:outputLabel for="applicationName" value="Application name" />   
                     </div>
-                    <div class="col-sm-12 col-md-6">
+                    <div class="col-sm-12 col-md-9">
-                        <p:inputText id="applicationName" value="#{applicationView.editApplication.applicationName}">
+                        <p:inputText id="applicationName" value="#{applicationView.editApplication.applicationName}" required="true">
                             <f:validator validatorId="uniqueApplicationValidator"/>
                         </p:inputText>
                     </div>