Merge pull request #23 from openfoodfoundation/feataure/admin-team-pa…

…ge-update

Updated admin panel and removed team form PAT

app/Http/Controllers/Api/V1/Admin/ApiAdminUserPersonalAccessTokensController.php

@@ -87,11 +87,7 @@ public function store(): JsonResponse
 
                 $user = User::find($userId);
 
-                $token = $user->createToken(
-                    name: $name,
-                    abilities: $tokenAbilities,
-                    teamId: $user->current_team_id
-                );
+                $token = $user->createToken($name, $tokenAbilities);
 
                 $this->message = ApiResponse::RESPONSE_SAVED->value;
                 $this->data    = ['token' => $token->plainTextToken];

app/Models/User.php

@@ -5,15 +5,12 @@
 namespace App\Models;
 
 // use Illuminate\Contracts\Auth\MustVerifyEmail;
-use DateTimeInterface;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Laravel\Sanctum\HasApiTokens;
-use Laravel\Sanctum\NewAccessToken;
-use Str;
 
 class User extends Authenticatable
 {
@@ -64,17 +61,4 @@ public function currentTeam(): BelongsTo
     {
         return $this->belongsTo(Team::class);
     }
-
-    public function createToken(string $name, array $abilities, int $teamId, ?DateTimeInterface $expiresAt = null): NewAccessToken
-    {
-        $token = $this->tokens()->create([
-            'name'       => $name,
-            'token'      => hash('sha256', $plainTextToken = Str::random(40)),
-            'abilities'  => $abilities,
-            'team_id'    => $teamId,
-            'expires_at' => $expiresAt,
-        ]);
-
-        return new NewAccessToken($token, $token->getKey() . '|' . $plainTextToken);
-    }
 }

app/Providers/AppServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace App\Providers;
 
-use App\Models\PersonalAccessToken;
 use Illuminate\Support\ServiceProvider;
-use Laravel\Sanctum\Sanctum;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -16,8 +14,5 @@ public function register(): void {}
     /**
      * Bootstrap any application services.
      */
-    public function boot(): void
-    {
-        Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class);
-    }
+    public function boot(): void {}
 }