Merge branch '5.2' into 6.0

userfrosting · Sep 27, 2024 · a6d010c · a6d010c
2 parents 7ccb3c3 + 45a4ef2
commit a6d010c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [5.2.0](https://github.com/userfrosting/sprinkle-account/compare/5.1.0...5.2.0)
 
+## [5.1.5](https://github.com/userfrosting/sprinkle-account/compare/5.1.4...5.1.5)
+- `Authenticator::checkAccess` wouldn't use the logged in user if it wasn't loaded before
+
+## [5.1.4](https://github.com/userfrosting/sprinkle-account/compare/5.1.3...5.1.4)
+- Update SiteLocale for sprinkle-core 5.1.3
+- User field `deleted_at` can be null if the user has not been deleted
+
 ## [5.1.3](https://github.com/userfrosting/sprinkle-account/compare/5.1.2...5.1.3)
 - Fix another SQL issue when working with extending the User model with an auxiliary table.
 

diff --git a/app/src/Authenticate/Authenticator.php b/app/src/Authenticate/Authenticator.php
@@ -317,7 +317,7 @@ public function flushSessionCache(string $id): bool
      */
     public function checkAccess(string $slug, array $params = []): bool
     {
-        return $this->authorizationManager->checkAccess($this->user, $slug, $params);
+        return $this->authorizationManager->checkAccess($this->user(), $slug, $params);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -317,7 +317,7 @@ public function flushSessionCache(string $id): bool @@
          */
         public function checkAccess(string $slug, array $params = []): bool
         {
-            return $this->authorizationManager->checkAccess($this->user, $slug, $params);
+            return $this->authorizationManager->checkAccess($this->user(), $slug, $params);
         }
         /**
@@ Expand Down @@