Changeset 468 for Dev/trunk/src/client/qed-client/ui

Timestamp:

06/26/13 21:17:41 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Improved authentication

• Authentication cannot be cancelled, removing a lot of weird race conditions.
• We offer a request provider that has automatic retry in case of authentication failures.
• Reduced dependency on LoginDialog? by having it act independent based on events. Other modules can just depend on 'session'.

Location:

Dev/trunk/src/client/qed-client/ui

Files:

• LoginDialogWrapper.coffee (moved) (moved from Dev/trunk/src/client/qed-client/ui/LoginDialog.coffee) (1 diff)
• SessionMenu.coffee (modified) (2 diffs)
• templates/LoginDialog.html (deleted)
• templates/LoginDialogWrapper.html (added)

Dev/trunk/src/client/qed-client/ui/LoginDialogWrapper.coffee

@@ -1 +1 @@
 define [
     "../session",
+    "dijit/_WidgetBase",
+    "dijit/_TemplatedMixin",
     "dijit/_WidgetsInTemplateMixin",
-    "dijit/Dialog",
-    "dijit/form/ValidationTextBox",
+    "dijit/registry",
     "dojo/_base/declare",
     "dojo/_base/event",
-    "dojo/dom-construct",
-    "dojo/text!./templates/LoginDialog.html"
-], (session, _WidgetsInTemplateMixin, Dialog,
-    ValidationTextBox, declare, event,
-    domConstruct, template) ->
-    declare [Dialog,_WidgetsInTemplateMixin],
+    "dojo/_base/lang",
+    "dojo/on",
+    "dojo/text!./templates/LoginDialogWrapper.html"
+], (session, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin,
+    registry, declare, event, lang, _on, template) ->
+    declare [_WidgetBase,_TemplatedMixin,_WidgetsInTemplateMixin],
         templateString: template
-        title: "Login to QED"
-        show: () ->
-            @loginForm.reset()
+        startup: () ->
+            if @_started then return
             @inherited arguments
+            _on session, 'change', (lang.hitch @, @onUserChange)
+            @onUserChange session.get()
         onLogin: (evt) ->
-            if @loginForm.validate
+            if @loginForm.validate()
                 value = @loginForm.get 'value'
                 session.login value.username,
                               value.password
-                .then (() => @hide()),
-                      () => alert "Login failed!"
-            @hide()
+                .then () =>
+                    @loginDialog.hide()
+                , () =>
+                    alert "Login failed!"
             event.stop evt if evt
             false
-        onCancel: (evt) ->
-            @hide()
-            event.stop evt if evt
-            false
+        onUserChange: (user) ->
+            if user
+                @loginDialog.hide()
+            else
+                @loginDialog.show()

Dev/trunk/src/client/qed-client/ui/SessionMenu.coffee

@@ -1 +1 @@
 define [
     "../session",
-    "dijit/DropDownMenu",
-    "dijit/registry",
+    "./LoginDialogWrapper",
     "dijit/MenuBarItem",
     "dojo/_base/declare",
     "dojo/_base/event",
     "dojo/on"
-], (session, DropDownMenu, registry, MenuBarItem, declare, event, _on) ->
+], (session, LoginDialogWrapper, MenuBarItem, declare, event, _on) ->
     declare [MenuBarItem],
         info: null
         postCreate: () ->
-            @loginDialog = registry.byId 'loginDialog'
-            console.error "Cannot find loginDialog" if not @loginDialog
             @set 'label', "Login"
         startup: () ->
@@ -29 +26 @@
                 session.logout()
             else
-                @loginDialog.show()
+                LoginDialogWrapper.show()
             event.stop evt if evt
             false