fix: correct providerplatform request behavior, attempt to fix user role

UnlockedLabs · Mar 18, 2024 · 7937c64 · 7937c64
1 parent 4d739fa
commit 7937c64
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 24 deletions.
diff --git a/app/Enums/UserRole.php b/app/Enums/UserRole.php
@@ -4,6 +4,6 @@
 
 enum UserRole: string
 {
-    case Admin = 'admin';
-    case Student = 'student';
+    case ADMIN = 'admin';
+    case STUDENT = 'student';
 }
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -45,7 +45,7 @@ public function store(Request $request): RedirectResponse
             'name_last' => $request->name_last,
             'password' => Hash::make($request->password),
             'reset_password' => false,
-            'role' => UserRole::Student,
+            'role' => UserRole::STUDENT,
         ]);
 
         event(new Registered($user));

diff --git a/app/Http/Controllers/Auth/StudentNewPasswordController.php b/app/Http/Controllers/Auth/StudentNewPasswordController.php
@@ -25,7 +25,7 @@ public function store(Request $request): JsonResponse|RedirectResponse
         // set `reset_password` to `true` so that on next login they can be
         // prompted to set their new password.
         $user = User::where('username', $request->username)->first();
-        if ($user['role'] === UserRole::Student) {
+        if ($user['role'] === UserRole::STUDENT) {
             $pw = $user->createTempPassword();
 
             return response()->json([

diff --git a/app/Http/Controllers/v1/Actions/StoreCanvasUsersAction.php b/app/Http/Controllers/v1/Actions/StoreCanvasUsersAction.php
@@ -29,7 +29,7 @@ public function __invoke(Request $request)
                 'email' => $user_profile['email'],
                 'name_first' => $user_profile['first_name'],
                 'name_last' => $user_profile['last_name'],
-                'role' => UserRole::Student,
+                'role' => UserRole::STUDENT,
                 'password' => bcrypt('ChangeMe!'),
                 'password_reset' => true,
             ]);

diff --git a/app/Http/Controllers/v1/UserController.php b/app/Http/Controllers/v1/UserController.php
@@ -46,6 +46,11 @@ public function index(AdminRequest $request)
      */
     public function store(StoreUserRequest $request)
     {
+        $role = match ($request->role) {
+            'admin' => 'admin',
+            'student' => 'student',
+            default => 'student',
+        };
         try {
             $user = $request->validated();
         } catch (\Throwable $th) {
@@ -55,6 +60,7 @@ public function store(StoreUserRequest $request)
             ], 422);
         }
         $newUser = new User($user);
+        $newUser->role = $role;
         $pw = $newUser->createTempPassword();
 
         return response(NewUserResource::withPassword($newUser, $pw), 201);

diff --git a/app/Http/Requests/StoreProviderPlatformRequest.php b/app/Http/Requests/StoreProviderPlatformRequest.php
@@ -29,7 +29,7 @@ public function rules(): array
             'type' => [Rule::enum(ProviderPlatformType::class)],
             'description' => 'nullable|string|max:255',
             'icon_url' => 'nullable|url:http,https',
-            'account_id' => 'required|unique:provider_platforms,account_id',
+            'account_id' => 'required|integer',
             'access_key' => 'required|string|max:255',
             'base_url' => 'required|url:http,https',
             'state' => [Rule::enum(ProviderPlatformState::class)],

diff --git a/app/Http/Requests/StoreUserRequest.php b/app/Http/Requests/StoreUserRequest.php
@@ -26,7 +26,7 @@ public function rules(): array
             'name_last' => 'required|string|max:35',
             'email' => 'nullable|email|max:90|unique:users',
             'username' => 'required|string|max:70|unique:users',
-            'role' => 'required|string|in:student,admin',
+            'role' => 'required|string',
         ];
     }
 }
diff --git a/app/Http/Requests/UpdateProviderPlatformRequest.php b/app/Http/Requests/UpdateProviderPlatformRequest.php
@@ -2,10 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Enums\ProviderPlatformState;
-use App\Enums\ProviderPlatformType;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class UpdateProviderPlatformRequest extends FormRequest
 {
@@ -26,13 +23,13 @@ public function rules(): array
     {
         return [
             'name' => 'nullable|string|max:255',
-            'type' => [Rule::enum(ProviderPlatformType::class)],
+            'type' => 'required|string',
             'description' => 'nullable|string|max:255',
             'icon_url' => 'nullable|url:http,https',
-            'account_id' => 'nullable|int|unique:provider_platforms,account_id',
+            'account_id' => 'nullable|int',
             'access_key' => 'nullable|string|max:255',
             'base_url' => 'nullable|url:http,https',
-            'state' => [Rule::enum(ProviderPlatformState::class)],
+            'state' => 'required|string',
         ];
     }
 }
diff --git a/app/Jobs/UserCourseActivityTask.php b/app/Jobs/UserCourseActivityTask.php
@@ -33,7 +33,7 @@ class UserCourseActivityTask implements ShouldQueue
      */
     public function __construct()
     {
-        $this->users = User::where('role', UserRole::Student)->get();
+        $this->users = User::where('role', UserRole::STUDENT)->get();
         $this->providers = ProviderPlatform::all();
     }
 

diff --git a/app/Models/ProviderPlatform.php b/app/Models/ProviderPlatform.php
@@ -46,7 +46,7 @@ public function decryptAccessKey()
 
     public function getCanvasServices(): \App\Services\CanvasServices
     {
-        return new \App\Services\CanvasServices($this['id'], $this['account_id'], $this['access_key'], $this['base_url']);
+        return new \App\Services\CanvasServices($this->attributes['id'], $this->attributes['account_id'], $this->attributes['access_key'], $this->attributes['base_url']);
     }
 
     public function hasUserMapping($user)

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -70,7 +70,7 @@ public function providerUserMappings()
 
     public function isAdmin(): bool
     {
-        return $this->role === UserRole::Admin;
+        return $this->role === UserRole::ADMIN;
     }
 
     public function userActivity()

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -32,7 +32,7 @@ public function definition(): array
             'email_verified_at' => now(),
             'password' => static::$password ??= Hash::make('password'),
             'remember_token' => Str::random(10),
-            'role' => UserRole::Student,
+            'role' => UserRole::STUDENT,
             'username' => $first.$last.$count,
         ];
     }
@@ -43,7 +43,7 @@ public function definition(): array
     public function admin(): static
     {
         return $this->state(fn (array $attributes) => [
-            'role' => UserRole::Admin,
+            'role' => UserRole::ADMIN,
         ]);
     }
 

diff --git a/database/migrations/2024_03_18_151634_change_access_key_field_in_provider_platform.php b/database/migrations/2024_03_18_151634_change_access_key_field_in_provider_platform.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('provider_platforms', function (Blueprint $table) {
+            $table->longText('access_key')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('provider_platforms', function (Blueprint $table) {
+            $table->string('access_key')->change();
+        });
+    }
+};
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -26,7 +26,7 @@ public function run(): void
             'username' => 'SuperAdmin',
             'password' => bcrypt('ChangeMe!'),
             'password_reset' => true,
-            'role' => UserRole::Admin,
+            'role' => UserRole::ADMIN,
         ]);
         DB::table('categories')->insert([
             'name' => 'Unlocked Labs',
@@ -61,7 +61,7 @@ public function run(): void
                     'name_last' => $userInfo[3],
                     'password' => bcrypt('ChangeMe!'),
                     'password_reset' => true,
-                    'role' => UserRole::Admin,
+                    'role' => UserRole::ADMIN,
                 ]);
                 if (count($userInfo) > 4) {
                     // there is provider info included

diff --git a/database/seeders/DefaultAdmin.php b/database/seeders/DefaultAdmin.php
@@ -23,7 +23,7 @@ public function run(): void
             'username' => 'SuperAdmin',
             'password' => bcrypt('ChangeMe!'),
             'password_reset' => true,
-            'role' => UserRole::Admin,
+            'role' => UserRole::ADMIN,
         ]);
         DB::table('provider_platforms')->insert([
             'type' => ProviderPlatformType::CANVAS_OSS,

diff --git a/tests/Feature/CanvasIntegrationTest.php b/tests/Feature/CanvasIntegrationTest.php
@@ -63,7 +63,7 @@ public function test_fetching_users_from_canvas(): void
         ];
         $resp = $this->actingAs($admin)->post('api/v1/actions/import-canvas-users', $req);
         $resp->assertSuccessful();
-        $users = User::where(['role' => UserRole::Student])->get();
+        $users = User::where(['role' => UserRole::STUDENT])->get();
         $this->assertDatabaseCount('users', 7);
         foreach ($users as $user) {
             // assert each has a provider mapping, and that they exist

diff --git a/tests/Feature/UserControllerTest.php b/tests/Feature/UserControllerTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature;
 
+use App\Enums\UserRole;
 use Database\Seeders\TestSeeder;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
@@ -58,7 +59,7 @@ public function testUpdateUser()
     {
         $this->seed(TestSeeder::class);
         $user = \App\Models\User::factory()->admin()->create();
-        $response = $this->actingAs($user)->patch($this->uri.'/'.$user->id, ['name_first' => 'TestUpdate']);
+        $response = $this->actingAs($user)->patch($this->uri.'/'.$user->id, ['name_first' => 'TestUpdate', 'role' => UserRole::ADMIN]);
         $response->assertStatus(200);
         $this->assertTrue($response['data']['name_first'] == 'TestUpdate');
         $response->assertJsonStructure([

diff --git a/tests/Feature/UserCourseActivityJobTest.php b/tests/Feature/UserCourseActivityJobTest.php
@@ -29,7 +29,7 @@ public function it_processes_user_activity_data_correctly()
         $resp = $this->actingAs($admin)->post('api/v1/actions/store-canvas-courses', ['provider_platform_id' => 1]);
         $resp->assertSuccessful();
 
-        $users = User::where('role', UserRole::Student)->get();
+        $users = User::where('role', UserRole::STUDENT)->get();
         foreach ($users as $user) {
             $id = $user->id;
             $resp = $this->actingAs($admin)->post('api/v1/actions/store-user-enrollments', ['provider_platform_id' => 1, 'user_id' => $id]);