Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
[ticket/17197] Replace OAuth library
PHPBB3-17197
  • Loading branch information
CHItA committed Sep 18, 2026
commit 64196b1fe0e5085ca83b2b3707a423f592d876bf
9 changes: 2 additions & 7 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -470,13 +470,8 @@
<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />

<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
<delete file="${dir}/vendor/league/oauth2-client/phpunit.xml.dist" />
<delete file="${dir}/vendor/league/oauth2-client/README.md" />

<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
<delete dir="${dir}/vendor/paragonie/random_compat/other" />
Expand Down
4 changes: 2 additions & 2 deletions phpBB/adm/style/auth_provider_oauth.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<fieldset>
<legend>{oauth_services.ACTUAL_NAME}</legend>
<dl>
<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_CLIENT_ID}{L_COLON}</label></dt>
<dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd>
</dl>
<dl>
<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_CLIENT_SECRET}{L_COLON}</label></dt>
<dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd>
</dl>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion phpBB/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
"ext-zlib": "*",
"ext-sodium": "*",
"bantu/ini-get-wrapper": "~1.0",
"carlos-mg89/oauth": "^0.8.15",
"composer/composer": "^2.0",
"composer/installers": "^2.3",
"composer/package-versions-deprecated": "^1.11",
"doctrine/dbal": "^4.4",
"google/recaptcha": "~1.1",
"guzzlehttp/guzzle": " ^7.0",
"league/oauth2-client": "2.*",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about something like

Suggested change
"league/oauth2-client": "2.*",
"league/oauth2-client": "^2.8",

or even 2.9

"marc1706/fast-image-size": "^1.1",
"minishlink/web-push": "^8.0",
"s9e/text-formatter": "^2.0",
Expand Down
Loading
Loading