Fix session messaging.

Author: labkey-nicka

webapp/Connector/src/controller/Signin.js

@@ -16,6 +16,7 @@ Ext.define('Connector.controller.Signin', {
         });
 
         /* Flag that is true when an unauthorized request has been handled */
+        var MSG_KEY = 'SIGNIN';
         this.BAD_AUTH = false;
         var me = this;
 
@@ -24,7 +25,7 @@ Ext.define('Connector.controller.Signin', {
             me.BAD_AUTH = true;
             Ext.Ajax.abortAll();
             LABKEY.user.isSignedIn = false;
-            Connector.getService('Messaging').pushMessage('Your session has timed out. Please login to continue.');
+            Connector.getService('Messaging').pushMessage(MSG_KEY, 'Your session has timed out. Please login to continue.');
             window.location.reload();
             return false;
         });
@@ -35,6 +36,9 @@ Ext.define('Connector.controller.Signin', {
         });
 
         this.callParent();
+
+        /* Ensure that we clear out the messaging each time the app loads to avoid showing stale messages */
+        this._msgs = Connector.getService('Messaging').popMessages(MSG_KEY);
     },
 
     createView : function(xtype, context) {
@@ -43,6 +47,7 @@ Ext.define('Connector.controller.Signin', {
         switch (xtype) {
             case 'signin':
 
+                c.msgs = this._msgs;
                 v = Ext.create('Connector.view.Signin', c);
 
                 v.on('userSignedIn', function() { window.location.reload(); });

webapp/Connector/src/view/Signin.js

@@ -79,7 +79,7 @@ Ext.define('Connector.view.SigninForm', {
 	    }),
 
     constructor : function(config) {
-        this.callParent(config);
+        this.callParent([config]);
         this.addEvents('userSignedIn');
     },
 
@@ -90,14 +90,15 @@ Ext.define('Connector.view.SigninForm', {
 			email : Ext.util.Cookies.get(this.COOKIE_EMAIL) || ''
 		};
 
-        var msgs = Connector.getService('Messaging').popMessages(), sep = '';
-
-        Ext.each(msgs, function(msg) {
-            if (Ext.isEmpty(this.context.error)) {
-                this.context.error = '';
-            }
-            this.context.error += sep + msg.message; sep = '\n';
-        }, this);
+        var hasMsg = !Ext.isEmpty(this.msgs), sep = '';
+        if (hasMsg) {
+            Ext.each(this.msgs, function(msg) {
+                if (Ext.isEmpty(this.context.error)) {
+                    this.context.error = '';
+                }
+                this.context.error += sep + msg.message; sep = '\n';
+            }, this);
+        }
 
         this.data = this.context;
 
@@ -202,24 +203,30 @@ Ext.define('Connector.view.Signin', {
 
     ui: 'custom',
 
-    items: [{
-    	xtype: 'container',
-    	cls: 'signin-left',
-    	layout: {
-    		type: 'vbox',
-    		align: 'stretch'
-    	},
-    	flex: 1,
-    	items: [{
-    		xtype: 'homeheader'
-    	}, {
-	    	xtype: 'about',
-	    	cls: 'auto-scroll-y',
-	    	flex: 1
-	    }]
-    }, {
-    	xtype: 'signinform'
-    }],
+    initComponent : function() {
+
+        this.items = [{
+            xtype: 'container',
+            cls: 'signin-left',
+            layout: {
+                type: 'vbox',
+                align: 'stretch'
+            },
+            flex: 1,
+            items: [{
+                xtype: 'homeheader'
+            }, {
+                xtype: 'about',
+                cls: 'auto-scroll-y',
+                flex: 1
+            }]
+        },{
+            xtype: 'signinform',
+            msgs: this.msgs
+        }];
+
+        this.callParent();
+    },
 
     afterRender : function() {
     	this.callParent();