Skip to content
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

Allow CompositeAuth auth methods to use their own user if defined #20308

Merged
merged 3 commits into from
Jan 14, 2025
Merged

Allow CompositeAuth auth methods to use their own user if defined #20308

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e51d587
Allow CompositeAuth auth methods to use their own user if defined
Jan 13, 2025
4befe7c
Fix: minor wording of error message
Jan 14, 2025
e9f7a54
Add a changelog
Jan 14, 2025
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
8 changes: 8 additions & 0 deletions framework/filters/auth/CompositeAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down Expand Up @@ -85,6 +86,13 @@
continue;
}

$authUser = $auth->user;
if ($authUser != null && !$authUser instanceof \yii\web\User) {
throw new InvalidConfigException(get_class($authUser) . ' must implement of a type yii\web\User');

Check warning on line 91 in framework/filters/auth/CompositeAuth.php

View check run for this annotation

Codecov / codecov/patch

framework/filters/auth/CompositeAuth.php#L91 

Added line #L91 was not covered by tests
mtangoo marked this conversation as resolved.
Show resolved Hide resolved
} elseif ($authUser != null) {
$user = $authUser;

Check warning on line 93 in framework/filters/auth/CompositeAuth.php

View check run for this annotation

Codecov / codecov/patch

framework/filters/auth/CompositeAuth.php#L93 

Added line #L93 was not covered by tests
}

$identity = $auth->authenticate($user, $request, $response);
if ($identity !== null) {
return $identity;
Expand Down
Loading