CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-26 18:20:43 +12:00
Code Issues Projects Releases Wiki Activity

Fixed auth

Browse source
This commit is contained in:
Eldad Fux 2021-05-17 12:37:33 +03:00
parent cee71ef7b3
commit f2976a82ad
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/init.php
View file

@ -446,7 +446,12 @@ App::setResource('user', function($mode, $project, $console, $request, $response
Auth::$secret = $session['secret'] ?? '';
if (APP_MODE_ADMIN !== $mode) {
$user = $dbForInternal->getDocument('users', Auth::$unique);
if ($project->isEmpty()) {
$user = new Document2(['$id' => '', '$collection' => 'users']);
}
else {
$user = $dbForInternal->getDocument('users', Auth::$unique);
}
}
else {
$user = $dbForConsole->getDocument('users', Auth::$unique);
@ -468,7 +473,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
$authJWT = $request->getHeader('x-appwrite-jwt', '');
if (!empty($authJWT)) { // JWT authentication
if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
$jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
try {
@ -494,8 +499,8 @@ App::setResource('user', function($mode, $project, $console, $request, $response
App::setResource('project', function($dbForConsole, $request, $console) {
/** @var Utopia\Swoole\Request $request */
/** @var Appwrite\Database\Database $dbForConsole */
/** @var Appwrite\Database\Document $console */
/** @var Utopia\Database\Database $dbForConsole */
/** @var Utopia\Database\Document $console */
$projectId = $request->getParam('project',
$request->getHeader('x-appwrite-project', 'console'));