chore: update naming conventions
This commit is contained in:
parent
43ee8e1ed4
commit
4c8608b49c
12 changed files with 18 additions and 18 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -99,7 +99,7 @@ App::post('/v1/account')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($project->getAttribute('auths', [])['disallowPersonalData'] ?? false) {
|
if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
|
||||||
$personalDataValidator = new PersonalData($userId, $email, $name, null);
|
$personalDataValidator = new PersonalData($userId, $email, $name, null);
|
||||||
if (!$personalDataValidator->isValid($password)) {
|
if (!$personalDataValidator->isValid($password)) {
|
||||||
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
||||||
|
@ -1594,7 +1594,7 @@ App::patch('/v1/account/password')
|
||||||
$history = array_slice($history, (count($history) - $historyLimit), $historyLimit);
|
$history = array_slice($history, (count($history) - $historyLimit), $historyLimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($project->getAttribute('auths', [])['disallowPersonalData'] ?? false) {
|
if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
|
||||||
$personalDataValidator = new PersonalData($user->getId(), $user->getAttribute('email'), $user->getAttribute('name'), $user->getAttribute('phone'));
|
$personalDataValidator = new PersonalData($user->getId(), $user->getAttribute('email'), $user->getAttribute('name'), $user->getAttribute('phone'));
|
||||||
if (!$personalDataValidator->isValid($password)) {
|
if (!$personalDataValidator->isValid($password)) {
|
||||||
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
||||||
|
|
|
@ -81,7 +81,7 @@ App::post('/v1/projects')
|
||||||
}
|
}
|
||||||
|
|
||||||
$auth = Config::getParam('auth', []);
|
$auth = Config::getParam('auth', []);
|
||||||
$auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'passwordHistory' => 0, 'passwordDictionary' => false, 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, 'disallowPersonalData' => false];
|
$auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'passwordHistory' => 0, 'passwordDictionary' => false, 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, 'personalDataCheck' => false];
|
||||||
foreach ($auth as $index => $method) {
|
foreach ($auth as $index => $method) {
|
||||||
$auths[$method['key'] ?? ''] = true;
|
$auths[$method['key'] ?? ''] = true;
|
||||||
}
|
}
|
||||||
|
@ -717,7 +717,7 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
|
||||||
$response->dynamic($project, Response::MODEL_PROJECT);
|
$response->dynamic($project, Response::MODEL_PROJECT);
|
||||||
});
|
});
|
||||||
|
|
||||||
App::patch('/v1/projects/:projectId/auth/disallow-personal-data')
|
App::patch('/v1/projects/:projectId/auth/personal-data')
|
||||||
->desc('Enable or disable checking user passwords for similarity with their personal data.')
|
->desc('Enable or disable checking user passwords for similarity with their personal data.')
|
||||||
->groups(['api', 'projects'])
|
->groups(['api', 'projects'])
|
||||||
->label('scope', 'projects.write')
|
->label('scope', 'projects.write')
|
||||||
|
@ -740,7 +740,7 @@ App::patch('/v1/projects/:projectId/auth/disallow-personal-data')
|
||||||
}
|
}
|
||||||
|
|
||||||
$auths = $project->getAttribute('auths', []);
|
$auths = $project->getAttribute('auths', []);
|
||||||
$auths['disallowPersonalData'] = $enabled;
|
$auths['personalDataCheck'] = $enabled;
|
||||||
|
|
||||||
$dbForConsole->updateDocument('projects', $project->getId(), $project
|
$dbForConsole->updateDocument('projects', $project->getId(), $project
|
||||||
->setAttribute('auths', $auths));
|
->setAttribute('auths', $auths));
|
||||||
|
|
|
@ -54,7 +54,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
|
||||||
? ID::unique()
|
? ID::unique()
|
||||||
: ID::custom($userId);
|
: ID::custom($userId);
|
||||||
|
|
||||||
if ($project->getAttribute('auths', [])['disallowPersonalData'] ?? false) {
|
if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
|
||||||
$personalDataValidator = new PersonalData($userId, $email, $name, $phone);
|
$personalDataValidator = new PersonalData($userId, $email, $name, $phone);
|
||||||
if (!$personalDataValidator->isValid($password)) {
|
if (!$personalDataValidator->isValid($password)) {
|
||||||
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
||||||
|
@ -852,7 +852,7 @@ App::patch('/v1/users/:userId/password')
|
||||||
throw new Exception(Exception::USER_NOT_FOUND);
|
throw new Exception(Exception::USER_NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($project->getAttribute('auths', [])['disallowPersonalData'] ?? false) {
|
if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
|
||||||
$personalDataValidator = new PersonalData($userId, $user->getAttribute('email'), $user->getAttribute('name'), $user->getAttribute('phone'));
|
$personalDataValidator = new PersonalData($userId, $user->getAttribute('email'), $user->getAttribute('name'), $user->getAttribute('phone'));
|
||||||
if (!$personalDataValidator->isValid($password)) {
|
if (!$personalDataValidator->isValid($password)) {
|
||||||
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
throw new Exception(Exception::USER_PASSWORD_PERSONAL_DATA);
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
convertNoticesToExceptions="true"
|
convertNoticesToExceptions="true"
|
||||||
convertWarningsToExceptions="true"
|
convertWarningsToExceptions="true"
|
||||||
processIsolation="false"
|
processIsolation="false"
|
||||||
stopOnFailure="true"
|
stopOnFailure="false"
|
||||||
>
|
>
|
||||||
<extensions>
|
<extensions>
|
||||||
<extension class="Appwrite\Tests\TestHook" />
|
<extension class="Appwrite\Tests\TestHook" />
|
||||||
|
|
|
@ -132,7 +132,7 @@ class Project extends Model
|
||||||
'default' => false,
|
'default' => false,
|
||||||
'example' => true,
|
'example' => true,
|
||||||
])
|
])
|
||||||
->addRule('authDisallowPersonalData', [
|
->addRule('authPersonalDataCheck', [
|
||||||
'type' => self::TYPE_BOOLEAN,
|
'type' => self::TYPE_BOOLEAN,
|
||||||
'description' => 'Whether or not to check the user password for similarity with their personal data.',
|
'description' => 'Whether or not to check the user password for similarity with their personal data.',
|
||||||
'default' => false,
|
'default' => false,
|
||||||
|
@ -260,7 +260,7 @@ class Project extends Model
|
||||||
$document->setAttribute('authSessionsLimit', $authValues['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT);
|
$document->setAttribute('authSessionsLimit', $authValues['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT);
|
||||||
$document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
|
$document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
|
||||||
$document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
|
$document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
|
||||||
$document->setAttribute('authDisallowPersonalData', $authValues['disallowPersonalData'] ?? false);
|
$document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
|
||||||
|
|
||||||
foreach ($auth as $index => $method) {
|
foreach ($auth as $index => $method) {
|
||||||
$key = $method['key'];
|
$key = $method['key'];
|
||||||
|
|
|
@ -1365,7 +1365,7 @@ class ProjectsConsoleClientTest extends Scope
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->assertEquals(200, $response['headers']['status-code']);
|
$this->assertEquals(200, $response['headers']['status-code']);
|
||||||
$this->assertEquals(true, $response['body']['authDisallowPersonalData']);
|
$this->assertEquals(true, $response['body']['authPersonalDataCheck']);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test for failure
|
* Test for failure
|
||||||
|
@ -1464,7 +1464,7 @@ class ProjectsConsoleClientTest extends Scope
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->assertEquals(200, $response['headers']['status-code']);
|
$this->assertEquals(200, $response['headers']['status-code']);
|
||||||
$this->assertEquals(false, $response['body']['authDisallowPersonalData']);
|
$this->assertEquals(false, $response['body']['authPersonalDataCheck']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue