]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sun, 9 Jul 2017 10:53:03 +0000 (12:53 +0200)
committerRoland Häder <roland@mxchange.org>
Sun, 9 Jul 2017 11:40:48 +0000 (13:40 +0200)
- renamed bean to userConfirmationLinkController
- always handle returned (mostly updated/managed) entities, then the updated
  data is being handled

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/profile/PizzaUserProfileWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/user/confirmlink/PizzaConfirmationLinkWebRequestBean.java
src/java/org/mxchange/pizzaapplication/beans/user/resendlink/PizzaResendLinkWebSessionBean.java
web/guest/user/user_confirm_account.xhtml

index d73884a5d7bed581546dfc19f912ecbf2c60e18b..ec9fcc189f24458a2be5c1b7ad58ff38111ad8b4 100644 (file)
@@ -91,15 +91,6 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement
         */
        private DialableFaxNumber faxNumber;
 
-       /**
-        * land-line number
-        */
-       private DialableLandLineNumber landLineNumber;
-
-       /**
-        * mobile number
-        */
-       private DialableMobileNumber mobileNumber;
 
        /**
         * Event being fired when an administrator has deleted fax number
@@ -114,6 +105,10 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement
        @Inject
        @Any
        private Event<AdminUpdatedFaxNumberEvent> faxNumberUpdatedEvent;
+       /**
+        * land-line number
+        */
+       private DialableLandLineNumber landLineNumber;
 
        /**
         * Event being fired when an administrator has deleted land-line number
@@ -128,6 +123,10 @@ public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implement
        @Inject
        @Any
        private Event<AdminUpdatedLandLineNumberEvent> landLineNumberUpdatedEvent;
+       /**
+        * mobile number
+        */
+       private DialableMobileNumber mobileNumber;
 
        /**
         * Event being fired when an administrator has deleted mobile number
index fe9f04a7544c6f83c1656cb97be9ba8ac8a82228..91e0c43838ec7ea323df57142ea7e61e817a427c 100644 (file)
@@ -26,8 +26,8 @@ import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
 import org.mxchange.pizzaapplication.beans.BasePizzaController;
-import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController;
 import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController;
+import org.mxchange.pizzaapplication.beans.user.login.PizzaUserLoginWebSessionController;
 
 /**
  * A web request bean for user profiles
index 23edfa6d0f174731422cab9ad4f1b4861fdb51b4..98b46a9a3afc89b008ad186e067244941bcc97dd 100644 (file)
@@ -47,7 +47,7 @@ import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController;
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */
-@Named ("confirmationLinkController")
+@Named ("userConfirmationLinkController")
 @RequestScoped
 public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController implements PizzaConfirmationLinkWebRequestController {
 
@@ -123,6 +123,9 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
 
        @Override
        public void maybeConfirmUserAccount () {
+               // Trace message
+               System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: CALLED!", this.getClass().getSimpleName())); //NOI18N
+
                // Is the confirmation key set?
                if (this.getConfirmationKey() == null) {
                        // May be null if not set
@@ -135,6 +138,9 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                // Now try to find the user in user list, first get the whole list
                List<User> users = this.userController.allUsers();
 
+               // Debug message
+               System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: users.size()={1}", this.getClass().getSimpleName(), users.size())); //NOI18N
+
                // Get iterator from it
                Iterator<User> iterator = users.iterator();
 
@@ -146,41 +152,49 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                        // Get next user
                        User next = iterator.next();
 
+                       // Debug message
+                       System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: this.confirmationKey={1},next.confirmationKey={2}", this.getClass().getSimpleName(), this.getConfirmationKey(), next.getUserConfirmKey())); //NOI18N
+
                        // Same confirmation key?
                        if (Objects.equals(this.getConfirmationKey(), next.getUserConfirmKey())) {
+                               // Debug message
+                               System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: next={1} - Aborting ...", this.getClass().getSimpleName(), next)); //NOI18N
+
                                // Found it, then set it and abort loop
                                user = next;
                                break;
                        }
                }
 
+               // Debug message
+               System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: user={1}", this.getClass().getSimpleName(), user)); //NOI18N
+
                // Is the user instance null?
                if ((null == user) || (user.getUserAccountStatus() != UserAccountStatus.UNCONFIRMED)) {
                        // Then clear this bean and the helper
                        this.beanHelper.setUser(null);
                } else {
-                       // Set user ...
-                       this.beanHelper.setUser(user);
-
-                       // ... and copy it to the controller
-                       this.beanHelper.copyUserToController();
-
                        // Try to confirm it
-                       this.confirmUserAccount();
+                       this.confirmUserAccount(user);
                }
+
+               // Trace message
+               System.out.println(MessageFormat.format("{0}.maybeConfirmAccount: EXIT!", this.getClass().getSimpleName())); //NOI18N
        }
 
        /**
         * Tries to confirm the currently set user instance (in helper).
+        * <p>
+        * @param user User instance
         */
-       private void confirmUserAccount () {
-               // Get user instance
-               User user = this.beanHelper.getUser();
+       private void confirmUserAccount (final User user) {
+               // Trace message
+               System.out.println(MessageFormat.format("{0}.confirmUserAccount: user={1} - CALLED!", this.getClass().getSimpleName(), user)); //NOI18N
 
                // Should be set
                if (null == user) {
                        // Throw NPE
-                       throw new NullPointerException("user is null");
+                       throw new NullPointerException("user is null"); //NOI18N
                } else if (user.getUserId() == null) {
                        // Abort here
                        throw new NullPointerException("user.userId is null"); //NOI18N
@@ -196,6 +210,9 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                } else if (user.getUserConfirmKey() == null) {
                        // Throw NPE
                        throw new NullPointerException("user.userConfirmKey is null"); //NOI18N
+               } else if (user.getUserConfirmKey().isEmpty()) {
+                       // Is empty string
+                       throw new IllegalArgumentException("user.userConfirmKey is empty"); //NOI18N
                }
 
                // Updated user instance
@@ -205,8 +222,14 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                        // Get base URL
                        String baseUrl = FacesUtils.generateBaseUrl();
 
+                       // Debug message
+                       System.out.println(MessageFormat.format("{0}.confirmUserAccount: baseUrl={1}", this.getClass().getSimpleName(), baseUrl)); //NOI18N
+
                        // Confirm account
                        updatedUser = this.userBean.confirmAccount(user, baseUrl);
+
+                       // Debug message
+                       System.out.println(MessageFormat.format("{0}.confirmUserAccount: updatedUser={1} - Returned from EJB", this.getClass().getSimpleName(), updatedUser)); //NOI18N
                } catch (final UserStatusConfirmedException | UserStatusLockedException ex) {
                        // Something unexpected happened
                        throw new FaceletException(MessageFormat.format("Cannot confirm user account {0}", user.getUserName()), ex); //NOI18N
@@ -215,8 +238,17 @@ public class PizzaConfirmationLinkWebRequestBean extends BasePizzaController imp
                // Fire event that the user has confirmed account
                this.userConfirmedEvent.fire(new UserConfirmedAccountEvent(updatedUser));
 
+               // Debug message
+               System.out.println(MessageFormat.format("{0}.confirmUserAccount: updatedUser={1}", this.getClass().getSimpleName(), updatedUser)); //NOI18N
+
                // Set it again in helper
                this.beanHelper.setUser(updatedUser);
+
+               // ... and copy it to the controller
+               this.beanHelper.copyUserToController();
+
+               // Trace message
+               System.out.println(MessageFormat.format("{0}.confirmUserAccount: EXIT!", this.getClass().getSimpleName())); //NOI18N
        }
 
 }
index 0410c9106f59dfd8eb5836e473b20feb08c9447f..6d4fe162926f115f92e5e9d09d4554710affc6b3 100644 (file)
@@ -134,12 +134,15 @@ public class PizzaResendLinkWebSessionBean extends BasePizzaController implement
                        throw new NullPointerException("user.userConfirmKey is null"); //NOI18N
                }
 
+               // Init managed user instance
+               User managedUser;
+
                try {
                        // Get base URL
                        String baseUrl = FacesUtils.generateBaseUrl();
 
                        // Call EJB and return redirect target
-                       this.resendLinkBean.resendConfirmationLink(user, this.localizationController.getLocale(), baseUrl);
+                       managedUser = this.resendLinkBean.resendConfirmationLink(user, this.localizationController.getLocale(), baseUrl);
                } catch (final UserNotFoundException ex) {
                        // User not found
                        this.showFacesMessage("form_resend_link:resendEmailAddress", "ERROR_USER_NOT_FOUND"); //NOI18N
@@ -150,12 +153,12 @@ public class PizzaResendLinkWebSessionBean extends BasePizzaController implement
                        return ""; //NOI18N
                }
 
-               // Fire event
-               this.userResendLinkEvent.fire(new UserResendLinkAccountEvent(user));
-
                // Clear this bean
                this.clear();
 
+               // Fire event
+               this.userResendLinkEvent.fire(new UserResendLinkAccountEvent(managedUser));
+
                // Return redirect target
                return "user_resend_done"; //NOI18N
        }
index aeb797b41f4688bfd7d613e7c009852cfbbeaba1..a49b6eaadb22c38d940d0f944c3924669f907727 100644 (file)
@@ -10,8 +10,8 @@
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
                <ui:define name="metadata">
                        <f:metadata>
-                               <f:viewParam name="confirmKey" value="#{confirmationLinkController.confirmationKey}" />
-                               <f:viewAction onPostback="true" action="#{confirmationLinkController.maybeConfirmUserAccount()}" />
+                               <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+                               <f:viewAction onPostback="true" action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
                        </f:metadata>
                </ui:define>
 
@@ -24,7 +24,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{not empty confirmationLinkController.confirmationKey}">
+                       <ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
                                <h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
                                        <div class="table_header">
                                                <h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
@@ -47,7 +47,7 @@
                                </ui:fragment>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
+                       <ui:fragment rendered="#{empty userConfirmationLinkController.confirmationKey}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
                                        <ui:param name="styleClass" value="errors" />