Skip to content

feat: add 'DBGroup' for customization db group #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
datamweb merged 14 commits into from
May 22, 2023
Merged

feat: add 'DBGroup' for customization db group #744

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
17f2781
feat: add 'DBGroup' for customization db group
arashsaffari May 16, 2023
5239ecc
Passing DBGroup to validateData() Function
arashsaffari May 17, 2023
27ab561
Fixing the Parameter Order of the validateData Function
arashsaffari May 17, 2023
ff53705
Passing DBGroup to validateData() Function - Docs
arashsaffari May 17, 2023
7e51e33
Merge remote-tracking branch 'origin' into customization_db_group
arashsaffari May 17, 2023
88c8bd8
Add to migration file
arashsaffari May 17, 2023
82d763a
Update src/Models/BaseModel.php
arashsaffari May 18, 2023
5157a08
Update src/Models/BaseModel.php
arashsaffari May 18, 2023
c2d099b
Update src/Database/Migrations/2020-12-28-223112_create_auth_tables.php
arashsaffari May 18, 2023
6d77368
Fixed syntax error
arashsaffari May 18, 2023
6e653ce
composer cs-fix
arashsaffari May 18, 2023
4e1568e
parent::__construct() moved after ->DBGroup assignment.
arashsaffari May 20, 2023
d7e2c99
parent::__construct() moved after ->DBGroup assignment.
arashsaffari May 20, 2023
7899218
Correction of the comment for the DBGroup in the Auth Config file.
arashsaffari May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/addons/jwt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class LoginController extends BaseController
$rules = $this->getValidationRules();

// Validate credentials
if (! $this->validateData($this->request->getJSON(true), $rules)) {
if (! $this->validateData($this->request->getJSON(true), $rules, [], config('Auth')->DBGroup)) {
return $this->fail(
['errors' => $this->validator->getErrors()],
$this->codes['unauthorized']
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/mobile_apps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class LoginController extends BaseController
],
];

if (! $this->validateData($this->request->getPost(), $rules)) {
if (! $this->validateData($this->request->getPost(), $rules, [], config('Auth')->DBGroup)) {
return $this->response
->setJSON(['errors' => $this->validator->getErrors()])
->setStatusCode(401);
Expand Down
10 changes: 10 additions & 0 deletions src/Config/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ class Auth extends BaseConfig
'magic-link-email' => '\CodeIgniter\Shield\Views\Email\magic_link_email',
];

/**
* --------------------------------------------------------------------
* Customize the DB group used for each model
* --------------------------------------------------------------------
* if no database connection instance is passed to the constructor,
* it will automatically connect to the default database group,
* as set in the configuration
Comment thread
arashsaffari marked this conversation as resolved.
Outdated
*/
public ?string $DBGroup = null;

/**
* --------------------------------------------------------------------
* Customize Name of Shield Tables
Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function loginAction(): RedirectResponse
// like the password, can only be validated properly here.
$rules = $this->getValidationRules();

if (! $this->validateData($this->request->getPost(), $rules)) {
if (! $this->validateData($this->request->getPost(), $rules, [], config('Auth')->DBGroup)) {
return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
}

Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/MagicLinkController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function loginAction()
{
// Validate email format
$rules = $this->getValidationRules();
if (! $this->validateData($this->request->getPost(), $rules)) {
if (! $this->validateData($this->request->getPost(), $rules, [], config('Auth')->DBGroup)) {
return redirect()->route('magic-link')->with('errors', $this->validator->getErrors());
}

Expand Down
2 changes: 1 addition & 1 deletion src/Controllers/RegisterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public function registerAction(): RedirectResponse
// like the password, can only be validated properly here.
$rules = $this->getValidationRules();

if (! $this->validateData($this->request->getPost(), $rules)) {
if (! $this->validateData($this->request->getPost(), $rules, [], config('Auth')->DBGroup)) {
return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
}

Expand Down
5 changes: 3 additions & 2 deletions src/Database/Migrations/2020-12-28-223112_create_auth_tables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ class CreateAuthTables extends Migration

public function __construct(?Forge $forge = null)
{
parent::__construct($forge);

/** @var Auth $authConfig */
$authConfig = config('Auth');
$this->tables = $authConfig->tables;
$this->attributes = ($this->db->getPlatform() === 'MySQLi') ? ['ENGINE' => 'InnoDB'] : [];

$this->DBGroup = $authConfig->DBGroup;
parent::__construct($forge);
Comment thread
arashsaffari marked this conversation as resolved.
}

public function up(): void
Expand Down
11 changes: 11 additions & 0 deletions src/Models/BaseModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,17 @@ abstract class BaseModel extends Model
*/
protected array $tables;
Comment thread
arashsaffari marked this conversation as resolved.

public function __construct()
{
$authConfig = config('Auth');

if (! empty($authConfig->DBGroup)) {
$this->DBGroup = $authConfig->DBGroup;
}
Comment thread
arashsaffari marked this conversation as resolved.
Outdated

parent::__construct();
}

protected function initialize(): void
{
/** @var Auth $authConfig */
Comment thread
arashsaffari marked this conversation as resolved.
Outdated
Expand Down