feat(User): Add user load by passkey

1. Add user load content by passkey. 2. Fix user cache key. 3.
Rhilip · Mar 10, 2019 · b93d94c · b93d94c
1 parent ec415ac
commit b93d94c
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 23 deletions.
diff --git a/apps/controllers/RssController.php b/apps/controllers/RssController.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Rhilip
+ * Date: 2019/3/10
+ * Time: 9:14
+ */
+
+namespace apps\controllers;
+
+
+class RssController
+{
+    public function actionIndex() {
+        app()->user->loadUserFromPasskey();
+
+
+
+        return 'TODO';
+    }
+}
diff --git a/apps/middleware/AuthMiddleware.php b/apps/middleware/AuthMiddleware.php
@@ -11,6 +11,7 @@ public function handle($callable, \Closure $next)
         list($controller, $action) = $callable;
         $controllerName = get_class($controller);
 
+        app()->user->loadUserFromCookies();
         $isAnonymousUser = app()->user->isAnonymous();
 
         if ($controllerName === \apps\controllers\AuthController::class) {

diff --git a/apps/models/form/UserConfirmForm.php b/apps/models/form/UserConfirmForm.php
@@ -68,6 +68,6 @@ public function flush()
         app()->pdo->createCommand('DELETE FROM `users_confirm` WHERE id = :id')->bindParams([
             'id' => $this->id
         ])->execute();
-        app()->redis->del('USER:content_' . $this->uid);
+        app()->redis->del('User:content_' . $this->uid);
     }
 }
diff --git a/apps/views/torrents/list.php b/apps/views/torrents/list.php
@@ -19,15 +19,15 @@
 <table class="layui-table">
     <thead>
     <tr>
-        <th class="text-center" style="width: 70px">Category</th>
+        <th class="text-center" style="width: 20px">Category</th>
         <th>Torrent</th>
-        <th class="text-center" style="width: 70px">Link</th>
-        <th class="text-center" style="width: 100px">Size</th>
-        <th class="text-center" style="width: 140px">Date</th>
-        <th class="text-center" style="width: 30px"><i class="fas fa-arrow-up" title="Seeders"></th>
-        <th class="text-center" style="width: 30px"><i class="fas fa-arrow-down" title="Leechers"></i></th>
-        <th class="text-center" style="width: 30px"><i class="fas fa-check" title="Completed"></th>
-        <th class="text-center" style="width: 70px"><i class="fas fa-user" title="Owner"></i></th>
+        <th class="text-center" style="width: 5px">Link</th>
+        <th class="text-center" style="width: 50px">Size</th>
+        <th class="text-center" style="width: 100px">Date</th>
+        <th class="text-center" style="width: 15px"><i class="fas fa-arrow-up" title="Seeders"></th>
+        <th class="text-center" style="width: 15px"><i class="fas fa-arrow-down" title="Leechers"></i></th>
+        <th class="text-center" style="width: 15px"><i class="fas fa-check" title="Completed"></th>
+        <th class="text-center" style="width: 50px"><i class="fas fa-user" title="Owner"></i></th>
     </tr>
     </thead>
     <tbody>

diff --git a/framework/User/User.php b/framework/User/User.php
@@ -16,46 +16,57 @@ class User extends Component implements UserInterface
     use UserTrait;
 
     // Cookie
-    public $sessionSaveKey = 'SESSION:user_set';
+    public $sessionSaveKey = 'User_Map:session_to_id';
     public $cookieName = 'rid';
 
     // Key of User Session
     protected $_userSessionId;
 
+    // Passkey
+    public $passkeyCacheKey = 'User_Map:passkey_to_id';
+
     private $anonymous = false;
 
     public function onRequestBefore()
     {
         parent::onRequestBefore();
-        $this->loadUser();
+        $this->anonymous = true;
     }
 
     public function onRequestAfter()
     {
         parent::onRequestAfter();
-        app()->redis->disconnect();
     }
 
     public function isAnonymous()
     {
         return $this->anonymous;
     }
 
-    public function loadUser() {
-        // TODO Load User From Passkey in some route , for example '/rss'
-        return $this->loadUserFromCookies();
-    }
-
     public function loadUserFromCookies()
     {
-        $this->_userSessionId = \Rid::app()->request->cookie($this->cookieName);
+        $this->_userSessionId = app()->request->cookie($this->cookieName);
         $userId = app()->redis->zScore($this->sessionSaveKey, $this->_userSessionId);
 
         if ($userId) {
             $this->loadUserContentById($userId);
             $this->anonymous = false;
-        } else {
-            $this->anonymous = true;
+        }
+    }
+
+    public function loadUserFromPasskey()
+    {
+        $passkey = app()->request->get('passkey');
+        $userId = app()->redis->zScore($this->passkeyCacheKey, $passkey);
+        if ($userId == false) {
+            $userId = app()->pdo->createCommand('SELECT `id` FROM `users` WHERE `passkey` = :passkey LIMIT 1')->bindParams([
+                'passkey' => $passkey
+            ])->queryScalar() ?: 0;
+            app()->redis->zAdd($this->passkeyCacheKey, $userId, $passkey);
+        }
+        if ($userId !== 0) {
+            $this->loadUserContentById($userId);
+            $this->anonymous = false;
         }
     }
 

diff --git a/framework/User/UserTrait.php b/framework/User/UserTrait.php
@@ -46,7 +46,7 @@ trait UserTrait
 
     public function loadUserContentById($id)
     {
-        $this->infoCacheKey = 'USER:id_' . $id . '_content';
+        $this->infoCacheKey = 'User:id_' . $id . '_content';
         $self = app()->redis->hGetAll($this->infoCacheKey);
         if (empty($self)) {
             $self = app()->pdo->createCommand("SELECT * FROM `users` WHERE id = :id;")->bindParams([
@@ -61,12 +61,12 @@ public function loadUserContentById($id)
 
     public function loadUserContentByName($name)
     {
-        $uid = app()->redis->hGet('USER:map_name_to_id', $name);
+        $uid = app()->redis->hGet('User_Map:name_to_id', $name);
         if (false === $uid) {
             $uid = app()->pdo->createCommand('SELECT id FROM `users` WHERE LOWER(`username`) = LOWER(:uname) LIMIT 1;')->bindParams([
                 'uname' => $name
             ])->queryScalar();
-            app()->redis->hSet('USER:map_name_to_id', $name, $uid);
+            app()->redis->hSet('User_Map:name_to_id', $name, $uid);
         }
         if ($uid) {
             $this->loadTorrentContentById($uid);