Changeset 1506:73fd160d0a83

Timestamp:

03/09/10 21:14:41 (5 months ago)

Author:

Ferllings <cedric@…>

Branch:

default

Message:

[django] REST Auth login

Location:

src/domogik/ui/djangodomo/core

Files:

• models.py (modified) (1 diff)
• templates/login.html (modified) (1 diff)
• views.py (modified) (1 diff)

src/domogik/ui/djangodomo/core/models.py

@@ -225 +225 @@
         if resp :
             return resp
+    
+    @staticmethod
+    def Auth(login, password):
+        resp = Accounts.objects.get({'parameters':"auth/" + login + "/" + password})
+        if resp :
+            return resp

src/domogik/ui/djangodomo/core/templates/login.html

@@ -45 +45 @@
                         <li>
                             <a href="#" id="id{{ account.login }}" onclick="chooseUser('id{{ account.login }}', '{{ account.login }}');">
-                                <img src="/design/{{ request.session.user.skin_used|default:'skins/default' }}/images/userid.jpg" alt="" width="64" height="64" />{{ account.login }}
+                                <img src="/design/{{ request.session.user.skin_used|default:'skins/default' }}/images/userid.jpg" alt="" width="64" height="64" />{{ account.person.first_name }}
                             </a>
                         </li>

src/domogik/ui/djangodomo/core/views.py

@@ -100 +100 @@
         login = QueryDict.get(request.POST, "login", False)
         password = QueryDict.get(request.POST, "password", False)
-        #sys_account = __db.get_system_account_by_login_and_pass(login, password)
-        #if sys_account is not None:
-        #    user_account = __db.get_user_account_by_system_account(sys_account.id)
-        #    if user_account is not None:
-        #        first_name = user_account.first_name
-        #        last_name = user_account.last_name
-        #    else:
-        #        first_name = login
-        #        last_name = login
-        #    request.session['user'] = {
-        #        'login': sys_account.login,
-        #        'is_admin': sys_account.is_admin,
-        ##        'first_name': first_name,
-        #        'last_name': last_name,
-        #        'skin_used': sys_account.skin_used,
-        #    }
-        #    return index(request)
-        #else:
-        #    # User not found, ask again to log in
-        #    account_list = __db.list_system_accounts()
-        #    error_msg = _("Sorry unable to log in. Please check login name / password and try again.")
-        #    return __go_to_page(request, 'login.html', page_title,
-        #                       account_list=account_list, error_msg=error_msg)
-        request.session['user'] = {
-                'login': 'admin',
-                'is_admin': True,
-                'first_name': 'jojo',
-                'last_name': 'lapin',
-                'skin_used': 'skins/default'
+        try:
+            resultAuth = Accounts.Auth(login, password)
+        except ResourceNotAvailableException:
+            return render_to_response('error/ResourceNotAvailableException.html')
+            
+        if resultAuth.status == 'OK':
+            account = resultAuth.account[0]
+            request.session['user'] = {
+                'login': account.login,
+                'is_admin': (account.is_admin == "True"),
+                'first_name': account.person.first_name,
+                'last_name': account.person.last_name,
+                'skin_used': account.skin_used
             }
-        return index(request)
-
+            return index(request)
+        else:
+            # User not found, ask again to log in
+            error_msg = _("Sorry unable to log in. Please check login name / password and try again.")
+            try:
+                resultAllAccounts = Accounts.getAllUsers()
+            except ResourceNotAvailableException:
+                return render_to_response('error/ResourceNotAvailableException.html')
+            return __go_to_page(
+                request, 'login.html',
+                page_title,
+                error_msg=error_msg,
+                account_list=resultAllAccounts.account
+            )
     else:
         # User asked to log in