UserWithId Strategy calls id() method on User Model (#32)

Author: rneal-ck

composer.json

@@ -5,7 +5,8 @@
     "require": {
         "guzzlehttp/guzzle": "^6.3|^7.0",
         "illuminate/support": "^5.8|^6|^7|^8",
-        "illuminate/http": "^5.8|^6|^7|^8"
+        "illuminate/http": "^5.8|^6|^7|^8",
+        "illuminate/contracts": "^5.8|^6|^7|^8"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.3",

config/unleash.php

@@ -45,6 +45,6 @@
     'applicationHostname' => \MikeFrancis\LaravelUnleash\Strategies\ApplicationHostnameStrategy::class,
     'default' => \MikeFrancis\LaravelUnleash\Strategies\DefaultStrategy::class,
     'remoteAddress' => \MikeFrancis\LaravelUnleash\Strategies\RemoteAddressStrategy::class,
-    'userWithIds' => \MikeFrancis\LaravelUnleash\Strategies\UserWithIdStrategy::class,
+    'userWithId' => \MikeFrancis\LaravelUnleash\Strategies\UserWithIdStrategy::class,
   ],
 ];

src/Strategies/UserWithIdStrategy.php

@@ -16,6 +16,6 @@ public function isEnabled(array $params, Request $request): bool
             return false;
         }
 
-        return in_array($user->id(), $userIds);
+        return in_array($user->getAuthIdentifier(), $userIds);
     }
 }

tests/Strategies/UserWithIdStrategyTest.php

@@ -2,7 +2,7 @@
 
 namespace MikeFrancis\LaravelUnleash\Tests\Strategies;
 
-use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Http\Request;
 use MikeFrancis\LaravelUnleash\Strategies\UserWithIdStrategy;
 use PHPUnit\Framework\TestCase;
@@ -15,8 +15,8 @@ public function testWithUserId()
             'userIds' => '123,456',
         ];
 
-        $userMock = $this->createMock(Guard::class);
-        $userMock->expects($this->once())->method('id')->willReturn(123);
+        $userMock = $this->createMock(Authenticatable::class);
+        $userMock->expects($this->once())->method('getAuthIdentifier')->willReturn(123);
         $request = $this->createMock(Request::class);
         $request->expects($this->once())->method('user')->willReturn($userMock);
 
@@ -31,8 +31,8 @@ public function testWithInvalidUserId()
             'userIds' => '123,456',
         ];
 
-        $userMock = $this->createMock(Guard::class);
-        $userMock->expects($this->once())->method('id')->willReturn(789);
+        $userMock = $this->createMock(Authenticatable::class);
+        $userMock->expects($this->once())->method('getAuthIdentifier')->willReturn(789);
         $request = $this->createMock(Request::class);
         $request->expects($this->once())->method('user')->willReturn($userMock);