refactor jwt secrets

This commit is contained in:
Damodar Lohani
2022-05-23 06:33:59 +00:00
parent bcc0e0df18
commit 58d00055d9
3 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -1042,7 +1042,7 @@ App::post('/v1/account/jwt')
throw new Exception('No valid session found', 404, Exception::USER_SESSION_NOT_FOUND);
}
$jwt = new JWT($project->getId() == 'console' ? App::getEnv('_APP_OPENSSL_KEY_V1') : $project->getAttribute('jwtSecret'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$jwt = new JWT($project->getAttribute('jwtSecrets'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$response->setStatusCode(Response::STATUS_CODE_CREATED);
$response->dynamic(new Document(['jwt' => $jwt->encode([
+1 -1
View File
@@ -928,7 +928,7 @@ App::post('/v1/functions/:functionId/executions')
}
if(!$current->isEmpty()) {
$jwtObj = new JWT($project->getId() == 'console' ? App::getEnv('_APP_OPENSSL_KEY_V1') : $project->getAttribute('jwtSecret'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$jwtObj = new JWT($project->getAttribute('jwtSecrets'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$jwt = $jwtObj->encode([
'userId' => $user->getId(),
'sessionId' => $current->getId(),
+2 -1
View File
@@ -755,7 +755,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
$authJWT = $request->getHeader('x-appwrite-jwt', '');
if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
$jwt = new JWT($project->getId() == 'console' ? App::getEnv('_APP_OPENSSL_KEY_V1') : $project->getAttribute('jwtSecret'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$jwt = new JWT($project->getAttribute('jwtSecrets'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
try {
$payload = $jwt->decode($authJWT);
@@ -819,6 +819,7 @@ App::setResource('console', function() {
'legalAddress' => '',
'legalTaxId' => '',
'databaseSecrets' => ['v1' => App::getEnv('_APP_OPENSSL_KEY_V1')],
'jwtSecrets' => App::getEnv('_APP_OPENSSL_KEY_V1'),
'auths' => [
'limit' => (App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
],