apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update login method in api

Browse Source
This commit is contained in:
iIronside
2022-12-23 17:40:43 +03:00
parent 7477da270d
commit 9104b870a7
3 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/modules/api/controllers/UserController.php
View File

@ -4,16 +4,12 @@
namespace frontend\modules\api\controllers;
use common\behaviors\GsCors;
use common\classes\Debug;
use common\models\User;
use frontend\modules\api\models\LoginForm;
use Yii;
use yii\filters\auth\CompositeAuth;
use yii\filters\auth\HttpBearerAuth;
use yii\filters\ContentNegotiator;
use yii\rest\ActiveController;
use yii\helpers\ArrayHelper;
use yii\filters\auth\QueryParamAuth;
use yii\rest\ActiveController;
use yii\web\BadRequestHttpException;
use yii\web\Response;
@ -30,12 +26,6 @@ class UserController extends ActiveController
'application/json' => Response::FORMAT_JSON,
],
],
// 'authenticator' => [
// 'class' => CompositeAuth::class,
// 'authMethods' => [
// HttpBearerAuth::class,
// ],
// ],
'corsFilter' => [
'class' => GsCors::class,
'cors' => [
@ -52,15 +42,21 @@ class UserController extends ActiveController
]);
}
public function actions()
public function actions(): array
{
$action = parent::actions(); // TODO: Change the autogenerated stub
unset($action['index']);
unset($action['create']);
unset($action['update']);
unset($action['delete']);
$actions = parent::actions();
unset($actions['index']);
unset($actions['create']);
unset($actions['update']);
unset($actions['delete']);
return $actions;
}
protected function verbs(){
return [
'login' => ['POST']
];
}
public function actionLogin()
{
@ -70,6 +66,7 @@ class UserController extends ActiveController
'access_token' => $model->login(),
'access_token_expired_at' => $model->getUser()->getTokenExpiredAt(),
'id' => $model->getUser()->id,
'card_id' => $model->getUser()->userCard->id ?? null,
];
} else {
throw new BadRequestHttpException(json_encode($model->errors));

3
frontend/modules/api/models/LoginForm.php
View File

@ -47,7 +47,6 @@ class LoginForm extends Model
public function login()
{
if ($this->validate()) {
//return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
if ($this->getUser()) {
$access_token = $this->_user->generateAccessToken();
$this->_user->access_token_expired_at = date('Y-m-d', time() + static::EXPIRE_TIME);
@ -59,7 +58,7 @@ class LoginForm extends Model
return false;
}
public function getUser()
public function getUser(): ?User
{
if ($this->_user === null) {
$this->_user = User::findByUsername($this->username);