made review changes

This commit is contained in:
prateek banga committed 2023-10-25 23:03:23 +05:30
1 parent cbae797f38
commit fd4a81c4fc
20 files changed
+201 -176

No files matched your search

+1 -1
View File
@@ -34,7 +34,7 @@ class V15 extends Migration
['email', 'anonymous'],
\array_map(
fn ($value) => "oauth-" . $value,
\array_keys(Config::getParam('authProviders', []))
\array_keys(Config::getParam('oAuthProviders', []))
)
);
+6 -6
View File
@@ -124,23 +124,23 @@ class V16 extends Migration
/**
* Enable OAuth providers with data
*/
$authProviders = $document->getAttribute('authProviders', []);
$oAuthProviders = $document->getAttribute('oAuthProviders', []);
foreach (Config::getParam('authProviders') as $provider => $value) {
foreach (Config::getParam('oAuthProviders') as $provider => $value) {
if (!$value['enabled']) {
continue;
}
if (($authProviders[$provider . 'Appid'] ?? false) && ($authProviders[$provider . 'Secret'] ?? false)) {
if (array_key_exists($provider . 'Enabled', $authProviders)) {
if (($oAuthProviders[$provider . 'Appid'] ?? false) && ($oAuthProviders[$provider . 'Secret'] ?? false)) {
if (array_key_exists($provider . 'Enabled', $oAuthProviders)) {
continue;
}
$authProviders[$provider . 'Enabled'] = true;
$oAuthProviders[$provider . 'Enabled'] = true;
}
}
$document->setAttribute('authProviders', $authProviders);
$document->setAttribute('oAuthProviders', $oAuthProviders);
break;
}
+37 -3
View File
@@ -150,8 +150,11 @@ class Deletes extends Action
case DELETE_TYPE_SCHEDULES:
$this->deleteSchedules($dbForConsole, $getProjectDB, $datetime);
break;
case DELETE_TYPE_SUBSCRIBERS:
$this->deleteSubscribers($project, $getProjectDB, $document);
case DELETE_TYPE_PROVIDER:
$this->deleteProvider($project, $getProjectDB, $document);
break;
case DELETE_TYPE_TOPIC:
$this->deleteTopic($project, $getProjectDB, $document);
break;
default:
Console::error('No delete operation for type: ' . $type);
@@ -196,13 +199,44 @@ class Deletes extends Action
);
}
/**
* @param Document $project
* @param callable $getProjectDB
* @param Document $provider
* @throws Exception
*/
protected function deleteProvider(Document $project, callable $getProjectDB, Document $provider)
{
if ($provider->isEmpty()) {
Console::error('Failed to delete topics, subscribers and messages. Provider not found');
return;
}
$dbForProject = $getProjectDB($project);
$topics = $dbForProject->find('topics', [Query::equal('providerInternalId', [$provider->getInternalId()]), Query::limit(APP_LIMIT_SUBQUERY)]);
$this->deleteByGroup('topics', [
Query::equal('providerInternalId', [$provider->getInternalId()])
], $dbForProject);
foreach ($topics as $topic) {
$this->deleteByGroup('subscribers', [
Query::equal('topicInternalId', [$topic->getInternalId()])
], $dbForProject);
}
$this->deleteByGroup('messages', [
Query::equal('providerInternalId', [$provider->getInternalId()])
], $dbForProject);
}
/**
* @param Document $project
* @param callable $getProjectDB
* @param Document $topic
* @throws Exception
*/
protected function deleteSubscribers(Document $project, callable $getProjectDB, Document $topic)
protected function deleteTopic(Document $project, callable $getProjectDB, Document $topic)
{
if ($topic->isEmpty()) {
Console::error('Failed to delete subscribers. Topic not found');
@@ -31,13 +31,6 @@ use function Swoole\Coroutine\batch;
class Messaging extends Action
{
protected ?SMSAdapter $sms = null;
protected ?PushAdapter $push = null;
protected ?EmailAdapter $email = null;
protected ?Database $dbForProject = null;
public static function getName(): string
{
return "messaging";
@@ -12,8 +12,7 @@ class Messages extends Base
'deliveryErrors',
'status',
'description',
'data',
'search'
'data'
];
/**
+2 -2
View File
@@ -60,8 +60,8 @@ class V13 extends Filter
protected function parseProject($content)
{
$content['providers'] = $content['authProviders'];
unset($content['authProviders']);
$content['providers'] = $content['oAuthProviders'];
unset($content['oAuthProviders']);
return $content;
}
+3 -3
View File
@@ -88,9 +88,9 @@ class V16 extends Filter
protected function parseProject(array $content)
{
foreach ($content['authProviders'] ?? [] as $i => $provider) {
$content['authProviders'][$i]['name'] = \ucfirst($provider['key']);
unset($content['authProviders'][$i]['key']);
foreach ($content['oAuthProviders'] ?? [] as $i => $provider) {
$content['oAuthProviders'][$i]['name'] = \ucfirst($provider['key']);
unset($content['oAuthProviders'][$i]['key']);
}
$content['domains'] = [];
@@ -138,7 +138,7 @@ class Project extends Model
'default' => false,
'example' => true,
])
->addRule('authProviders', [
->addRule('oAuthProviders', [
'type' => Response::MODEL_AUTH_PROVIDER,
'description' => 'List of Auth Providers.',
'default' => [],
@@ -328,9 +328,9 @@ class Project extends Model
$document->setAttribute('auth' . ucfirst($key), $value);
}
// Providers
$providers = Config::getParam('authProviders', []);
$providerValues = $document->getAttribute('authProviders', []);
// OAuth Providers
$providers = Config::getParam('oAuthProviders', []);
$providerValues = $document->getAttribute('oAuthProviders', []);
$projectProviders = [];
foreach ($providers as $key => $provider) {
@@ -348,7 +348,7 @@ class Project extends Model
]);
}
$document->setAttribute('authProviders', $projectProviders);
$document->setAttribute('oAuthProviders', $projectProviders);
return $document;
}