Completed
Push — master ( 7ad65e...127008 )
by Charles
02:01
created
api/actions/OTPAction.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use app\models\User;
6 6
 use yrc\rest\Action as RestAction;
7
-
8 7
 use yii\web\HttpException;
9 8
 use Yii;
10 9
 
Please login to merge, or discard this patch.
api/models/User.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -237,8 +237,8 @@  discard block
 block discarded – undo
237 237
         $totp = new TOTP(
238 238
             $this->email,
239 239
             $encodedSecret,
240
-            30,             // 30 second window
241
-            'sha256',       // SHA256 for the hashing algorithm
240
+            30, // 30 second window
241
+            'sha256', // SHA256 for the hashing algorithm
242 242
             6               // 6 digits
243 243
         );
244 244
 
@@ -292,8 +292,8 @@  discard block
 block discarded – undo
292 292
         $totp = new TOTP(
293 293
             $this->email,
294 294
             $this->otp_secret,
295
-            30,             // 30 second window
296
-            'sha256',       // SHA256 for the hashing algorithm
295
+            30, // 30 second window
296
+            'sha256', // SHA256 for the hashing algorithm
297 297
             6               // 6 digits
298 298
         );
299 299
 
Please login to merge, or discard this patch.
filters/auth/HMACSignatureAuth.php 4 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -129,9 +129,9 @@
 block discarded – undo
129 129
 
130 130
         // Calculate the signature string
131 131
         $signatureString = hash('sha256', $body) . "\n" .
132
-                           $request->method . "+" . $request->getUrl() . "\n" .
133
-                           $request->getHeaders()->get(self::DATE_HEADER) . "\n" .
134
-                           \base64_encode($salt);
132
+                            $request->method . "+" . $request->getUrl() . "\n" .
133
+                            $request->getHeaders()->get(self::DATE_HEADER) . "\n" .
134
+                            \base64_encode($salt);
135 135
        
136 136
         // Calculate the HMAC
137 137
         $selfHMAC = \base64_encode(\hash_hmac('sha256', $signatureString, $hkdf, true));
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
     private function isHMACSignatureValid($accessToken, $ikm, $salt, $request, $hmac = null)
93 93
     {
94 94
         static $selfHMAC = null;
95
-        static $hkdf   = null;
95
+        static $hkdf = null;
96 96
         
97 97
         // Null check the HMAC string
98 98
         if (empty($hmac) || $hmac === null) {
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,6 +87,7 @@  discard block
 block discarded – undo
87 87
      * @param string $accessToken
88 88
      * @param string $salt
89 89
      * @param \yii\web\request $request
90
+     * @param string $ikm
90 91
      * @return bool
91 92
      */
92 93
     private function isHMACSignatureValid($accessToken, $ikm, $salt, $request, $hmac = null)
@@ -152,7 +153,7 @@  discard block
 block discarded – undo
152 153
     
153 154
     /**
154 155
      * Gets the datetime drift that has occured since the request was sent
155
-     * @param yii\web\Request $request
156
+     * @param \yii\web\Request $request
156 157
      * @return int
157 158
      */
158 159
     private function getTimeDrift($request)
Please login to merge, or discard this patch.
Unused Use Statements   -3 removed lines patch added patch discarded remove patch
@@ -3,10 +3,7 @@
 block discarded – undo
3 3
 namespace yrc\filters\auth;
4 4
 
5 5
 use app\models\Token;
6
-
7
-use yii\helpers\Json;
8 6
 use yii\filters\auth\AuthMethod;
9
-
10 7
 use Yii;
11 8
 
12 9
 /**
Please login to merge, or discard this patch.
api/actions/ActivationAction.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use app\models\User;
6 6
 use yrc\rest\Action as RestAction;
7
-
8 7
 use yii\web\HttpException;
9 8
 use Yii;
10 9
 
Please login to merge, or discard this patch.
api/actions/AuthenticationAction.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     /**
18 18
      * [POST] /api/[...]/register
19 19
      * Handles registration of users
20
-     * @return mixed
20
+     * @return boolean
21 21
      */
22 22
     public static function post($params)
23 23
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use app\models\User;
6 6
 use yrc\rest\Action as RestAction;
7
-
8 7
 use yii\web\HttpException;
9 8
 use Yii;
10 9
 
Please login to merge, or discard this patch.
api/actions/RegisterAction.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     /**
18 18
      * [POST] /api/[...]/register
19 19
      * Handles registration of users
20
-     * @return mixed
20
+     * @return boolean
21 21
      */
22 22
     public static function post($params)
23 23
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use app\models\User;
6 6
 use yrc\rest\Action as RestAction;
7
-
8 7
 use yii\web\HttpException;
9 8
 use Yii;
10 9
 
Please login to merge, or discard this patch.
api/forms/Login.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace yrc\api\forms;
4 4
 
5 5
 use app\models\Token;
6
-use yii\web\UnauthorizedHttpException;
7 6
 use Yii;
8 7
 
9 8
 /**
Please login to merge, or discard this patch.
api/actions/ChangeEmailAction.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,6 @@
 block discarded – undo
4 4
 
5 5
 use app\models\User;
6 6
 use yrc\rest\Action as RestAction;
7
-
8 7
 use yii\web\HttpException;
9 8
 use Yii;
10 9
 
Please login to merge, or discard this patch.
api/forms/ChangeEmail.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace yrc\api\forms;
4 4
 
5
-use Base32\Base32;
6 5
 use Yii;
7 6
 
8 7
 /**
Please login to merge, or discard this patch.