charlesportwoodii / yii2-api-rest-components

api/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;
 

api/forms/Activation.php

Unused Use Statements -1 removed lines

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

api/models/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -224,7 +224,7 @@
     
     /**
      * Provisions TOTP for the account
-     * @return boolean|string
+     * @return false|string
      */
     public function provisionOTP()
     {

Unused Use Statements -2 removed lines

@@ -3,10 +3,8 @@
 namespace yrc\api\models;
 
 use app\models\User\Token;
-
 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

@@ -237,8 +237,8 @@ 
         $totp = new TOTP(
             $this->email,
             $encodedSecret,
-            30,             // 30 second window
-            'sha256',       // SHA256 for the hashing algorithm
+            30, // 30 second window
+            'sha256', // SHA256 for the hashing algorithm
             6               // 6 digits
         );
 
@@ -292,8 +292,8 @@ 
         $totp = new TOTP(
             $this->email,
             $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
         );
 

filters/auth/HMACSignatureAuth.php

Unused Use Statements -4 removed lines

@@ -2,11 +2,7 @@
 
 namespace yrc\filters\auth;
 
-use app\models\Token;
-
-use yii\helpers\Json;
 use yii\filters\auth\AuthMethod;
-
 use Yii;
 
 /**

Indentation +3 added lines, -3 removed lines

@@ -129,9 +129,9 @@
 
         // Calculate the signature string
         $signatureString = hash('sha256', $body) . "\n" .
-                           $request->method . "+" . $request->getUrl() . "\n" .
-                           $request->getHeaders()->get(self::DATE_HEADER) . "\n" .
-                           \base64_encode($salt);
+                            $request->method . "+" . $request->getUrl() . "\n" .
+                            $request->getHeaders()->get(self::DATE_HEADER) . "\n" .
+                            \base64_encode($salt);
        
         // Calculate the HMAC
         $selfHMAC = \base64_encode(\hash_hmac('sha256', $signatureString, $hkdf, true));

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     private function isHMACSignatureValid($accessToken, $ikm, $salt, $request, $hmac = null)
     {
         static $selfHMAC = null;
-        static $hkdf   = null;
+        static $hkdf = null;
         
         // Null check the HMAC string
         if (empty($hmac) || $hmac === null) {

Doc Comments +2 added lines, -1 removed lines

@@ -87,6 +87,7 @@ 
      * @param string $accessToken
      * @param string $salt
      * @param \yii\web\request $request
+     * @param string $ikm
      * @return bool
      */
     private function isHMACSignatureValid($accessToken, $ikm, $salt, $request, $hmac = null)
@@ -152,7 +153,7 @@ 
     
     /**
      * Gets the datetime drift that has occured since the request was sent
-     * @param yii\web\Request $request
+     * @param \yii\web\Request $request
      * @return int
      */
     private function getTimeDrift($request)

components/JsonResponseFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
                 $response->data['status'] = $status;
 
                 if ($response->data['data'] === [] || $response->data['data'] === null) {
-                    $response->data['data'] =  null;
+                    $response->data['data'] = null;
                 }
             }
 

api/actions/ActivationAction.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;
 

api/actions/AuthenticationAction.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     /**
      * [POST] /api/[...]/register
      * Handles registration of users
-     * @return mixed
+     * @return boolean
      */
     public static function post($params)
     {

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;
 

api/actions/RegisterAction.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     /**
      * [POST] /api/[...]/register
      * Handles registration of users
-     * @return mixed
+     * @return boolean
      */
     public static function post($params)
     {

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;
 

api/actions/ResetPasswordAction.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;