Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/fintechbd/auth
Browse files Browse the repository at this point in the history
� Conflicts:
�	src/Http/Controllers/AuthenticatedSessionController.php
�	src/Models/Profile.php
�	src/Models/User.php
  • Loading branch information
hafijul233 committed Sep 28, 2023
2 parents c008d80 + a808e57 commit 042779a
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 21 deletions.
2 changes: 0 additions & 2 deletions src/Models/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class Permission extends Model implements Auditable

protected $guarded = ['id'];



protected $casts = [];

/*
Expand Down
5 changes: 0 additions & 5 deletions src/Models/Profile.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
use Illuminate\Database\Eloquent\SoftDeletes;
use OwenIt\Auditing\Contracts\Auditable;

/**
* Class Profile
* @package Fintech\Auth\Models
*
*/
class Profile extends Model implements Auditable
{
use BlameableTrait;
Expand Down
2 changes: 0 additions & 2 deletions src/Models/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class Role extends Model implements Auditable

protected $guarded = ['id'];



protected $casts = [];

/*
Expand Down
2 changes: 0 additions & 2 deletions src/Models/Team.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ class Team extends Model implements Auditable

protected $guarded = ['id'];



protected $casts = [];

/*
Expand Down
5 changes: 0 additions & 5 deletions src/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
use Laravel\Sanctum\HasApiTokens;
use OwenIt\Auditing\Contracts\Auditable;

/**
* Class User
* @package Fintech\Auth\Models
* @property-read Profile $profile
*/
class User extends Authenticatable implements Auditable
{
use BlameableTrait;
Expand Down
6 changes: 3 additions & 3 deletions src/RepositoryServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
namespace Fintech\Auth;

use Fintech\Auth\Interfaces\PermissionRepository;
use Fintech\Auth\Interfaces\ProfileRepository;
use Fintech\Auth\Interfaces\RoleRepository;
use Fintech\Auth\Interfaces\TeamRepository;
use Fintech\Auth\Interfaces\ProfileRepository;
use Fintech\Auth\Interfaces\UserRepository;
use Fintech\Auth\Repositories\Eloquent\PermissionRepository as EloquentPermissionRepository;
use Fintech\Auth\Repositories\Eloquent\ProfileRepository as EloquentProfileRepository;
use Fintech\Auth\Repositories\Eloquent\RoleRepository as EloquentRoleRepository;
use Fintech\Auth\Repositories\Eloquent\TeamRepository as EloquentTeamRepository;
use Fintech\Auth\Repositories\Eloquent\ProfileRepository as EloquentProfileRepository;
use Fintech\Auth\Repositories\Eloquent\UserRepository as EloquentUserRepository;
use Fintech\Auth\Repositories\Mongodb\PermissionRepository as MongodbPermissionRepository;
use Fintech\Auth\Repositories\Mongodb\ProfileRepository as MongodbProfileRepository;
use Fintech\Auth\Repositories\Mongodb\RoleRepository as MongodbRoleRepository;
use Fintech\Auth\Repositories\Mongodb\TeamRepository as MongodbTeamRepository;
use Fintech\Auth\Repositories\Mongodb\ProfileRepository as MongodbProfileRepository;
use Fintech\Auth\Repositories\Mongodb\UserRepository as MongodbUserRepository;
use Illuminate\Contracts\Support\DeferrableProvider;
use Illuminate\Support\ServiceProvider;
Expand Down
3 changes: 1 addition & 2 deletions src/Services/ProfileService.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@

/**
* Class UserProfileService
*
*/
class ProfileService
{
private $profileRepository;

/**
* UserProfileService constructor.
* @param ProfileRepository $profileRepository
*/
public function __construct(ProfileRepository $profileRepository)
{
Expand Down

0 comments on commit 042779a

Please sign in to comment.