edit tests case

mmariale · mmariale · commit bddedaa167d6 · 2018-11-27T12:55:21.000-04:00
diff --git a/README.md b/README.md
@@ -178,7 +178,7 @@ for execute only the unit test execute
 ``` ./vendor/bin/codecept run unit ```
 
 run test of only file
-``` ./vendor/bin/codecept run tests/api/UserLoginCept.php```
+``` ./vendor/bin/codecept run tests/api/UserCest.php```
 
 
 
diff --git a/api/config/main.php b/api/config/main.php
@@ -65,6 +65,14 @@
                 }
             },
         ],
+        'db' => [
+            'class' => 'yii\db\Connection',
+            'dsn' => 'mysql:host=127.0.0.1;port=3306;dbname=yii_app',
+            'username' => 'root',
+            'password' => 'm4r14l3j',
+            'charset' => 'utf8',
+
+        ]
     ],
     'params' => $params,
     'controllerMap' => [
diff --git a/api/config/test.php b/api/config/test.php
@@ -18,6 +18,15 @@
 return [
     'id' => 'app-api-tests',
     'basePath' => dirname(__DIR__),
+    'components' => [
+        'db2' => [
+            'class' => 'yii\db\Connection',
+            'dsn' => 'mysql:host=127.0.0.1;dbname=yii_app_test',
+            'username' => 'root',
+            'password' => 'm4r14l3j',
+            'charset' => 'utf8',
+        ]
+    ]
 ];
 
 
diff --git a/api/config/urlRules.php b/api/config/urlRules.php
@@ -6,6 +6,7 @@
         'extraPatterns' => [
             'GET status' => 'status',
             'POST signup' => 'signup',
+            'POST register' => 'register'
         ],
         'except' => ['create', 'delete', 'update', 'view', 'index'],
     ],
diff --git a/api/modules/v1/controllers/UserController.php b/api/modules/v1/controllers/UserController.php
@@ -5,6 +5,7 @@
 
 use api\modules\v1\models\User;
 use base\rest\ActiveController;
+use phpDocumentor\Reflection\Types\Null_;
 use Yii;
 use yii\filters\auth\CompositeAuth;
 use yii\filters\auth\HttpBearerAuth;
@@ -20,7 +21,7 @@ public function behaviors()
             [
                 'class' => CompositeAuth::class,
                 // Status endpoint is inherited from the ActiveController class
-                'except' => ['status', 'signup'],
+                'except' => ['status', 'signup', 'register'],
                 'authMethods' => [
                     HttpBearerAuth::class,
                 ],
@@ -42,4 +43,31 @@ public function actionSignup()
 
     }
 
+    public function actionRegister(){
+        $model = new User();
+        $request = Yii::$app->request->post();
+
+        $model->username = $request["username"];
+        $model->password = $request["password"];
+        $model->email = $request["username"];
+
+        $user  = User::find()
+            ->where(['username' => $model->username])
+            ->one();
+
+        if($user == null){
+            $register = User::register($model);
+            return $register;
+
+        }
+        else{
+            return ["message" => "username is used by other user"];
+
+        }
+        $response = $model->register();
+
+        return $response;
+
+    }
+
 }
diff --git a/api/modules/v1/models/User.php b/api/modules/v1/models/User.php
@@ -13,9 +13,28 @@
  *
  * {@inheritdoc}
  */
-class User extends ActiveRecord
+
+/**
+ * User model
+ *
+ * @property integer $id
+ * @property string $username
+ * @property string $password_hash
+ * @property string $password_reset_token
+ * @property string $email
+ * @property string $auth_key
+ * @property string $access_token
+ * @property string $refresh_token
+ * @property integer $status
+ * @property integer $created_at
+ * @property integer $updated_at
+ * @property string $created_by
+ * @property string $updated_by
+ * @property string $password write-only password
+ */
+class User extends ActiveRecord implements IdentityInterface
 {
-    public $username;
+    public $userna;
     public $password;
     public $rememberMe = true;
 
@@ -37,11 +56,13 @@ public function rules()
     {
         return [
             // username and password are both required
-            [['username', 'password'], 'required'],
+            [['username', 'password_hash'], 'required'],
+            [['username', 'password_hash'], 'safe'],
+            [['username', 'password_hash'], 'string'],
             // rememberMe must be a boolean value
             ['rememberMe', 'boolean'],
             // password is validated by validatePassword()
-            ['password', 'validatePassword'],
+            ['password_hash', 'validatePassword'],
         ];
     }
 
@@ -54,22 +75,146 @@ public function getId()
     }
 
     /**
-     * Validates the password.
-     * This method serves as the inline validation for password.
+     * {@inheritdoc}
+     */
+    public static function findIdentity($id)
+    {
+        return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function findIdentityByAccessToken($token, $type = null)
+    {
+        return static::findOne(['access_token' => $token, 'status' => self::STATUS_ACTIVE]);
+    }
+
+    /**
+     * Generates new access token
+     */
+    public function generateAccessToken()
+    {
+        $this->access_token = Yii::$app->security->generateRandomString(32) . '_' . time();
+    }
+
+    /**
+     * Validates password
+     *
+     * @param string $password password to validate
+     * @return bool if password provided is valid for current user
+     */
+    public function validatePassword($password)
+    {
+        return Yii::$app->security->validatePassword($password, $this->password_hash);
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function validateAuthKey($authKey)
+    {
+        return $this->getAuthKey() === $authKey;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthKey()
+    {
+        return $this->auth_key;
+    }
+
+
+    /**
+     * Generates password hash from password and sets it to the model
+     *
+     * @param string $password
+     */
+    public function setPassword($password)
+    {
+        $this->password_hash = Yii::$app->security->generatePasswordHash($password);
+    }
+
+
+    /**
+     * Generates "remember me" authentication key
+     */
+    public function generateAuthKey()
+    {
+        $this->auth_key = Yii::$app->security->generateRandomString();
+    }
+
+    /**
+     * Generates new password reset token
+     */
+    public function generatePasswordResetToken()
+    {
+        $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+    }
+
+    /**
+     * Removes password reset token
+     */
+    public function removePasswordResetToken()
+    {
+        $this->password_reset_token = null;
+    }
+
+    /**
+     * Finds user by password reset token
+     *
+     * @param string $token password reset token
+     * @return static|null
+     */
+    public static function findByPasswordResetToken($token)
+    {
+        if (!static::isPasswordResetTokenValid($token)) {
+            return null;
+        }
+
+        return static::findOne([
+            'password_reset_token' => $token,
+            'status' => self::STATUS_ACTIVE,
+        ]);
+    }
+
+    /**
+     * Finds out if password reset token is valid
      *
-     * @param string $attribute the attribute currently being validated
-     * @param array $params the additional name-value pairs given in the rule
+     * @param string $token password reset token
+     * @return bool
      */
-    public function validatePassword($attribute, $params)
+    public static function isPasswordResetTokenValid($token)
     {
-        if (!$this->hasErrors()) {
-            $user = $this->getUser();
-            if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError($attribute, 'Incorrect username or password.');
-            }
+        if (empty($token)) {
+            return false;
         }
+
+        $timestamp = (int)substr($token, strrpos($token, '_') + 1);
+        $expire = Yii::$app->params['user.passwordResetTokenExpire'];
+        return $timestamp + $expire >= time();
+    }
+
+    /**
+     * Generates new refresh token
+     */
+    public function generateRefreshToken()
+    {
+        $this->refresh_token = Yii::$app->security->generateRandomString(32) . '_' . time();
+
+    }
+
+    /**
+     * Removes access token
+     */
+    public function removeRefreshToken()
+    {
+        $this->refresh_token = null;
     }
 
+
     /**
      * Finds user by [[username]]
      *
@@ -102,10 +247,43 @@ public static function findByUsername($username)
      */
     public function login()
     {
-        if ($this->validate()) {
-            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
+       $login = Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
+        if($login == true){
+            return $this->_user;
         }
+        else
+            return $login;
 
+        /*
+         if ($this->validate()) {
+            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
+        }
         return false;
+        */
+    }
+
+    public function register($data){
+
+        $user = new User();
+        $user->id= null;
+        $user->email= $data->username;
+        $user->username = $data->username;
+        $user->setPassword($data->password);
+        $user->generateAuthKey();
+        $user->generatePasswordResetToken();
+        $user->generateAccessToken();
+        $user->generateRefreshToken();
+        $user->created_at = time() /1000;
+        $user->updated_at = time() / 1000;
+
+        $user->isNewRecord = true;
+        if(!$user->save()) {
+            return $user->getErrors();
+        }
+        else {
+            return $user;
+
+        }
     }
+
 }
diff --git a/tests/api/UserCest.php b/tests/api/UserCest.php
@@ -24,14 +24,28 @@ public function tryToTest(ApiTester $I)
     }
 
     public function trySigUp(ApiTester $I){
-        $I->sendGET( $this->path.'user/signup');
+        $I->sendPOST( $this->path.'user/signup', ['username' => 'test@yopmail.com', 'password' => '123456']);
         $I->seeResponseCodeIs(HttpCode::OK); // 200
         $I->seeResponseIsJson();
         $I->canSeeResponseContainsJson([
            'success' => true,
             ]);
+        $I->seeResponseMatchesJsonType([
+            'success' => 'boolean',
+            'data' => 'array',
 
+        ]);
 
+    }
+
+    public function tryRegister(ApiTester $I){
+        $I->sendPOST( $this->path.'user/register', ['username' => 'test2@example.com', 'password' => '123456']);
+        $I->seeResponseCodeIs(HttpCode::OK);
+        $I->seeResponseIsJson();
+        $I->seeResponseMatchesJsonType([
+            'success' => 'boolean',
+            'data' => 'array',
 
+        ]);
     }
 }
