Skip to content

feat: updated to support php-cube/core new cookie system #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 16, 2025
Merged

feat: updated to support php-cube/core new cookie system #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
vendor
.DS_Store
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cube-php/auth",
"description": "PHP Cube Authentication Package",
"type": "package",
"version": "0.0.5",
"version": "0.0.6",
"license": "MIT",
"autoload": {
"psr-4": {
Expand All @@ -16,7 +16,7 @@
}
],
"require": {
"cube-php/core": "^0.1.23",
"cube-php/core": "0.1.31",
"firebase/php-jwt": "^6.10"
},
"extra": {
Expand Down
20 changes: 10 additions & 10 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions src/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,14 +211,15 @@ public static function getTokenFromRequest(Request $request, AuthTokenType $type
/**
* User
*
* @param Request $request
* @return ModelInterface|null
*/
public static function user(): ?ModelInterface
public static function user(Request $request): ?ModelInterface
{
$auth_id = Session::get(self::$auth_name);

if (!$auth_id) {
return self::getAuthUserFromCookie();
return self::getAuthUserFromCookie($request);
}

$model = self::getConfigField(AuthConfig::MODEL);
Expand Down Expand Up @@ -365,11 +366,12 @@ public static function jwtFor(ModelInterface $user, array $options = array()): A
/**
* Get authenticated user from session
*
* @param Request $request
* @return ModelInterface|null
*/
protected static function getAuthUserFromCookie(): ?ModelInterface
protected static function getAuthUserFromCookie(Request $request): ?ModelInterface
{
$auth_id = Cookie::get(self::$auth_name);
$auth_id = Cookie::get($request, self::$auth_name);

if (!$auth_id) {
return null;
Expand Down