From 284e8eea89c301d7437ece164a0462eac23a8505 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:07:01 +0000 Subject: [PATCH 01/12] Bump actions/checkout from 4.1.1 to 4.1.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index 2ad69b1..3a6af92 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4.1.2 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From a872ad59283019b5d771dc63749bcae6520d9820 Mon Sep 17 00:00:00 2001 From: silaskenneth Date: Wed, 20 Mar 2024 14:19:21 +0300 Subject: [PATCH 02/12] Change codeowners to new team --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index db0fd32..d45027e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @ddyett @MichaelMainer @nikithauc @zengin @silaskenneth @Ndiritu @shemogumbe +* @microsoft/kiota-write From 68cfed820470d9769e280783bdb5507c035058b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:08:54 +0000 Subject: [PATCH 03/12] Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 1.6.0 to 2.0.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.6.0...v2.0.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/auto-merge-dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 6e5953f..145487d 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.6.0 + uses: dependabot/fetch-metadata@v2.0.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From fdd519f8a153b9b34f3a6fc9f73d6359ea2b0547 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:07:26 +0000 Subject: [PATCH 04/12] Bump actions/checkout from 4.1.2 to 4.1.3 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index 3a6af92..a002a87 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From f04967faa0cde852c99e29f1e51a9fa6f40b54c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:50:14 +0000 Subject: [PATCH 05/12] Bump actions/checkout from 4.1.3 to 4.1.4 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.3...v4.1.4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index a002a87..bfcac1f 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.3 + uses: actions/checkout@v4.1.4 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From 180290675aa1720f3d2f651b5d7832c12a538a41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:50:17 +0000 Subject: [PATCH 06/12] Bump dependabot/fetch-metadata from 2.0.0 to 2.1.0 Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/auto-merge-dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml index 145487d..72d96dd 100644 --- a/.github/workflows/auto-merge-dependabot.yml +++ b/.github/workflows/auto-merge-dependabot.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.0.0 + uses: dependabot/fetch-metadata@v2.1.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" From 23362ea8318fdbb1c999c1c3f6a3f41e83962e64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 12:41:20 +0000 Subject: [PATCH 07/12] Bump actions/checkout from 4.1.4 to 4.1.5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.4...v4.1.5) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index bfcac1f..1ee0bcc 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.4 + uses: actions/checkout@v4.1.5 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From 3e69cd865b15d89ba7d7d81cc4f8bad1acc1a6b8 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Tue, 14 May 2024 07:42:05 -0400 Subject: [PATCH 08/12] - updates code of conduct to the latest standard --- CODE_OF_CONDUCT.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f9ba8cf..686e5e7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -7,3 +7,4 @@ Resources: - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/) - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) - Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns +- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support) From 01ea0705b099b63f65bf8c258ed7d01fdd15eddb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 13:01:07 +0000 Subject: [PATCH 09/12] Bump actions/checkout from 4.1.5 to 4.1.6 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.5...v4.1.6) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index 1ee0bcc..76fd9f3 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.5 + uses: actions/checkout@v4.1.6 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From 11707585ae8842f4b06fd2cfded59d5dcb9a8468 Mon Sep 17 00:00:00 2001 From: Faith Kangai Date: Thu, 23 May 2024 15:12:32 +0300 Subject: [PATCH 10/12] Update needs-author-feedback label to replacement (#86) --- .github/policies/resourceManagement.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 0f7b81e..dedbd45 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -16,7 +16,7 @@ configuration: - isIssue - isOpen - hasLabel: - label: 'Needs: Author Feedback' + label: 'status:waiting-for-author-feedback' - hasLabel: label: 'Status: No Recent Activity' - noActivitySince: @@ -31,7 +31,7 @@ configuration: - isIssue - isOpen - hasLabel: - label: 'Needs: Author Feedback' + label: 'status:waiting-for-author-feedback' - noActivitySince: days: 4 - isNotLabeledWith: @@ -64,13 +64,13 @@ configuration: - isActivitySender: issueAuthor: True - hasLabel: - label: 'Needs: Author Feedback' + label: 'status:waiting-for-author-feedback' - isOpen then: - addLabel: label: 'Needs: Attention :wave:' - removeLabel: - label: 'Needs: Author Feedback' + label: 'status:waiting-for-author-feedback' description: - if: - payloadType: Issues From 75185846381424ed0e4d1b63b16faef9a5123b3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:57:10 +0000 Subject: [PATCH 11/12] Bump actions/checkout from 4.1.6 to 4.1.7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.6...v4.1.7) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/pr-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml index 76fd9f3..95f79a1 100644 --- a/.github/workflows/pr-validation.yml +++ b/.github/workflows/pr-validation.yml @@ -19,7 +19,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout - uses: actions/checkout@v4.1.6 + uses: actions/checkout@v4.1.7 - name: Setup PHP and Xdebug for Code Coverage report uses: shivammathur/setup-php@v2 with: From 56c83ba226d17b03935daf27350d53351a3fa3f4 Mon Sep 17 00:00:00 2001 From: "Kenneth Omondi (from Dev Box)" Date: Wed, 19 Jun 2024 15:00:59 +0300 Subject: [PATCH 12/12] Add client options to the `ProviderFactory::create` --- src/Oauth/ProviderFactory.php | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/Oauth/ProviderFactory.php b/src/Oauth/ProviderFactory.php index 7800f4d..f8ea2a4 100644 --- a/src/Oauth/ProviderFactory.php +++ b/src/Oauth/ProviderFactory.php @@ -12,29 +12,41 @@ class ProviderFactory * Initialises a PHP League provider for the Microsoft Identity platform * @param TokenRequestContext $tokenRequestContext * @param array $collaborators - * @param string $tokenServiceBaseUrl Base URL for the token and authorize endpoint. Defaults to + * @param string|null $tokenServiceBaseUrl Base URL for the token and authorize endpoint. Defaults to * https://login.microsoftonline.com - * @param string $userInfoServiceBaseUrl Base URL for the user info endpoint. Defaults to + * @param string|null $userInfoServiceBaseUrl Base URL for the user info endpoint. Defaults to * https://graph.microsoft.com + * @param array $clientOptions Additional client options to pass to the underlying http client. * @return GenericProvider */ public static function create( TokenRequestContext $tokenRequestContext, array $collaborators = [], - string $tokenServiceBaseUrl = 'https://login.microsoftonline.com', - string $userInfoServiceBaseUrl = 'https://graph.microsoft.com' + ?string $tokenServiceBaseUrl = null, + ?string $userInfoServiceBaseUrl = null, + array $clientOptions = [] ): GenericProvider { + if ($tokenServiceBaseUrl === null || empty(trim($tokenServiceBaseUrl))) { + $tokenServiceBaseUrl = 'https://login.microsoftonline.com'; + } + if ($userInfoServiceBaseUrl === null || empty(trim($userInfoServiceBaseUrl))) { + $userInfoServiceBaseUrl = 'https://graph.microsoft.com'; + } + $grantFactory = new GrantFactory(); // Add our custom grant type to the registry $grantFactory->setGrant('urn:ietf:params:Oauth:grant-type:jwt-bearer', new OnBehalfOfGrant()); - return new GenericProvider([ - 'urlAccessToken' => "$tokenServiceBaseUrl/{$tokenRequestContext->getTenantId()}/oauth2/v2.0/token", - 'urlAuthorize' => "$tokenServiceBaseUrl/{$tokenRequestContext->getTenantId()}/oauth2/v2.0/authorize", - 'urlResourceOwnerDetails' => "$userInfoServiceBaseUrl/oidc/userinfo", - 'accessTokenResourceOwnerId' => 'id_token' - ], $collaborators + [ + $allOptions = array_merge( + [ + 'urlAccessToken' => "$tokenServiceBaseUrl/{$tokenRequestContext->getTenantId()}/oauth2/v2.0/token", + 'urlAuthorize' => "$tokenServiceBaseUrl/{$tokenRequestContext->getTenantId()}/oauth2/v2.0/authorize", + 'urlResourceOwnerDetails' => "$userInfoServiceBaseUrl/oidc/userinfo", + 'accessTokenResourceOwnerId' => 'id_token' + ], $clientOptions + ); + return new GenericProvider($allOptions, $collaborators + [ 'grantFactory' => $grantFactory ]); }