mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
Merge pull request #1396 from TorstenDittmann/feat-refactor-db-user-status
feat(refactor-db): user status
This commit is contained in:
19 files changed
+156
-63
No files matched your search
@@ -6,13 +6,6 @@ use Appwrite\Database\Document;
|
||||
|
||||
class Auth
|
||||
{
|
||||
/**
|
||||
* User Status.
|
||||
*/
|
||||
const USER_STATUS_UNACTIVATED = 0;
|
||||
const USER_STATUS_ACTIVATED = 1;
|
||||
const USER_STATUS_BLOCKED = 2;
|
||||
|
||||
/**
|
||||
* User Roles.
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
|
||||
namespace Appwrite\Migration\Version;
|
||||
|
||||
use Appwrite\Migration\Migration;
|
||||
use Utopia\Config\Config;
|
||||
use Utopia\CLI\Console;
|
||||
use Appwrite\Database\Database;
|
||||
use Appwrite\Database\Document;
|
||||
|
||||
class V09 extends Migration
|
||||
{
|
||||
public function execute(): void
|
||||
{
|
||||
$project = $this->project;
|
||||
Console::log('Migrating project: ' . $project->getAttribute('name') . ' (' . $project->getId() . ')');
|
||||
|
||||
$this->forEachDocument([$this, 'fixDocument']);
|
||||
}
|
||||
|
||||
protected function fixDocument(Document $document)
|
||||
{
|
||||
switch ($document->getAttribute('$collection')) {
|
||||
case Database::SYSTEM_COLLECTION_USERS:
|
||||
/**
|
||||
* Remove deprecated user status 0 and replace with boolean.
|
||||
*/
|
||||
if ($document->getAttribute('status') === 0 || $document->getAttribute('status') === 1) {
|
||||
$document->setAttribute('status', true);
|
||||
}
|
||||
if ($document->getAttribute('status') === 2) {
|
||||
$document->setAttribute('status', false);
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($document as &$attr) {
|
||||
if ($attr instanceof Document) {
|
||||
$attr = $this->fixDocument($attr);
|
||||
}
|
||||
|
||||
if (\is_array($attr)) {
|
||||
foreach ($attr as &$child) {
|
||||
if ($child instanceof Document) {
|
||||
$child = $this->fixDocument($child);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $document;
|
||||
}
|
||||
}
|
||||
@@ -327,7 +327,7 @@ class V06 extends Filter {
|
||||
$content['oauth2'.ucfirst($key)] = '';
|
||||
$content['oauth2'.ucfirst($key).'AccessToken'] = '';
|
||||
}
|
||||
$content['status'] = empty($content['status']) ? 0 : $content['status'];
|
||||
$content['status'] = $content['status'] ? 0 : 2;
|
||||
$content['roles'] = Authorization::getRoles() ?? [];
|
||||
return $content;
|
||||
}
|
||||
|
||||
@@ -29,10 +29,10 @@ class User extends Model
|
||||
'example' => 1592981250,
|
||||
])
|
||||
->addRule('status', [
|
||||
'type' => self::TYPE_INTEGER,
|
||||
'description' => 'User status. 0 for Unactivated, 1 for active and 2 is blocked.',
|
||||
'default' => 0,
|
||||
'example' => 0,
|
||||
'type' => self::TYPE_BOOLEAN,
|
||||
'description' => 'User status. Pass `true` for enabled and `false` for disabled.',
|
||||
'default' => true,
|
||||
'example' => true,
|
||||
])
|
||||
->addRule('passwordUpdate', [
|
||||
'type' => self::TYPE_INTEGER,
|
||||
|
||||
Reference in new issue
Block a user