Skip to content

Revert "Add a parameter to allow the user to use a custom auth provider." #187

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

Closed
wants to merge 1 commit into from
Closed

Revert "Add a parameter to allow the user to use a custom auth provider." #187

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
4 changes: 2 additions & 2 deletions .github/workflows/pr-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
php-versions: ['7.4', '8.1', '8.2', '8.3']
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.1.6
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -41,7 +41,7 @@ jobs:
code-coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.1.6
- name: Setup PHP and Xdebug for Code Coverage report
uses: shivammathur/setup-php@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run-php-documentor:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4.1.7
- uses: actions/checkout@v4.1.6
with:
ref: ${{ github.ref }}

Expand Down
9 changes: 3 additions & 6 deletions src/Authentication/GraphPhpLeagueAccessTokenProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
namespace Microsoft\Graph\Core\Authentication;


use League\OAuth2\Client\Provider\AbstractProvider;
use Microsoft\Graph\Core\NationalCloud;
use Microsoft\Kiota\Authentication\Cache\AccessTokenCache;
use Microsoft\Kiota\Authentication\Oauth\ProviderFactory;
Expand Down Expand Up @@ -40,14 +39,12 @@ class GraphPhpLeagueAccessTokenProvider extends PhpLeagueAccessTokenProvider
* @param string $nationalCloud Defaults to https://graph.microsoft.com. See
* https://learn.microsoft.com/en-us/graph/deployments
* @param AccessTokenCache|null $accessTokenCache Defaults to an in-memory cache if null
* @param AbstractProvider|null $oauthProvider Your own oauth provider if you don't want to use the default.
*/
public function __construct(
TokenRequestContext $tokenRequestContext,
array $scopes = [],
string $nationalCloud = NationalCloud::GLOBAL,
?AccessTokenCache $accessTokenCache = null,
?AbstractProvider $oauthProvider = null
?AccessTokenCache $accessTokenCache = null
)
{
$nationalCloud = empty($nationalCloud) ? NationalCloud::GLOBAL : $nationalCloud;
Expand All @@ -61,7 +58,7 @@ public function __construct(
];
$tokenBaseServiceUrl = self::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[$nationalCloud] ??
self::NATIONAL_CLOUD_TO_AZURE_AD_ENDPOINT[NationalCloud::GLOBAL];
$oauthProvider = $oauthProvider ?? ProviderFactory::create(
$oauthProvider = ProviderFactory::create(
$tokenRequestContext,
[],
$tokenBaseServiceUrl,
Expand All @@ -76,7 +73,7 @@ public function __construct(
* @param AccessTokenCache $accessTokenCache
* @param TokenRequestContext $tokenRequestContext
* @param array<string> $scopes
* @return self
* @return GraphPhpLeagueAccessTokenProvider
*/
public static function createWithCache(
AccessTokenCache $accessTokenCache,
Expand Down