[Release Test PR] Release 2.35.1

api/app/Checkers/ProtectedRequestUserChecker.php

@@ -63,7 +63,7 @@ public function currentUserHasRole(
         bool $requireAll = false
     ): bool {
         if (! $this->isSafeToUseRole($name)) {
-            Log::warning('Tried to unsafely use role '.json_encode($name));
+            Log::debug('Tried to unsafely use role '.json_encode($name));
 
             return false; // user effectively doesn't have role if it is unsafe to use it
         }
@@ -77,7 +77,7 @@ public function currentUserHasPermission(
         bool $requireAll = false
     ): bool {
         if (! $this->isSafeToUsePermission($permission)) {
-            Log::warning('Tried to unsafely use permission '.json_encode($permission));
+            Log::debug('Tried to unsafely use permission '.json_encode($permission));
 
             return false; // user effectively doesn't have permission if it is unsafe to use it
         }

api/app/GraphQL/Mutations/ArchivePool.php

@@ -16,7 +16,7 @@ public function __invoke($_, array $args)
     {
         $pool = Pool::find($args['id']);
         if ($pool->getStatusAttribute() !== PoolStatus::CLOSED->name) {
-            throw ValidationException::withMessages(['ArchivePoolInvalidStatus']);
+            throw ValidationException::withMessages(['id' => 'ArchivePoolInvalidStatus']);
         }
         $pool->update(['archived_at' => Carbon::now()]);
 

api/app/GraphQL/Mutations/CreateUserSkill.php

@@ -30,7 +30,7 @@ public function __invoke($_, array $args): UserSkill
 
                 return $existingModel;
             }
-            throw ValidationException::withMessages(['DuplicateUserSkill']);
+            throw ValidationException::withMessages(['skill_id' => 'DuplicateUserSkill']);
         }
 
         $createdModel = UserSkill::create([

api/app/GraphQL/Mutations/DeleteApplication.php

@@ -26,7 +26,7 @@ public function __invoke($_, array $args)
         // execute hard delete and verify model was deleted by checking that is not true
         $success = $application->forceDelete();
         if (! $success) {
-            throw ValidationException::withMessages([ApiErrorEnums::APPLICATION_DELETE_FAILED]);
+            throw ValidationException::withMessages(['id' => ApiErrorEnums::APPLICATION_DELETE_FAILED]);
         }
 
         return $application;

api/app/GraphQL/Mutations/ReinstateCandidate.php

@@ -30,7 +30,7 @@ public function __invoke($_, array $args)
                 $candidate->pool_candidate_status = PoolCandidateStatus::NEW_APPLICATION->name;
                 break;
             default:
-                throw ValidationException::withMessages(['CandidateUnexpectedStatus']);
+                throw ValidationException::withMessages(['id' => 'CandidateUnexpectedStatus']);
         }
 
         $candidate->removed_at = null;

api/app/GraphQL/Mutations/RemoveCandidate.php

@@ -44,15 +44,15 @@ public function __invoke($_, array $args)
             case PoolCandidateStatus::PLACED_CASUAL->name:
             case PoolCandidateStatus::PLACED_TERM->name:
             case PoolCandidateStatus::PLACED_INDETERMINATE->name:
-                throw ValidationException::withMessages(['RemoveCandidateAlreadyPlaced']);
+                throw ValidationException::withMessages(['id' => 'RemoveCandidateAlreadyPlaced']);
             case PoolCandidateStatus::SCREENED_OUT_NOT_INTERESTED->name:
             case PoolCandidateStatus::SCREENED_OUT_NOT_RESPONSIVE->name:
             case PoolCandidateStatus::QUALIFIED_UNAVAILABLE->name:
             case PoolCandidateStatus::QUALIFIED_WITHDREW->name:
             case PoolCandidateStatus::REMOVED->name:
-                throw ValidationException::withMessages(['RemoveCandidateAlreadyRemoved']);
+                throw ValidationException::withMessages(['id' => 'RemoveCandidateAlreadyRemoved']);
             default:
-                throw ValidationException::withMessages(['CandidateUnexpectedStatus']);
+                throw ValidationException::withMessages(['id' => 'CandidateUnexpectedStatus']);
         }
 
         $candidate->save();

api/app/GraphQL/Mutations/SwapAssessmentStepOrder.php

@@ -15,12 +15,12 @@ public function __invoke($_, array $args)
 
         // Ensure the steps belong to the same pool
         if ($stepA->pool_id !== $stepB->pool_id) {
-            throw ValidationException::withMessages(['AssessmentStepsSamePool']);
+            throw ValidationException::withMessages(['stepIdA' => 'AssessmentStepsSamePool']);
         }
 
         // Don't swap the reserved first two spots
         if ($stepA->sort_order < 3 || $stepB->sort_order < 3) {
-            throw ValidationException::withMessages(['AssessmentStepCannotSwap']);
+            throw ValidationException::withMessages(['stepIdA' => 'AssessmentStepCannotSwap']);
         }
 
         DB::beginTransaction();

api/app/GraphQL/Mutations/UnarchivePool.php

@@ -15,7 +15,7 @@ public function __invoke($_, array $args)
     {
         $pool = Pool::find($args['id']);
         if ($pool->getStatusAttribute() !== PoolStatus::ARCHIVED->name) {
-            throw ValidationException::withMessages(['UnarchivePoolInvalidStatus']);
+            throw ValidationException::withMessages(['status' => 'UnarchivePoolInvalidStatus']);
         }
         $pool->update(['archived_at' => null]);
 

api/app/GraphQL/Mutations/UpdateUserSkillRankings.php

@@ -10,7 +10,7 @@ final class UpdateUserSkillRankings
     /**
      * Update a user's UserSkill rankings
      *
-     * @param  array{userId: UUID, userSkillRanking: UpdateUserSkillRankingsInput}  $args
+     * @param  array{userId: string, userSkillRanking: array}  $args
      * @return User
      */
     public function __invoke($_, array $args)

api/app/GraphQL/Mutations/VerifyUserEmail.php

@@ -35,7 +35,7 @@ public function __invoke($_, array $args)
         }
 
         if (! $isValid) {
-            throw ValidationException::withMessages(['VERIFICATION_FAILED']);
+            throw ValidationException::withMessages(['code' => 'VERIFICATION_FAILED']);
         }
 
         // by now, token seems good

api/app/GraphQL/Validators/DisqualifyCandidateValidator.php

@@ -29,7 +29,7 @@ public function rules(): array
         ];
 
         if (! (in_array($candidate->pool_candidate_status, $statusesArray))) {
-            throw ValidationException::withMessages([ApiErrorEnums::INVALID_STATUS_DISQUALIFICATION]);
+            throw ValidationException::withMessages(['status' => ApiErrorEnums::INVALID_STATUS_DISQUALIFICATION]);
         }
 
         return [];

api/app/GraphQL/Validators/PlaceCandidateValidator.php

@@ -27,7 +27,7 @@ public function rules(): array
         $statusesArray = [...$placedStatuses, PoolCandidateStatus::QUALIFIED_AVAILABLE->name];
 
         if (! (in_array($candidate->pool_candidate_status, $statusesArray))) {
-            throw ValidationException::withMessages([ApiErrorEnums::INVALID_STATUS_PLACING]);
+            throw ValidationException::withMessages(['id' => ApiErrorEnums::INVALID_STATUS_PLACING]);
         }
 
         return [

api/app/GraphQL/Validators/QualifyCandidateValidator.php

@@ -32,7 +32,7 @@ public function rules(): array
         ];
 
         if (! (in_array($candidate->pool_candidate_status, $statusesArray))) {
-            throw ValidationException::withMessages([ApiErrorEnums::INVALID_STATUS_QUALIFICATION]);
+            throw ValidationException::withMessages(['id' => ApiErrorEnums::INVALID_STATUS_QUALIFICATION]);
         }
 
         return [

api/app/GraphQL/Validators/RevertFinalDecisionValidator.php

@@ -30,7 +30,7 @@ public function rules(): array
         ];
 
         if (! (in_array($candidate->pool_candidate_status, $statusesArray))) {
-            throw ValidationException::withMessages([ApiErrorEnums::INVALID_STATUS_REVERT_FINAL_DECISION]);
+            throw ValidationException::withMessages(['id' => ApiErrorEnums::INVALID_STATUS_REVERT_FINAL_DECISION]);
         }
 
         return [];

api/app/GraphQL/Validators/RevertPlaceCandidateValidator.php

@@ -24,7 +24,7 @@ public function rules(): array
         $placedStatuses = array_column(PlacementType::cases(), 'name');
 
         if (! (in_array($candidate->pool_candidate_status, $placedStatuses))) {
-            throw ValidationException::withMessages([ApiErrorEnums::CANDIDATE_NOT_PLACED]);
+            throw ValidationException::withMessages(['id' => ApiErrorEnums::CANDIDATE_NOT_PLACED]);
         }
 
         return [];

api/app/Http/Controllers/AuthController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Role;
 use App\Models\User;
 use App\Services\OpenIdBearerTokenService;
 use Carbon\Carbon;
@@ -122,6 +123,16 @@ public function authCallback(Request $request)
         if (isset($userMatch)) {
             $userMatch->last_sign_in_at = $now;
             $userMatch->save();
+        } else {
+            // No user found for given subscriber - lets auto-register them
+            $newUser = new User;
+            $newUser->sub = $sub;
+            $newUser->last_sign_in_at = $now;
+            $newUser->save();
+            $newUser->syncRoles([  // every new user is automatically an base_user and an applicant
+                Role::where('name', 'base_user')->sole(),
+                Role::where('name', 'applicant')->sole(),
+            ], null);
         }
 
         $query = http_build_query($response->json());

api/app/Http/Controllers/CspReportController.php

@@ -11,11 +11,8 @@ public function report(Request $request)
     {
         $report = $request->json()->all();
         $message = sprintf(
-            'CSP violation, %s, %s, %s, %s',
-            $report['csp-report']['blocked-uri'] ?? '',
-            $report['csp-report']['violated-directive'] ?? '',
-            $report['csp-report']['source-file'] ?? '',
-            json_encode($report['csp-report'])
+            'CSP violation, %s',
+            json_encode($report)
         );
 
         Log::warning($message);

api/app/Models/Experience.php

@@ -17,8 +17,8 @@
 /**
  * Class Experience
  *
- * @property int $id
- * @property int $user_id
+ * @property string $id
+ * @property string $user_id
  * @property \Illuminate\Support\Carbon $start_date
  * @property ?\Illuminate\Support\Carbon $end_date
  * @property \Illuminate\Support\Carbon $created_at
@@ -37,13 +37,14 @@ class Experience extends Model
     /**
      * Create a new concrete model instance that is existing, based on the type field.
      *
-     * @param  object  $attributes
+     * @param  mixed  $attributes
      * @param  string|null  $connection
      * @return static
      */
     public function newFromBuilder($attributes = [], $connection = null)
     {
-        $model = $this->newInstanceFromType($attributes->experience_type);
+        /** @disregard Even though it is typed as an array, it is actually a class */
+        $model = $this->newInstanceFromType(((object) $attributes)->experience_type);
 
         $model->exists = true;
 
@@ -234,7 +235,7 @@ protected static function getJsonPropertyDate(array $attributes, string $propert
         return null;
     }
 
-    protected static function setJsonPropertyDate(mixed $value, array $attributes, string $propertyName)
+    protected static function setJsonPropertyDate(mixed $value, ?array $attributes, string $propertyName)
     {
         $properties = json_decode($attributes['properties'] ?? '{}');
         if (! empty($value)) {
@@ -249,8 +250,8 @@ protected static function setJsonPropertyDate(mixed $value, array $attributes, s
     protected function makeJsonPropertyDateAttribute(string $propertyName): Attribute
     {
         return Attribute::make(
-            get: fn (mixed $value, array $attributes) => $this::getJsonPropertyDate($attributes, $propertyName),
-            set: fn (mixed $value, array $attributes) => $this::setJsonPropertyDate($value, $attributes, $propertyName)
+            get: fn (mixed $value, mixed $attributes) => $this::getJsonPropertyDate($attributes, $propertyName),
+            set: fn (mixed $value, ?array $attributes = []) => $this::setJsonPropertyDate($value, $attributes, $propertyName)
         );
     }
 
@@ -277,7 +278,7 @@ protected function makeJsonPropertyStringAttribute(string $propertyName): Attrib
     {
         return Attribute::make(
             get: fn (mixed $value, array $attributes) => $this::getJsonPropertyString($attributes, $propertyName),
-            set: fn (mixed $value, array $attributes) => $this::setJsonPropertyString($value, $attributes, $propertyName)
+            set: fn (mixed $value, ?array $attributes = []) => $this::setJsonPropertyString($value, $attributes, $propertyName)
         );
     }
 

api/app/Models/User.php

@@ -346,7 +346,7 @@ public function getDepartment()
             return '';
         }
 
-        return $this->department()->get('name');
+        return $this->department()->get(['name']);
     }
 
     public function getPriorityAttribute()
@@ -974,6 +974,15 @@ public static function scopeEmail(Builder $query, ?string $email): Builder
         return $query;
     }
 
+    public static function scopeWorkEmail(Builder $query, ?string $email): Builder
+    {
+        if ($email) {
+            $query->where('work_email', 'ilike', "%{$email}%");
+        }
+
+        return $query;
+    }
+
     public static function scopeIsGovEmployee(Builder $query, ?bool $isGovEmployee): Builder
     {
         if ($isGovEmployee) {

api/app/Notify/Client.php

@@ -88,7 +88,7 @@ public function sendSms($to, $template, $personalisation = [], $reference = null
      *                              ]
      *                              ]
      * @param  string  $template  ID of the template to use
-     * @param  Carbon\Carbon  $scheduleFor  (optional)
+     * @param  \Illuminate\Support\Carbon  $scheduleFor  (optional)
      * @param  string  $replyTo  (optional) ID for a reply to email address
      */
     public function sendBulkEmail($name, $rows, $template, $scheduleFor = null, $replyTo = null)
@@ -115,7 +115,7 @@ public function sendBulkEmail($name, $rows, $template, $scheduleFor = null, $rep
      *                              ]
      *                              ]
      * @param  string  $template  ID of the template to use
-     * @param  Carbon\Carbon  $scheduleFor  (optional)
+     * @param  \Illuminate\Support\Carbon  $scheduleFor  (optional)
      * @param  string  $replyTo  (optional) ID for a reply to email address
      */
     public function sendBulkSms($name, $rows, $template, $scheduleFor = null, $replyTo = null)
@@ -211,7 +211,7 @@ private function buildSmsPayload($to, $template, $personalisation = [], $referen
      * @param  string  $name  Used to identify this bulk of notifications later on.
      * @param  array<mixed>  $rows  The recipient of the notification
      * @param  string  $template  Template of the notification
-     * @param  Carbon\Carbon  $scheduleFor  (optional)
+     * @param  \Illuminate\Support\Carbon  $scheduleFor  (optional)
      * @param  string  $replyTo  (optional) ID for a reply to email address
      * @return array<mixed> The partial payload
      */
@@ -243,7 +243,7 @@ private function buildBulkPayload($name, $rows, $template, $scheduleFor = null,
      * @param  string  $name  Used to identify this bulk of notifications later on.
      * @param  array<mixed>  $rows  The recipient of the notification
      * @param  string  $template  Template of the notification
-     * @param  Carbon\Carbon  $scheduleFor  (optional)
+     * @param  \Illuminate\Support\Carbon  $scheduleFor  (optional)
      * @param  string  $replyTo  (optional) ID for a reply to email address
      * @return array<mixed> The partial payload
      */
@@ -285,7 +285,7 @@ private function buildBulkEmailPayload($name, $rows, $template, $scheduleFor = n
      * @param  string  $name  Used to identify this bulk of notifications later on.
      * @param  array<mixed>  $rows  The recipient of the notification
      * @param  string  $template  Template of the notification
-     * @param  Carbon\Carbon  $scheduleFor  (optional)
+     * @param  \Illuminate\Support\Carbon  $scheduleFor  (optional)
      * @param  string  $replyTo  (optional) ID for a reply to email address
      * @return array<mixed> The partial payload
      */

api/app/Policies/UserPolicy.php

@@ -82,7 +82,7 @@ public function updateSub(User $user)
     /**
      * Determine whether the user can update roles.
      *
-     * @param  UpdateUserRolesInput  $args
+     * @param  array{id: ?string, roleAssignmentsInput: ?array{attach: ?array, detach: ?array}}  $args
      * @return \Illuminate\Auth\Access\Response|bool
      */
     public function updateRoles(User $user, $args)

api/app/Providers/AuthServiceProvider.php

@@ -11,7 +11,6 @@
 use App\Models\PersonalExperience;
 use App\Models\Pool;
 use App\Models\PoolCandidate;
-use App\Models\Role;
 use App\Models\User;
 use App\Models\WorkExperience;
 use App\Policies\ClassificationPolicy;
@@ -103,16 +102,8 @@ public function resolveUserOrAbort($bearerToken, $tokenService): ?User
 
                 return $userMatch;
             } else {
-                // No user found for given subscriber - lets auto-register them
-                $newUser = new User;
-                $newUser->sub = $sub;
-                $newUser->save();
-                $newUser->syncRoles([  // every new user is automatically an base_user and an applicant
-                    Role::where('name', 'base_user')->sole(),
-                    Role::where('name', 'applicant')->sole(),
-                ], null);
-
-                return $newUser;
+                // No user found for given subscriber
+                throw new AuthenticationException('Login as un-retrievable user: '.$sub, 'user_not_found');
             }
         }