fix Reset Users

im was a stale objects, so old emails from before reset were shown instead of new emails

(cherry picked from commit 456884e)

Author: linuxhelf

src/main/java/uk/co/bigsoft/greenmail/http/commands/BaseHandler.java

@@ -10,10 +10,13 @@ public abstract class BaseHandler implements Handler {
 	protected GreenMail gm;
 	protected Utils utils = new Utils();
 	protected Dto dto = new Dto();
-	protected ImapHostManager im = null;
 
 	public BaseHandler(GreenMail greenMail) {
 		gm = greenMail;
-		im = gm.getManagers().getUserManager().getImapHostManager();
+	}
+
+	protected ImapHostManager getIm() {
+		// can't be cached as member, or it would be a stale objekt after gm.reset() from ResetCommand
+		return gm.getManagers().getUserManager().getImapHostManager();
 	}
 }

src/main/java/uk/co/bigsoft/greenmail/http/commands/DeleteMailboxCommand.java

@@ -14,13 +14,13 @@ public DeleteMailboxCommand(GreenMail greenMail) {
 
 	@Override
 	public void handle(Context ctx) throws Exception {
-		MailFolder mb = utils.getMailbox(ctx, im);
+		MailFolder mb = utils.getMailbox(ctx, getIm());
 		if (mb.getName().equalsIgnoreCase(ImapConstants.INBOX_NAME)) {
 			ctx.json("ERROR");
 			return;
 		}
 		mb.deleteAllMessages();
-		im.getStore().deleteMailbox(mb);
+		getIm().getStore().deleteMailbox(mb);
 		mb.expunge();
 		ctx.json("OK");
 	}

src/main/java/uk/co/bigsoft/greenmail/http/commands/DeleteMessageCommand.java

@@ -16,7 +16,7 @@ public DeleteMessageCommand(GreenMail greenMail) {
 
 	@Override
 	public void handle(Context ctx) throws Exception {
-		MailFolder mailbox = utils.getMailbox(ctx, im);
+		MailFolder mailbox = utils.getMailbox(ctx, getIm());
 		long uid = utils.getUid(ctx);
 		StoredMessage sm = mailbox.getMessage(uid);
 

src/main/java/uk/co/bigsoft/greenmail/http/commands/EmlExportCommand.java

@@ -18,7 +18,7 @@ public EmlExportCommand(GreenMail greenMail) {
 
     @Override
     public void handle(Context ctx) throws Exception {
-        MailFolder mailbox = utils.getMailbox(ctx, im);
+        MailFolder mailbox = utils.getMailbox(ctx, getIm());
 		long uid = utils.getUid(ctx);
 		StoredMessage sm = mailbox.getMessage(uid);
         MimeMessage mime = sm.getMimeMessage();

src/main/java/uk/co/bigsoft/greenmail/http/commands/ImapAllMessagesCommand.java

@@ -23,7 +23,7 @@ public ImapAllMessagesCommand(GreenMail greenMail) {
 
 	@Override
 	public void handle(Context ctx) throws Exception {
-		List<MessageDto> all = getAllMessages(im.getStore());
+		List<MessageDto> all = getAllMessages(getIm().getStore());
 		ctx.json(all);
 	}
 

src/main/java/uk/co/bigsoft/greenmail/http/commands/ImapGetInBoxCommand.java

@@ -15,7 +15,7 @@ public ImapGetInBoxCommand(GreenMail greenMail) {
 	@Override
 	public void handle(Context ctx) throws Exception {
 		GreenMailUser u = utils.getUser(ctx, gm.getManagers().getUserManager());
-		MailFolder mf = im.getInbox(u);
+		MailFolder mf = getIm().getInbox(u);
 		ctx.json(dto.toMessages(mf, mf.getMessages()));
 	}
 

src/main/java/uk/co/bigsoft/greenmail/http/commands/ImapListMailBoxCommand.java

@@ -20,7 +20,7 @@ public ImapListMailBoxCommand(GreenMail greenMail) {
 	@Override
 	public void handle(Context ctx) throws Exception {
 		GreenMailUser user = utils.getUser(ctx, gm.getManagers().getUserManager());
-		Collection<MailFolder> mailboxes = im.listMailboxes(user, "*");
+		Collection<MailFolder> mailboxes = getIm().listMailboxes(user, "*");
 		ctx.json(dto.toMailFolder(mailboxes));
 	}
 

src/main/java/uk/co/bigsoft/greenmail/http/commands/ListDomainMessageCommand.java

@@ -29,7 +29,7 @@ public void handle(Context ctx) throws Exception {
 		String domain = utils.getDomain(ctx);
 		List<MessageDto> messages = new ArrayList<>();
 
-		for(MailFolder mailbox : im.getStore().listMailboxes("*")) {
+		for(MailFolder mailbox : getIm().getStore().listMailboxes("*")) {
 			ArrayList<StoredMessage> end;
 			if ("from".equals(who)) {
 				end = filterBySender(domain, mailbox.getMessages());

src/main/java/uk/co/bigsoft/greenmail/http/commands/ListUserMessageCommand.java

@@ -29,7 +29,7 @@ public void handle(Context ctx) throws Exception {
 		String email = utils.getEmail(ctx);
 		List<MessageDto> messages = new ArrayList<>();
 
-		for(MailFolder mailbox : im.getStore().listMailboxes("*")) {
+		for(MailFolder mailbox : getIm().getStore().listMailboxes("*")) {
 			ArrayList<StoredMessage> end;
 			if ("from".equals(who)) {
 				end = filterBySender(email, mailbox.getMessages());

src/main/java/uk/co/bigsoft/greenmail/http/commands/MailboxMessagesCommand.java

@@ -19,7 +19,7 @@ public MailboxMessagesCommand(GreenMail greenMail) {
 
 	@Override
 	public void handle(Context ctx) throws Exception {
-		MailFolder mailbox = utils.getMailbox(ctx, im);
+		MailFolder mailbox = utils.getMailbox(ctx, getIm());
 		Collection<StoredMessage> messages = mailbox.getMessages();
 		ctx.json(dto.toMessages(mailbox, messages));
 	}