charlesportwoodii / yii2-api-rest-components

api/actions/OneTimeKeyAction.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use yrc\rest\Action as RestAction;
 use yrc\api\models\EncryptionKey;
-use Sodium;
-use Yii;
 
 class OneTimeKeyAction extends RestAction
 {

api/actions/RefreshAction.php

Unused Use Statements -2 removed lines

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

api/models/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)
     {

Unused Use Statements -1 removed lines

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

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);
 

web/Json25519ResponseFormatter.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use yrc\web\Json25519Parser;
 use yrc\api\models\EncryptionKey;
 use yii\web\HttpException;
-
 use Yii;
 
 class Json25519ResponseFormatter extends JsonResponseFormatter