@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | /** |
23 | 23 | * Adds client connections |
24 | 24 | * @param array $clients |
25 | - * @return true |
|
25 | + * @return boolean |
|
26 | 26 | */ |
27 | 27 | public function setClients($clients = []) |
28 | 28 | { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Retrieves the queue |
38 | - * @return Disque\Client |
|
38 | + * @return Client |
|
39 | 39 | */ |
40 | 40 | public function get() |
41 | 41 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace yrc\components; |
4 | 4 | |
5 | -use Yii; |
|
6 | 5 | use yii\base\Object; |
7 | 6 | use Disque\Connection\Credentials; |
8 | 7 | use Disque\Client; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use app\forms\ChangeEmail; |
6 | 6 | use yrc\rest\Action as RestAction; |
7 | - |
|
8 | 7 | use yii\web\HttpException; |
9 | 8 | use Yii; |
10 | 9 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use app\forms\Registration; |
6 | 6 | use yrc\rest\Action as RestAction; |
7 | - |
|
8 | 7 | use yii\web\HttpException; |
9 | 8 | use Yii; |
10 | 9 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | /** |
18 | 18 | * Handles registration of users |
19 | - * @return mixed |
|
19 | + * @return boolean |
|
20 | 20 | */ |
21 | 21 | public function post($params) |
22 | 22 | { |
@@ -3,10 +3,7 @@ |
||
3 | 3 | namespace yrc\rest; |
4 | 4 | |
5 | 5 | use yii\web\HttpException; |
6 | -use yii\helpers\ArrayHelper; |
|
7 | 6 | use Yii; |
8 | -use ReflectionProperty; |
|
9 | -use ReflectionClass; |
|
10 | 7 | |
11 | 8 | abstract class Action extends \yii\base\Action |
12 | 9 | { |
@@ -9,9 +9,7 @@ |
||
9 | 9 | use yii\filters\ContentNegotiator; |
10 | 10 | use yii\web\HttpException; |
11 | 11 | use yrc\web\Response; |
12 | - |
|
13 | 12 | use Yii; |
14 | - |
|
15 | 13 | use ReflectionClass; |
16 | 14 | use ReflectionMethod; |
17 | 15 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | // Pull the exception |
31 | 31 | $exception = Yii::$app->errorHandler->exception; |
32 | - if ($exception && is_subclass_of($exception, 'yii\web\HttpException') || get_class($exception) === 'yii\web\HttpException' ) { |
|
32 | + if ($exception && is_subclass_of($exception, 'yii\web\HttpException') || get_class($exception) === 'yii\web\HttpException') { |
|
33 | 33 | $copy = $response->data; |
34 | 34 | $response->data = null; |
35 | 35 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $response->data['status'] = $status; |
65 | 65 | |
66 | 66 | if ($response->data['data'] === [] || $response->data['data'] === null) { |
67 | - $response->data['data'] = null; |
|
67 | + $response->data['data'] = null; |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 |
@@ -4,8 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use yrc\rest\Action as RestAction; |
6 | 6 | use yrc\api\models\EncryptionKey; |
7 | -use Sodium; |
|
8 | -use Yii; |
|
9 | 7 | |
10 | 8 | class OneTimeKeyAction extends RestAction |
11 | 9 | { |
@@ -4,8 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use yrc\api\actions\AuthenticationAction; |
6 | 6 | use app\models\Token; |
7 | -use yrc\api\models\TokenKeyPair; |
|
8 | -use yrc\web\Json25519Parser; |
|
9 | 7 | use yrc\rest\Action as RestAction; |
10 | 8 | use yii\helpers\ArrayHelper; |
11 | 9 | use Yii; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | - * @return \Sodium\crypto_sign_publickey |
|
48 | + * @return string |
|
49 | 49 | */ |
50 | 50 | public function getSignPublicKey() |
51 | 51 | { |
@@ -55,8 +55,7 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Generates a new auth and refresh token pair |
57 | 57 | * @param int $userId |
58 | - * @param bool $pubkey |
|
59 | - * @return array |
|
58 | + * @return Token |
|
60 | 59 | */ |
61 | 60 | public static function generate($userId = null) |
62 | 61 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace yrc\api\models; |
4 | 4 | |
5 | 5 | use Base32\Base32; |
6 | -use yrc\api\models\TokenKeyPair; |
|
7 | 6 | use Yii; |
8 | 7 | |
9 | 8 | /** |
@@ -72,7 +72,7 @@ |
||
72 | 72 | $token->user_id = $userId; |
73 | 73 | $token->access_token = \str_replace('=', '', Base32::encode(\random_bytes(32))); |
74 | 74 | $token->refresh_token = \str_replace('=', '', Base32::encode(\random_bytes(32))); |
75 | - $token->ikm = \base64_encode(\random_bytes(32)); |
|
75 | + $token->ikm = \base64_encode(\random_bytes(32)); |
|
76 | 76 | $token->secret_sign_kp = \base64_encode(\Sodium\crypto_sign_secretkey($signKp)); |
77 | 77 | $token->expires_at = \strtotime(static::TOKEN_EXPIRATION_TIME); |
78 | 78 |