Bugfixes

frameworkwtf · Mar 1, 2018 · 75d9f61 · 75d9f61
1 parent 7219bb2
commit 75d9f61
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/Auth/Repository/RepositoryInterface.php b/src/Auth/Repository/RepositoryInterface.php
@@ -13,7 +13,7 @@ interface RepositoryInterface
      *
      * @return null|RepositoryInterface
      */
-    public function getByLogin(string $login): ?self;
+    public function getByLogin(string $login): ?Root;
 
     /**
      * Get login fields, eg: ['email', 'username'].

diff --git a/src/Auth/Repository/User.php b/src/Auth/Repository/User.php
@@ -46,7 +46,7 @@ public function login(string $login, string $password): ?Root
             return null;
         }
 
-        if (!password_verify($password, $this->hashPassword($password))) {
+        if (!password_verify($password, $user->get($this->getPasswordField()))) {
             return null;
         }
 
@@ -56,15 +56,13 @@ public function login(string $login, string $password): ?Root
     /**
      * {@inheritdoc}
      */
-    public function getByLogin(string $login): ?RepositoryInterface
+    public function getByLogin(string $login): ?Root
     {
         $entity = $this->entity($this->config('auth.entity', 'user'));
         foreach ($this->getLoginFields() as $field) {
             try {
                 if ($entity->has([$field => $login])) {
-                    $this->data = $entity->load($login, $field)->getData();
-
-                    return $this;
+                    return $entity->load($login, $field);
                 }
             } catch (\Throwable $t) {
                 //If field does not exist, exception will be thrown,
@@ -73,6 +71,6 @@ public function getByLogin(string $login): ?RepositoryInterface
             }
         }
 
-        return $null;
+        return null;
     }
 }
diff --git a/src/Auth/Storage/Cookie.php b/src/Auth/Storage/Cookie.php
@@ -17,7 +17,7 @@ public function setUser(Root $user)
             throw new \Exception('wtf/auth cookie storage requires dflydev/fig-cookies package installed');
         }
 
-        return \Dflydev\FigCookies\Cookie::create('user_id', $user->getId())
+        return \Dflydev\FigCookies\SetCookie::create('user_id', $user->getId())
                                                                   ->rememberForever()
                                                                   ->withDomain(getenv('APP_HOST'))
                                                                   ->withHttpOnly(true);

diff --git a/src/Auth/Storage/JWT.php b/src/Auth/Storage/JWT.php
@@ -29,7 +29,7 @@ public function setUser(Root $user)
             'aud' => $this->config('jwt.aud', getenv('APP_HOST')),
             'exp' => $this->config('jwt.exp', time() + 604800),
             'data' => $data,
-        ], getenv('APP_SECRET'), $this->config('jwt.algorithm'.['HS256'])[0]);
+        ], getenv('APP_SECRET'), $this->config('jwt.algorithm', ['HS256'])[0]);
     }
 
     /**
@@ -43,12 +43,14 @@ public function getUser(): ?Root
 
         // wtf/rest implementation
         if ($this->container->has('user')) {
-            return $this->user;
+            return $this->entity($this->config('auth.entity'))->setData($this->user);
         }
 
         // tuupola/slim-jwt-auth implementation
         if ($token = $this->request->getAttribute($this->config('jwt.attribute', 'token'))) {
-            return is_object($token) && property_exists($token, 'data') ? $token->data : $token;
+            $data = (array) (is_object($token) && property_exists($token, 'data') ? $token->data : ($token['data'] ?? $token));
+
+            return $this->entity($this->config('auth.entity'))->setData($data);
         }
 
         return null;