charlesportwoodii / yii2-api-rest-components

actions/OTPAction.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use app\models\User;
 use yrc\rest\Action as RestAction;
-
 use yii\web\HttpException;
 use Yii;
 

actions/RefreshAction.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use yrc\api\actions\AuthenticationAction;
 use app\models\Token;
-use yrc\models\TokenKeyPair;
-use yrc\web\Json25519Parser;
 use yrc\rest\Action as RestAction;
 use yii\helpers\ArrayHelper;
 use Yii;

actions/RegisterAction.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 {
     /**
      * Handles registration of users
-     * @return mixed
+     * @return boolean
      */
     public function post($params)
     {

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use app\forms\Registration;
 use yrc\rest\Action as RestAction;
-
 use yii\web\HttpException;
 use Yii;
 

actions/ResetPasswordAction.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use app\forms\ResetPassword;
 use yrc\rest\Action as RestAction;
-use yrc\models\Code;
-
 use yii\web\HttpException;
 use Yii;
 

forms/ChangeEmail.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace yrc\forms;
 
-use Base32\Base32;
 use Yii;
 
 /**

forms/Login.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace yrc\forms;
 
 use app\models\Token;
-use yii\web\UnauthorizedHttpException;
 use Yii;
 
 /**

forms/ResetPassword.php

Doc Comments +2 added lines

@@ -94,6 +94,8 @@
     /**
      * Validates the users OTP code, if they provided
      * @inheritdoc
+     * @param string $attributes
+     * @param string $params
      */
     public function validateOTP($attributes, $params)
     {

models/redis/Token.php

Doc Comments +2 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
     }
 
     /**
-     * @return sodium_crypto_sign_publickey
+     * @return string
      */
     public function getSignPublicKey()
     {
@@ -55,8 +55,7 @@ 
     /**
      * Generates a new auth and refresh token pair
      * @param int $userId
-     * @param bool $pubkey
-     * @return array
+     * @return Token
      */
     public static function generate($userId = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
         $token->user_id = $userId;
         $token->access_token = \str_replace('=', '', Base32::encode(\random_bytes(32)));
         $token->refresh_token = \str_replace('=', '', Base32::encode(\random_bytes(32)));
-        $token->ikm =  \base64_encode(\random_bytes(32));
+        $token->ikm = \base64_encode(\random_bytes(32));
         $token->secret_sign_kp = \base64_encode(sodium_crypto_sign_secretkey($signKp));
         $token->expires_at = \strtotime(static::TOKEN_EXPIRATION_TIME);
 

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace yrc\models\redis;
 
 use Base32\Base32;
-use yrc\models\TokenKeyPair;
 use Yii;
 
 /**

models/User.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Base32\Base32;
 use OTPHP\TOTP;
-
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
 use yii\filters\RateLimitInterface;

Spacing +4 added lines, -4 removed lines

@@ -273,8 +273,8 @@ 
         $encodedSecret = Base32::encode($secret);
         $totp = TOTP::create(
             $encodedSecret,
-            30,             // 30 second window
-            'sha256',       // SHA256 for the hashing algorithm
+            30, // 30 second window
+            'sha256', // SHA256 for the hashing algorithm
             6               // 6 digits
         );
         $totp->setLabel($this->username);
@@ -328,8 +328,8 @@ 
     {
         $totp = TOTP::create(
             $this->otp_secret,
-            30,             // 30 second window
-            'sha256',       // SHA256 for the hashing algorithm
+            30, // 30 second window
+            'sha256', // SHA256 for the hashing algorithm
             6               // 6 digits
         );