now we can change any model from config file

sarthaksavvy · sarthaksavvy · commit cd6b687b2fd8 · 2020-11-25T21:23:27.000+05:30
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
diff --git a/src/Http/Controllers/ActivationController.php b/src/Http/Controllers/ActivationController.php
@@ -3,7 +3,6 @@
 namespace Bitfumes\Multiauth\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Admin;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class ActivationController extends Controller
@@ -16,15 +15,17 @@ public function __construct()
         $this->adminModel = config('multiauth.models.admin');
     }
 
-    public function activate(Admin $admin)
+    public function activate($adminId)
     {
+        $admin = $this->adminModel::findOrFail($adminId);
         $this->authorize('UpdateAdmin', $this->adminModel);
         $admin->update(['active' => true]);
         return redirect()->back();
     }
 
-    public function deactivate(Admin $admin)
+    public function deactivate($adminId)
     {
+        $admin = $this->adminModel::findOrFail($adminId);
         $this->authorize('UpdateAdmin', $this->adminModel);
         $admin->update(['active' => false]);
         return redirect()->back();
diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Admin;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class AdminController extends Controller
@@ -30,7 +29,7 @@ public function index()
 
     public function show()
     {
-        $admins = Admin::where('id', '!=', auth()->id())->get();
+        $admins = $this->adminModel::where('id', '!=', auth()->id())->get();
 
         return view('multiauth::admin.show', compact('admins'));
     }
diff --git a/src/Http/Controllers/AdminRoleController.php b/src/Http/Controllers/AdminRoleController.php
@@ -2,26 +2,30 @@
 
 namespace Bitfumes\Multiauth\Http\Controllers;
 
-use Bitfumes\Multiauth\Model\Role;
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Admin;
 
 class AdminRoleController extends Controller
 {
     public function __construct()
     {
         $this->middleware('role:super');
+        $this->adminModel = config('multiauth.models.admin');
+        $this->roleModel  = config('multiauth.models.role');
     }
 
-    public function attach(Admin $admin, Role $role)
+    public function attach($adminId, $roleId)
     {
+        $role   = $this->roleModel::findOrFail($roleId);
+        $admin  = $this->adminModel::findOrFail($adminId);
         $admin->roles()->attach($role->id);
 
         return redirect()->back();
     }
 
-    public function detach(Admin $admin, Role $role)
+    public function detach($adminId, $roleId)
     {
+        $role   = $this->roleModel::findOrFail($roleId);
+        $admin  = $this->adminModel::findOrFail($adminId);
         $admin->roles()->detach($role->id);
 
         return redirect()->back();
diff --git a/src/Http/Controllers/PermissionController.php b/src/Http/Controllers/PermissionController.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Permission;
 use Symfony\Component\HttpFoundation\Response;
 
 class PermissionController extends Controller
@@ -13,6 +12,7 @@ public function __construct()
     {
         $this->middleware('auth:admin');
         $this->middleware('role:super');
+        $this->permissionModel = config('multiauth.models.permission');
     }
 
     /**
@@ -22,7 +22,7 @@ public function __construct()
      */
     public function index()
     {
-        return response(['data' => Permission::all()], 200);
+        return response(['data' => $this->permissionModel::all()], 200);
     }
 
     /**
@@ -31,8 +31,9 @@ public function index()
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function show(Permission $permission)
+    public function show($permissionId)
     {
+        $permission = $this->permissionModel::findOrFail($permissionId);
         return response(['data' => $permission], 200);
     }
 
@@ -44,7 +45,7 @@ public function show(Permission $permission)
      */
     public function store(Request $request)
     {
-        $permission = Permission::create($request->all());
+        $permission = $this->permissionModel::create($request->all());
         return response(['data' => $permission], Response::HTTP_CREATED);
     }
 
@@ -55,8 +56,9 @@ public function store(Request $request)
      * @param  \Bitfumes\Multiauth\Permission  $permission
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Permission $permission)
+    public function update(Request $request, $permissionId)
     {
+        $permission = $this->permissionModel::findOrFail($permissionId);
         $permission->update($request->all());
         return response(['data' => $permission], Response::HTTP_ACCEPTED);
     }
@@ -67,8 +69,9 @@ public function update(Request $request, Permission $permission)
      * @param  \Bitfumes\Multiauth\Permission  $permission
      * @return \Illuminate\Http\Response
      */
-    public function destroy(Permission $permission)
+    public function destroy($permissionId)
     {
+        $permission = $this->permissionModel::findOrFail($permissionId);
         $permission->delete();
         return response(null, Response::HTTP_NO_CONTENT);
     }
diff --git a/src/Http/Controllers/RegisterController.php b/src/Http/Controllers/RegisterController.php
@@ -2,10 +2,8 @@
 
 namespace Bitfumes\Multiauth\Http\Controllers;
 
-use Illuminate\Http\Request;
 use Bitfumes\Multiauth\Model\Role;
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Admin;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Bitfumes\Multiauth\Http\Requests\AdminRequest;
@@ -47,12 +45,13 @@ public function __construct()
     {
         $this->middleware('auth:admin');
         $this->middleware('role:super');
+        $this->adminModel = config('multiauth.models.admin');
+        $this->roleModel  = config('multiauth.models.role');
     }
 
     public function showRegistrationForm()
     {
-        $roles = Role::all();
-
+        $roles = $this->roleModel::all();
         return view('multiauth::admin.register', compact('roles'));
     }
 
@@ -72,7 +71,7 @@ public function register(AdminRequest $request)
      */
     protected function create(array $data)
     {
-        $admin = new Admin();
+        $admin = new $this->adminModel();
 
         $fields           = $this->tableFields();
         $data['password'] = bcrypt($data['password']);
@@ -105,15 +104,17 @@ protected function tableFields()
         return collect(\Schema::getColumnListing('admins'));
     }
 
-    public function edit(Admin $admin)
+    public function edit($adminId)
     {
+        $admin = $this->adminModel::findOrFail($adminId);
         $roles = Role::all();
 
         return view('multiauth::admin.edit', compact('admin', 'roles'));
     }
 
-    public function update(Admin $admin, AdminRequest $request)
+    public function update($adminId, AdminRequest $request)
     {
+        $admin             = $this->adminModel::findOrFail($adminId);
         $request['active'] = request('activation') ?? 0;
         unset($request['activation']);
         $admin->update($request->except('role_id'));
@@ -122,8 +123,9 @@ public function update(Admin $admin, AdminRequest $request)
         return redirect(route('admin.show'))->with('message', "{$admin->name} details are successfully updated");
     }
 
-    public function destroy(Admin $admin)
+    public function destroy($adminId)
     {
+        $admin  = $this->adminModel::findOrFail($adminId);
         $prefix = config('multiauth.prefix');
         $admin->delete();
 
diff --git a/src/Http/Controllers/RoleController.php b/src/Http/Controllers/RoleController.php
@@ -3,47 +3,50 @@
 namespace Bitfumes\Multiauth\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Bitfumes\Multiauth\Model\Role;
 use Illuminate\Routing\Controller;
-use Bitfumes\Multiauth\Model\Permission;
 
 class RoleController extends Controller
 {
     public function __construct()
     {
         $this->middleware('auth:admin');
         $this->middleware('role:super');
+        $this->roleModel        = config('multiauth.models.role');
+        $this->adminModel       = config('multiauth.models.admin');
+        $this->permissionModel  = config('multiauth.models.permission');
     }
 
     public function index()
     {
-        $roles = Role::all();
+        $roles = $this->roleModel::all();
         return view('multiauth::roles.index', compact('roles'));
     }
 
     public function create()
     {
-        $permissions = Permission::all()->groupBy('parent');
+        $permissions = $this->permissionModel::all()->groupBy('parent');
         return view('multiauth::roles.create', compact('permissions'));
     }
 
-    public function edit(Role $role)
+    public function edit($roleId)
     {
+        $role        = $this->roleModel::findOrFail($roleId);
         $role        = $role->load('permissions');
-        $permissions = Permission::all()->groupBy('parent');
+        $permissions = $this->permissionModel::all()->groupBy('parent');
         return view('multiauth::roles.edit', compact('role', 'permissions'));
     }
 
     public function store(Request $request)
     {
         $request->validate(['name' => 'required']);
-        $role = Role::create($request->all());
+        $role = $this->roleModel::create($request->all());
         $role->addPermission($request->permissions);
         return redirect(route('admin.roles'))->with('message', 'New Role is stored successfully successfully');
     }
 
-    public function update(Role $role, Request $request)
+    public function update($roleId, Request $request)
     {
+        $role = $this->roleModel::findOrFail($roleId);
         $request->validate(['name' => 'required']);
 
         $role->update($request->all());
@@ -52,8 +55,9 @@ public function update(Role $role, Request $request)
         return redirect(route('admin.roles'))->with('message', 'You have updated Role successfully');
     }
 
-    public function destroy(Role $role)
+    public function destroy($roleId)
     {
+        $role = $this->roleModel::findOrFail($roleId);
         $role->delete();
 
         return redirect()->back()->with('message', 'You have deleted Role successfully');
diff --git a/src/Model/Admin.php b/src/Model/Admin.php
@@ -15,7 +15,8 @@ class Admin extends Authenticatable
 
     public function roles()
     {
-        return $this->belongsToMany(Role::class);
+        $role = config('multiauth.models.role');
+        return $this->belongsToMany($role);
     }
 
     /**
diff --git a/src/Model/Role.php b/src/Model/Role.php
@@ -21,7 +21,8 @@ protected static function boot()
 
     public function admins()
     {
-        return $this->belongsToMany(Admin::class);
+        $adminModel = config('multiauth.models.admin');
+        return $this->belongsToMany($adminModel);
     }
 
     public function permissions()
diff --git a/src/Providers/AuthServiceProvider.php b/src/Providers/AuthServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace Bitfumes\Multiauth\Providers;
 
-use Bitfumes\Multiauth\Model\Admin;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
@@ -24,9 +23,10 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        $adminModel = config('multiauth.models.admin');
         $this->registerPolicies();
         Gate::before(function ($admin, $ability) {
-            if ($admin instanceof Admin) {
+            if ($admin instanceof $adminModel) {
                 if ($this->isSuperAdmin($admin)) {
                     return true;
                 }
diff --git a/src/Traits/hasPermissions.php b/src/Traits/hasPermissions.php
@@ -3,13 +3,13 @@
 namespace Bitfumes\Multiauth\Traits;
 
 use Illuminate\Support\Collection;
-use Bitfumes\Multiauth\Model\Permission;
 
 trait hasPermissions
 {
     public function directPermissions()
     {
-        return $this->belongsToMany(Permission::class);
+        $permission = config('multiauth.models.permission');
+        return $this->belongsToMany($permission);
     }
 
     public function permissionsByRole()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace Bitfumes\Multiauth\Http\Controllers;`
`4`	`4`
`5`	`5`	`use Illuminate\Routing\Controller;`
`6`		`-use Bitfumes\Multiauth\Model\Admin;`
`7`	`6`	`use Illuminate\Foundation\Auth\Access\AuthorizesRequests;`
`8`	`7`
`9`	`8`	`class ActivationController extends Controller`
`@@ -16,15 +15,17 @@ public function __construct()`
`16`	`15`	`$this->adminModel = config('multiauth.models.admin');`
`17`	`16`	`}`
`18`	`17`
`19`		`- public function activate(Admin $admin)`
	`18`	`+ public function activate($adminId)`
`20`	`19`	`{`
	`20`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`21`	`21`	`$this->authorize('UpdateAdmin', $this->adminModel);`
`22`	`22`	`$admin->update(['active' => true]);`
`23`	`23`	`return redirect()->back();`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function deactivate(Admin $admin)`
	`26`	`+ public function deactivate($adminId)`
`27`	`27`	`{`
	`28`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`28`	`29`	`$this->authorize('UpdateAdmin', $this->adminModel);`
`29`	`30`	`$admin->update(['active' => false]);`
`30`	`31`	`return redirect()->back();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Http\Request;`
`6`	`6`	`use Illuminate\Routing\Controller;`
`7`		`-use Bitfumes\Multiauth\Model\Admin;`
`8`	`7`	`use Illuminate\Foundation\Auth\Access\AuthorizesRequests;`
`9`	`8`
`10`	`9`	`class AdminController extends Controller`
`@@ -30,7 +29,7 @@ public function index()`
`30`	`29`
`31`	`30`	`public function show()`
`32`	`31`	`{`
`33`		`- $admins = Admin::where('id', '!=', auth()->id())->get();`
	`32`	`+ $admins = $this->adminModel::where('id', '!=', auth()->id())->get();`
`34`	`33`
`35`	`34`	`return view('multiauth::admin.show', compact('admins'));`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,26 +2,30 @@`
`2`	`2`
`3`	`3`	`namespace Bitfumes\Multiauth\Http\Controllers;`
`4`	`4`
`5`		`-use Bitfumes\Multiauth\Model\Role;`
`6`	`5`	`use Illuminate\Routing\Controller;`
`7`		`-use Bitfumes\Multiauth\Model\Admin;`
`8`	`6`
`9`	`7`	`class AdminRoleController extends Controller`
`10`	`8`	`{`
`11`	`9`	`public function __construct()`
`12`	`10`	`{`
`13`	`11`	`$this->middleware('role:super');`
	`12`	`+ $this->adminModel = config('multiauth.models.admin');`
	`13`	`+ $this->roleModel = config('multiauth.models.role');`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function attach(Admin $admin, Role $role)`
	`16`	`+ public function attach($adminId, $roleId)`
`17`	`17`	`{`
	`18`	`+ $role = $this->roleModel::findOrFail($roleId);`
	`19`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`18`	`20`	`$admin->roles()->attach($role->id);`
`19`	`21`
`20`	`22`	`return redirect()->back();`
`21`	`23`	`}`
`22`	`24`
`23`		`- public function detach(Admin $admin, Role $role)`
	`25`	`+ public function detach($adminId, $roleId)`
`24`	`26`	`{`
	`27`	`+ $role = $this->roleModel::findOrFail($roleId);`
	`28`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`25`	`29`	`$admin->roles()->detach($role->id);`
`26`	`30`
`27`	`31`	`return redirect()->back();`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Bitfumes\Multiauth\Http\Controllers;`
`4`	`4`
`5`		`-use Illuminate\Http\Request;`
`6`	`5`	`use Bitfumes\Multiauth\Model\Role;`
`7`	`6`	`use Illuminate\Routing\Controller;`
`8`		`-use Bitfumes\Multiauth\Model\Admin;`
`9`	`7`	`use Illuminate\Auth\Events\Registered;`
`10`	`8`	`use Illuminate\Foundation\Auth\RegistersUsers;`
`11`	`9`	`use Bitfumes\Multiauth\Http\Requests\AdminRequest;`
`@@ -47,12 +45,13 @@ public function __construct()`
`47`	`45`	`{`
`48`	`46`	`$this->middleware('auth:admin');`
`49`	`47`	`$this->middleware('role:super');`
	`48`	`+ $this->adminModel = config('multiauth.models.admin');`
	`49`	`+ $this->roleModel = config('multiauth.models.role');`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function showRegistrationForm()`
`53`	`53`	`{`
`54`		`- $roles = Role::all();`
`55`		`-`
	`54`	`+ $roles = $this->roleModel::all();`
`56`	`55`	`return view('multiauth::admin.register', compact('roles'));`
`57`	`56`	`}`
`58`	`57`
`@@ -72,7 +71,7 @@ public function register(AdminRequest $request)`
`72`	`71`	`*/`
`73`	`72`	`protected function create(array $data)`
`74`	`73`	`{`
`75`		`- $admin = new Admin();`
	`74`	`+ $admin = new $this->adminModel();`
`76`	`75`
`77`	`76`	`$fields = $this->tableFields();`
`78`	`77`	`$data['password'] = bcrypt($data['password']);`
`@@ -105,15 +104,17 @@ protected function tableFields()`
`105`	`104`	`return collect(\Schema::getColumnListing('admins'));`
`106`	`105`	`}`
`107`	`106`
`108`		`- public function edit(Admin $admin)`
	`107`	`+ public function edit($adminId)`
`109`	`108`	`{`
	`109`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`110`	`110`	`$roles = Role::all();`
`111`	`111`
`112`	`112`	`return view('multiauth::admin.edit', compact('admin', 'roles'));`
`113`	`113`	`}`
`114`	`114`
`115`		`- public function update(Admin $admin, AdminRequest $request)`
	`115`	`+ public function update($adminId, AdminRequest $request)`
`116`	`116`	`{`
	`117`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`117`	`118`	`$request['active'] = request('activation') ?? 0;`
`118`	`119`	`unset($request['activation']);`
`119`	`120`	`$admin->update($request->except('role_id'));`
`@@ -122,8 +123,9 @@ public function update(Admin $admin, AdminRequest $request)`
`122`	`123`	`return redirect(route('admin.show'))->with('message', "{$admin->name} details are successfully updated");`
`123`	`124`	`}`
`124`	`125`
`125`		`- public function destroy(Admin $admin)`
	`126`	`+ public function destroy($adminId)`
`126`	`127`	`{`
	`128`	`+ $admin = $this->adminModel::findOrFail($adminId);`
`127`	`129`	`$prefix = config('multiauth.prefix');`
`128`	`130`	`$admin->delete();`
`129`	`131`
Original file line number	Diff line number	Diff line change
`@@ -3,47 +3,50 @@`
`3`	`3`	`namespace Bitfumes\Multiauth\Http\Controllers;`
`4`	`4`
`5`	`5`	`use Illuminate\Http\Request;`
`6`		`-use Bitfumes\Multiauth\Model\Role;`
`7`	`6`	`use Illuminate\Routing\Controller;`
`8`		`-use Bitfumes\Multiauth\Model\Permission;`
`9`	`7`
`10`	`8`	`class RoleController extends Controller`
`11`	`9`	`{`
`12`	`10`	`public function __construct()`
`13`	`11`	`{`
`14`	`12`	`$this->middleware('auth:admin');`
`15`	`13`	`$this->middleware('role:super');`
	`14`	`+ $this->roleModel = config('multiauth.models.role');`
	`15`	`+ $this->adminModel = config('multiauth.models.admin');`
	`16`	`+ $this->permissionModel = config('multiauth.models.permission');`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`public function index()`
`19`	`20`	`{`
`20`		`- $roles = Role::all();`
	`21`	`+ $roles = $this->roleModel::all();`
`21`	`22`	`return view('multiauth::roles.index', compact('roles'));`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`public function create()`
`25`	`26`	`{`
`26`		`- $permissions = Permission::all()->groupBy('parent');`
	`27`	`+ $permissions = $this->permissionModel::all()->groupBy('parent');`
`27`	`28`	`return view('multiauth::roles.create', compact('permissions'));`
`28`	`29`	`}`
`29`	`30`
`30`		`- public function edit(Role $role)`
	`31`	`+ public function edit($roleId)`
`31`	`32`	`{`
	`33`	`+ $role = $this->roleModel::findOrFail($roleId);`
`32`	`34`	`$role = $role->load('permissions');`
`33`		`- $permissions = Permission::all()->groupBy('parent');`
	`35`	`+ $permissions = $this->permissionModel::all()->groupBy('parent');`
`34`	`36`	`return view('multiauth::roles.edit', compact('role', 'permissions'));`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public function store(Request $request)`
`38`	`40`	`{`
`39`	`41`	`$request->validate(['name' => 'required']);`
`40`		`- $role = Role::create($request->all());`
	`42`	`+ $role = $this->roleModel::create($request->all());`
`41`	`43`	`$role->addPermission($request->permissions);`
`42`	`44`	`return redirect(route('admin.roles'))->with('message', 'New Role is stored successfully successfully');`
`43`	`45`	`}`
`44`	`46`
`45`		`- public function update(Role $role, Request $request)`
	`47`	`+ public function update($roleId, Request $request)`
`46`	`48`	`{`
	`49`	`+ $role = $this->roleModel::findOrFail($roleId);`
`47`	`50`	`$request->validate(['name' => 'required']);`
`48`	`51`
`49`	`52`	`$role->update($request->all());`
`@@ -52,8 +55,9 @@ public function update(Role $role, Request $request)`
`52`	`55`	`return redirect(route('admin.roles'))->with('message', 'You have updated Role successfully');`
`53`	`56`	`}`
`54`	`57`
`55`		`- public function destroy(Role $role)`
	`58`	`+ public function destroy($roleId)`
`56`	`59`	`{`
	`60`	`+ $role = $this->roleModel::findOrFail($roleId);`
`57`	`61`	`$role->delete();`
`58`	`62`
`59`	`63`	`return redirect()->back()->with('message', 'You have deleted Role successfully');`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class Admin extends Authenticatable`
`15`	`15`
`16`	`16`	`public function roles()`
`17`	`17`	`{`
`18`		`- return $this->belongsToMany(Role::class);`
	`18`	`+ $role = config('multiauth.models.role');`
	`19`	`+ return $this->belongsToMany($role);`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ protected static function boot()`
`21`	`21`
`22`	`22`	`public function admins()`
`23`	`23`	`{`
`24`		`- return $this->belongsToMany(Admin::class);`
	`24`	`+ $adminModel = config('multiauth.models.admin');`
	`25`	`+ return $this->belongsToMany($adminModel);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public function permissions()`