Merge remote-tracking branch 'origin/master'

frontend/modules/api/models/User.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace frontend\modules\api\models;
+
+use backend\modules\card\models\UserCardSearch;
+use common\services\ProfileService;
+
+class User extends \common\models\User
+{
+
+    /**
+     * @return string[]
+     */
+    public function fields(): array
+    {
+        return [
+            'email',
+            'username',
+            'userCard' => function () {
+                if(isset($this->userCard->id)){
+                    return ProfileService::getProfileById($this->userCard->id);
+                }
+
+                return null;
+            }
+        ];
+    }
+
+}