import org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote;
import org.mxchange.jcontacts.contact.Contact;
import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
+import org.mxchange.jcontacts.contact.ContactUtils;
import org.mxchange.jcontacts.contact.UserContact;
import org.mxchange.jcontacts.contact.title.PersonalTitle;
-import org.mxchange.jcontacts.contact.ContactUtils;
import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
* Serial number
*/
private static final long serialVersionUID = 542_145_347_916L;
+ /**
+ * Academic academicTitle
+ */
+ private String academicTitle;
/**
* An event fired when the administrator has added a new contact
*/
private String street;
- /**
- * Academic academicTitle
- */
- private String academicTitle;
/**
* An event fired when the administrator has updated contact data
// Return it
return number;
}
+ @Override
+ public String getAcademicTitle () {
+ return this.academicTitle;
+ }
+ @Override
+ public void setAcademicTitle (final String academicTitle) {
+ this.academicTitle = academicTitle;
+ }
@Override
@SuppressWarnings ("ReturnOfDateField")
this.street = street;
}
- @Override
- public String getAcademicTitle () {
- return this.academicTitle;
- }
-
- @Override
- public void setAcademicTitle (final String academicTitle) {
- this.academicTitle = academicTitle;
- }
@Override
public Integer getZipCode () {
*/
private DialableFaxNumber faxNumber;
- /**
- * land-line number
- */
- private DialableLandLineNumber landLineNumber;
-
- /**
- * mobile number
- */
- private DialableMobileNumber mobileNumber;
/**
* Event being fired when an administrator has deleted fax number
@Inject
@Any
private Event<AdminUpdatedFaxNumberEvent> faxNumberUpdatedEvent;
+ /**
+ * land-line number
+ */
+ private DialableLandLineNumber landLineNumber;
/**
* Event being fired when an administrator has deleted land-line number
@Inject
@Any
private Event<AdminUpdatedLandLineNumberEvent> landLineNumberUpdatedEvent;
+ /**
+ * mobile number
+ */
+ private DialableMobileNumber mobileNumber;
/**
* Event being fired when an administrator has deleted mobile number
import javax.inject.Inject;
import javax.inject.Named;
import org.mxchange.jfinancials.beans.BaseFinancialsController;
-import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController;
import org.mxchange.jusercore.exceptions.UserNotFoundException;
import org.mxchange.jusercore.model.user.User;
import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
* <p>
* @author Roland Häder<roland@mxchange.org>
*/
-@Named ("confirmationLinkController")
+@Named ("userConfirmationLinkController")
@RequestScoped
public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsController implements FinancialsConfirmationLinkWebRequestController {
@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
// 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();
// 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
} 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
// 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
// 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
}
}
import org.mxchange.jusercore.exceptions.UserNotFoundException;
import org.mxchange.jusercore.exceptions.UserStatusConfirmedException;
import org.mxchange.jusercore.exceptions.UserStatusLockedException;
-import org.mxchange.jusercore.model.user.resendlink.ResendLinkSessionBeanRemote;
import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jusercore.model.user.resendlink.ResendLinkSessionBeanRemote;
import org.mxchange.jusercore.model.user.status.UserAccountStatus;
/**
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
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
}
<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>
</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}" />
</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" />
projects / jfinancials-war.git / commitdiff