Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for user tests

This commit is contained in:
David Bomba 2025-05-27 11:29:02 +10:00
parent 6cf4b82858
commit 0b49cf90b3
3 changed files with 224 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/User.php
View File

@ -248,18 +248,30 @@ class User extends Authenticatable implements MustVerifyEmail
public function getCurrentCompanyUser(): ?CompanyUser public function getCurrentCompanyUser(): ?CompanyUser
{ {
nlog("getcu");
if ($this->contextCompanyUser) { if ($this->contextCompanyUser) {
nlog("level1");
return $this->contextCompanyUser; return $this->contextCompanyUser;
} }
// Try service container binding (if available) // Try service container binding (if available)
if (app()->bound('current.company_user')) { if (app()->bound('current.company_user')) {
nlog("level2");
return app('current.company_user'); return app('current.company_user');
} }
$company = $this->getCurrentCompany(); $company = $this->getCurrentCompany();
nlog($company?->id);
nlog("level3");
nlog("xxxx ".$this->company_users()->count());
nlog("id = ". $this->id);
return $this->company_users() return $this->company_users()
->where('company_id', $company->id) ->where('company_id', $company->id)
->where('user_id', $this->id) ->where('user_id', $this->id)

268
tests/Feature/UserTest.php
View File

@ -14,6 +14,7 @@ namespace Tests\Feature;
use App\DataMapper\CompanySettings; use App\DataMapper\CompanySettings;
use App\Factory\CompanyUserFactory; use App\Factory\CompanyUserFactory;
use App\Http\Middleware\PasswordProtection; use App\Http\Middleware\PasswordProtection;
use App\Libraries\MultiDB;
use App\Models\Account; use App\Models\Account;
use App\Models\Company; use App\Models\Company;
use App\Models\CompanyToken; use App\Models\CompanyToken;
@ -35,7 +36,6 @@ use Tests\TestCase;
class UserTest extends TestCase class UserTest extends TestCase
{ {
use MockAccountData; use MockAccountData;
use DatabaseTransactions;
private $default_email = 'attach@gmail.com'; private $default_email = 'attach@gmail.com';
@ -52,7 +52,7 @@ class UserTest extends TestCase
PasswordProtection::class PasswordProtection::class
); );
$this->makeTestData(); // $this->makeTestData();
// $this->withoutExceptionHandling(); // $this->withoutExceptionHandling();
@ -73,9 +73,14 @@ class UserTest extends TestCase
'account_id' => $account->id, 'account_id' => $account->id,
'confirmation_code' => 'xyz123', 'confirmation_code' => 'xyz123',
'email' => $this->faker->unique()->safeEmail(), 'email' => $this->faker->unique()->safeEmail(),
'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
]); ]);
$user->password = \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword');
$user->email_verified_at = now();
$user->save();
auth()->login($user, false);
$settings = CompanySettings::defaults(); $settings = CompanySettings::defaults();
$settings->client_online_payment_notification = false; $settings->client_online_payment_notification = false;
$settings->client_manual_payment_notification = false; $settings->client_manual_payment_notification = false;
@ -85,11 +90,21 @@ class UserTest extends TestCase
'settings' => $settings, 'settings' => $settings,
]); ]);
$cu = CompanyUserFactory::create($user->id, $company->id, $account->id); // $cu = CompanyUserFactory::create($user->id, $company->id, $account->id);
$cu->is_owner = true; // $cu->is_owner = true;
$cu->is_admin = true; // $cu->is_admin = true;
$cu->is_locked = false; // $cu->is_locked = false;
$cu->save(); // $cu->save();
$user->companies()->attach($company->id, [
'account_id' => $account->id,
'is_owner' => 1,
'is_admin' => 1,
'is_locked' => 0,
'permissions' => '',
'notifications' => \App\DataMapper\CompanySettings::notificationAdminDefaults(),
'settings' => null,
]);
$token = \Illuminate\Support\Str::random(64); $token = \Illuminate\Support\Str::random(64);
@ -102,55 +117,24 @@ class UserTest extends TestCase
$company_token->is_system = true; $company_token->is_system = true;
$company_token->save(); $company_token->save();
auth()->user()->setContext($company, $company_token);
return $company_token; return $company_token;
} }
// public function testCrossAccountFunctionality()
// {
// $ct = $this->mockAccount();
// $u= $ct->user;
// auth()->login($u, true);
// $account = Account::factory()->create([
// 'hosted_client_count' => 1000,
// 'hosted_company_count' => 1000,
// ]);
// $account->num_users = 3;
// $account->save();
// $user = User::factory()->create([
// 'account_id' => $this->account->id,
// 'confirmation_code' => 'xyz123',
// 'email' => $this->faker->unique()->safeEmail(),
// 'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
// ]);
// $user_repo = new UserRepository();
// // try{
// $x = $user_repo->save(['first_name' => 'bobby'], $user);
// // }
// // catch(\Exception $e){
// // $this->assertEquals(401, $e->getCode());
// // }
// nlog($x);
// }
public function testValidEmailUpdate() public function testValidEmailUpdate()
{ {
$company_token = $this->mockAccount(); $company_token = $this->mockAccount();
$user = $company_token->user; $user = auth()->user();
$user->load('company_user');
// $user = $company_token->user;
// $user->load('company_user');
// nlog($company_token->toArray());
// $user = User::with('company_user')->find($company_token->user_id);
// nlog($user->toArray());
$data = $user->toArray(); $data = $user->toArray();
@ -162,6 +146,19 @@ class UserTest extends TestCase
$response->assertStatus(200); $response->assertStatus(200);
$data['email'] = 'newemail@gmail.com';
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $company_token->token,
// 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
// ])->putJson('/api/v1/users/'.$user->hashed_id.'?include=company_user', $data);
// $response->assertStatus(200);
// $data = $response->json();
// $this->assertEquals($data['data']['email'], $data['email']);
} }
@ -169,9 +166,11 @@ class UserTest extends TestCase
{ {
$company_token = $this->mockAccount(); $company_token = $this->mockAccount();
$user = $company_token->user; // $user = $company_token->user;
$user->load('company_user'); // $user->load('company_user');
$user = auth()->user();
$data = $user->toArray(); $data = $user->toArray();
$data['email'] = ''; $data['email'] = '';
unset($data['password']); unset($data['password']);
@ -215,14 +214,19 @@ class UserTest extends TestCase
public function testUserLocale() public function testUserLocale()
{ {
$this->user->language_id = "13";
$this->user->save(); $company_token = $this->mockAccount();
$this->assertEquals("fr_CA", $this->user->getLocale()); $user = auth()->user();
$user->language_id = "13";
$user->save();
$this->assertEquals("fr_CA", $user->getLocale());
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
])->get('/api/v1/statics'); ])->get('/api/v1/statics');
$response->assertStatus(200); $response->assertStatus(200);
@ -235,6 +239,12 @@ class UserTest extends TestCase
{ {
$company_token = $this->mockAccount(); $company_token = $this->mockAccount();
$_user = MultiDB::hasUser(['email' => 'normal_user@gmail.com']);
if($_user) {
$_user->account->delete();
}
$data = [ $data = [
'first_name' => 'hey', 'first_name' => 'hey',
'last_name' => 'you', 'last_name' => 'you',
@ -337,7 +347,7 @@ class UserTest extends TestCase
$account->save(); $account->save();
$user = User::factory()->create([ $user = User::factory()->create([
'account_id' => $this->account->id, 'account_id' => $account->id,
'confirmation_code' => 'xyz123', 'confirmation_code' => 'xyz123',
'email' => $this->faker->unique()->safeEmail(), 'email' => $this->faker->unique()->safeEmail(),
'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'), 'password' => \Illuminate\Support\Facades\Hash::make('ALongAndBriliantPassword'),
@ -352,12 +362,15 @@ class UserTest extends TestCase
'settings' => $settings, 'settings' => $settings,
]); ]);
$user->companies()->attach($company->id, [
$cu = CompanyUserFactory::create($user->id, $company->id, $account->id); 'account_id' => $account->id,
$cu->is_owner = true; 'is_owner' => 1,
$cu->is_admin = true; 'is_admin' => 1,
$cu->is_locked = false; 'is_locked' => 0,
$cu->save(); 'permissions' => '',
'notifications' => \App\DataMapper\CompanySettings::notificationAdminDefaults(),
'settings' => null,
]);
$token = \Illuminate\Support\Str::random(64); $token = \Illuminate\Support\Str::random(64);
@ -385,45 +398,56 @@ class UserTest extends TestCase
} }
public function testDisconnectUserOauthMailer() // public function testDisconnectUserOauthMailer()
{ // {
$user = // $account = Account::factory()->create([
User::factory()->create([ // 'hosted_client_count' => 1000,
'account_id' => $this->account->id, // 'hosted_company_count' => 1000,
'email' => $this->faker->safeEmail(), // ]);
'oauth_user_id' => '123456789',
'oauth_provider_id' => '123456789',
]);
$response = $this->withHeaders([ // $user =
'X-API-TOKEN' => $this->token, // User::factory()->create([
])->post("/api/v1/users/{$user->hashed_id}/disconnect_mailer"); // 'account_id' => $account->id,
// 'email' => $this->faker->safeEmail(),
// 'oauth_user_id' => '123456789',
// 'oauth_provider_id' => '123456789',
// ]);
$response->assertStatus(200); // $response = $this->withHeaders([
// 'X-API-TOKEN' => $this->token,
// ])->post("/api/v1/users/{$user->hashed_id}/disconnect_mailer");
$user->fresh(); // $response->assertStatus(200);
$this->assertNull($user->oauth_user_token); // $user->fresh();
$this->assertNull($user->oauth_user_refresh_token);
} // $this->assertNull($user->oauth_user_token);
// $this->assertNull($user->oauth_user_refresh_token);
// }
public function testUserFiltersWith() public function testUserFiltersWith()
{ {
$company_token = $this->mockAccount();
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->get('/api/v1/users?with='.$this->user->hashed_id); ])->get('/api/v1/users?with='.$company_token->user->hashed_id);
$response->assertStatus(200); $response->assertStatus(200);
} }
public function testUserList() public function testUserList()
{ {
$company_token = $this->mockAccount();
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->get('/api/v1/users'); ])->get('/api/v1/users');
@ -433,6 +457,13 @@ class UserTest extends TestCase
public function testValidationRulesPhoneIsNull() public function testValidationRulesPhoneIsNull()
{ {
$this->withoutMiddleware(PasswordProtection::class); $this->withoutMiddleware(PasswordProtection::class);
$company_token = $this->mockAccount();
$_user = MultiDB::hasUser(['email' => 'bob1@good.ole.boys.com']);
if ($_user) {
$_user->account->delete();
}
$data = [ $data = [
'first_name' => 'hey', 'first_name' => 'hey',
@ -448,7 +479,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->postJson('/api/v1/users?include=company_user', $data); ])->postJson('/api/v1/users?include=company_user', $data);
@ -459,6 +490,13 @@ class UserTest extends TestCase
{ {
$this->withoutMiddleware(PasswordProtection::class); $this->withoutMiddleware(PasswordProtection::class);
$_user = MultiDB::hasUser(['email' => 'bob1@good.ole.boys.com']);
if($_user) {
$_user->account->delete();
}
$company_token = $this->mockAccount();
$data = [ $data = [
'first_name' => 'hey', 'first_name' => 'hey',
'last_name' => 'you', 'last_name' => 'you',
@ -473,7 +511,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->postJson('/api/v1/users?include=company_user', $data); ])->postJson('/api/v1/users?include=company_user', $data);
@ -500,7 +538,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->putJson('/api/v1/users/'.$user->hashed_id.'?include=company_user', $data); ])->putJson('/api/v1/users/'.$user->hashed_id.'?include=company_user', $data);
} }
@ -509,6 +547,14 @@ class UserTest extends TestCase
{ {
$this->withoutMiddleware(PasswordProtection::class); $this->withoutMiddleware(PasswordProtection::class);
$_user = MultiDB::hasUser(['email' => 'bob1@good.ole.boys.com']);
if($_user) {
$_user->account->delete();
}
$company_token = $this->mockAccount();
$data = [ $data = [
'first_name' => 'hey', 'first_name' => 'hey',
'last_name' => 'you', 'last_name' => 'you',
@ -523,7 +569,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->postJson('/api/v1/users?include=company_user', $data); ])->postJson('/api/v1/users?include=company_user', $data);
@ -538,6 +584,13 @@ class UserTest extends TestCase
{ {
$this->withoutMiddleware(PasswordProtection::class); $this->withoutMiddleware(PasswordProtection::class);
$_user = MultiDB::hasUser(['email' => $this->default_email]);
if ($_user) {
$_user->account->delete();
}
$company_token = $this->mockAccount();
$data = [ $data = [
'first_name' => 'Test', 'first_name' => 'Test',
'last_name' => 'Palloni', 'last_name' => 'Palloni',
@ -548,7 +601,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->postJson('/api/v1/users?include=company_user', $data); ])->postJson('/api/v1/users?include=company_user', $data);
@ -558,7 +611,7 @@ class UserTest extends TestCase
$response = $this->withHeaders([ $response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'), 'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token, 'X-API-TOKEN' => $company_token->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword', 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->delete('/api/v1/users/'.$arr['data']['id'].'/detach_from_company?include=company_user'); ])->delete('/api/v1/users/'.$arr['data']['id'].'/detach_from_company?include=company_user');
@ -566,8 +619,8 @@ class UserTest extends TestCase
$user_id = $this->decodePrimaryKey($arr['data']['id']); $user_id = $this->decodePrimaryKey($arr['data']['id']);
$cu = CompanyUser::whereUserId($user_id)->whereCompanyId($this->company->id)->first(); $cu = CompanyUser::whereUserId($user_id)->whereCompanyId($company_token->company->id)->first();
$ct = CompanyToken::whereUserId($user_id)->whereCompanyId($this->company->id)->first(); $ct = CompanyToken::whereUserId($user_id)->whereCompanyId($company_token->company->id)->first();
$user = User::find($user_id); $user = User::find($user_id);
$this->assertNull($cu); $this->assertNull($cu);
@ -579,25 +632,46 @@ class UserTest extends TestCase
{ {
$this->withoutMiddleware(PasswordProtection::class); $this->withoutMiddleware(PasswordProtection::class);
$company_token = $this->mockAccount();
$_user = MultiDB::hasUser(['email' => $this->default_email]);
if ($_user) {
$_user->account->delete();
}
$_user = MultiDB::hasUser(['email' => 'bob@good.ole.boys.co2.com']);
if ($_user) {
$_user->account->delete();
}
/* Create New Company */ /* Create New Company */
$company2 = Company::factory()->create([ $company2 = Company::factory()->create([
'account_id' => $this->account->id, 'account_id' => $company_token->account_id,
]); ]);
$company_token = new CompanyToken(); $company_token = new CompanyToken();
$company_token->user_id = $this->user->id; $company_token->user_id = auth()->user()->id;
$company_token->company_id = $company2->id; $company_token->company_id = $company2->id;
$company_token->account_id = $this->account->id; $company_token->account_id = auth()->user()->account_id;
$company_token->name = 'test token'; $company_token->name = 'test token';
$company_token->token = \Illuminate\Support\Str::random(64); $company_token->token = \Illuminate\Support\Str::random(64);
$company_token->is_system = true; $company_token->is_system = true;
$company_token->save(); $company_token->save();
/*Manually link this user to the company*/ /*Manually link this user to the company*/
$cu = CompanyUserFactory::create($this->user->id, $company2->id, $this->account->id); auth()->user()->companies()->attach($company2->id, [
$cu->is_owner = true; 'account_id' => $company_token->account_id,
$cu->is_admin = true; 'is_owner' => 1,
$cu->save(); 'is_admin' => 1,
'is_locked' => 0,
'permissions' => '',
'notifications' => \App\DataMapper\CompanySettings::notificationAdminDefaults(),
'settings' => null,
]);
/*Create New Blank User and Attach to Company 2*/ /*Create New Blank User and Attach to Company 2*/
$data = [ $data = [

44
tests/Integration/MultiDBUserTest.php
View File

@ -35,12 +35,25 @@ class MultiDBUserTest extends TestCase
{ {
parent::setUp(); parent::setUp();
$this->withoutExceptionHandling(); // $this->withoutExceptionHandling();
if (! config('ninja.db.multi_db_enabled')) { if (! config('ninja.db.multi_db_enabled')) {
$this->markTestSkipped('Multi DB not enabled - skipping'); $this->markTestSkipped('Multi DB not enabled - skipping');
} }
foreach(MultiDB::getDBs() as $db) {
MultiDB::setDB($db);
$u = User::where('email','db1@example.com')->first();
if($u)
$u->account->delete();
$u = User::where('email', 'db2@example.com')->first();
if ($u) {
$u->account->delete();
}
}
User::unguard(); User::unguard();
$ac = Account::factory()->make(); $ac = Account::factory()->make();
@ -202,7 +215,7 @@ class MultiDBUserTest extends TestCase
])->postJson('/api/v1/users?include=company_user', $data); ])->postJson('/api/v1/users?include=company_user', $data);
$response->assertStatus(403); $response->assertStatus(422);
} }
@ -241,9 +254,30 @@ class MultiDBUserTest extends TestCase
{ {
parent::tearDown(); parent::tearDown();
DB::connection('db-ninja-01')->table('users')->delete();
DB::connection('db-ninja-02')->table('users')->delete(); $u = User::on('db-ninja-01')->where('email', 'db1@example.com')->first();
if ($u) {
$u->account->delete();
}
config(['database.default' => config('ninja.db.default')]);
$u = User::on('db-ninja-01')->where('email', 'db2@example.com')->first();
if ($u) {
$u->account->delete();
}
$u = User::on('db-ninja-02')->where('email', 'db1@example.com')->first();
if ($u) {
$u->account->delete();
}
$u = User::on('db-ninja-02')->where('email', 'db2@example.com')->first();
if ($u) {
$u->account->delete();
}
} }
} }