Merge branch 'master' of github.com:windhoney/yii2-rest-rbac

Author: windhoney

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Windhoney
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

controllers/UserController.php

@@ -45,13 +45,19 @@ public function actionIndex()
      */
     public function actionView($id)
     {
-        $result = $this->findModel($id);
+        $select = [
+            "id",
+            "username",
+            "realname",
+            "email",
+            "status",
+            "created_at",
+            "updated_at"
+        ];
+        $result = $this->findModel($id, $select);
         $result->created_at = date('Y年m月d日', $result->created_at);
-        unset($result->password_hash);
-        unset($result->auth_key);
-        unset($result->password_reset_token);
-        unset($result->dingId);
-        
+        $result->updated_at = date('Y年m月d日', $result->updated_at);
+    
         return $result;
     }
 
@@ -224,9 +230,9 @@ public function actionActivate($id)
      * @return User the loaded model
      * @throws NotFoundHttpException if the model cannot be found
      */
-    protected function findModel($id)
+    protected function findModel($id, $select = ['*'])
     {
-        if (($model = User::findOne($id)) !== null) {
+        if (($model = User::find()->andWhere(['id' => $id])->select($select)->one()) !== null) {
             return $model;
         } else {
             return false;