Changeset 15133

Timestamp:

07/04/08 00:48:44 (3 months ago)

Author:

kumatch

Message:

Changed the return object after authenticate().

Location:

events/phpframework/piece_framework/trunk

Files:

• libs/Phwittr/Service.php (modified) (3 diffs)
• specs/Phwittr/Authentication/NormalSpec.php (modified) (1 diff)

events/phpframework/piece_framework/trunk/libs/Phwittr/Service.php

@@ -13 +13 @@
 require_once 'Phwittr/Config.php';
 require_once 'Phwittr/Service/Exception.php';
+require_once 'Phwittr/Self.php';
 require_once 'Piece/Right/Validator/Email.php';
 
@@ -164 +165 @@
      * @param string $user
      * @param string $password
-     * @return boolean
+     * @return object
      */
     public function authenticate($name, $password)
@@ -185 +186 @@
         }
 
-        return $user;
+        $self = new Phwittr_Self($user->id);
+
+        return $self;
     }
 

events/phpframework/piece_framework/trunk/specs/Phwittr/Authentication/NormalSpec.php

@@ -58 +58 @@
     }
 
-    public function it認証はユーザ名とパスワードで行い、成功するとユーザ情報が得られる()
+    public function it認証はユーザ名とパスワードで行い、成功するとphwittr_selfオブジェクトが得られる()
     {
 
-        $user = Phwittr_Service::authenticate($this->_foo->userName,
+        $self = Phwittr_Service::authenticate($this->_foo->userName,
                                               $this->_foo->password
                                               );
 
-        $this->spec($user->userName)->should->be($this->_foo->userName);
-        $this->spec($user->email)->should->be($this->_foo->email);
+        $this->spec($self instanceof Phwittr_Self)->should->beTrue();
+        $this->spec($self->userName)->should->be($this->_foo->userName);
+        $this->spec($self->email)->should->be($this->_foo->email);
     }
 
-    public function it認証はメールアドレスとパスワードでも行え、成功するとユーザ情報が得られる()
+    public function it認証はメールアドレスとパスワードでも行え、成功するとphwittr_selfオブジェクトが得られる()
     {
-        $user = Phwittr_Service::authenticate($this->_foo->email,
+        $self = Phwittr_Service::authenticate($this->_foo->email,
                                               $this->_foo->password
                                               );
 
-        $this->spec($user->userName)->should->be($this->_foo->userName);
-        $this->spec($user->email)->should->be($this->_foo->email);
+        $this->spec($self instanceof Phwittr_Self)->should->beTrue();
+        $this->spec($self->userName)->should->be($this->_foo->userName);
+        $this->spec($self->email)->should->be($this->_foo->email);
     }