From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 27 Sep 2010 09:37:33 +0000 (+0200)
Subject: Use hruid + token for tokenAuth instead of alias + token.
X-Git-Tag: xorg/1.0.1~153
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c3e97f0cd91404f40889397eb06f6463fb7fb404;p=platal.git

Use hruid + token for tokenAuth instead of alias + token.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index c7a5afd..db03eac 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -261,10 +261,9 @@ class XorgSession extends PlSession
     public function tokenAuth($login, $token)
     {
         $res = XDB::query('SELECT  a.uid, a.hruid
-                             FROM  aliases  AS l
-                       INNER JOIN  accounts AS a ON (l.uid = a.uid AND a.state = \'active\')
-                            WHERE  a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'',
-                           $token, $login);
+                             FROM  accounts AS a
+                            WHERE  a.token = {?} AND a.hruid = {?} AND a.state = \'active\'',
+                          $token, $login);
         if ($res->numRows() == 1) {
             return new User(null, $res->fetchOneAssoc());
         }