Visitar URL original
[ticket/17197] Replace OAuth library · phpbb/phpbb@64196b1 · GitHub
Skip to content

Commit 64196b1

Browse files
CHItACHItA
committed
[ticket/17197] Replace OAuth library
PHPBB3-17197
1 parent a53febe commit 64196b1

21 files changed

Lines changed: 934 additions & 748 deletions

File tree

‎build/build.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -470,13 +470,8 @@
470470
<delete file="${dir}/vendor/guzzlehttp/streams/README.rst" />
471471
<delete file="${dir}/vendor/guzzlehttp/streams/.travis.yml" />
472472

473-
<delete dir="${dir}/vendor/lusitanian/oauth/examples" />
474-
<delete dir="${dir}/vendor/lusitanian/oauth/tests" />
475-
<delete file="${dir}/vendor/lusitanian/oauth/.gitignore" />
476-
<delete file="${dir}/vendor/lusitanian/oauth/.scrutinizer.yml" />
477-
<delete file="${dir}/vendor/lusitanian/oauth/.travis.yml" />
478-
<delete file="${dir}/vendor/lusitanian/oauth/phpunit.xml.dist" />
479-
<delete file="${dir}/vendor/lusitanian/oauth/README.md" />
473+
<delete file="${dir}/vendor/league/oauth2-client/phpunit.xml.dist" />
474+
<delete file="${dir}/vendor/league/oauth2-client/README.md" />
480475

481476
<delete dir="${dir}/vendor/paragonie/random_compat/dist" />
482477
<delete dir="${dir}/vendor/paragonie/random_compat/other" />

‎phpBB/adm/style/auth_provider_oauth.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<fieldset>
77
<legend>{oauth_services.ACTUAL_NAME}</legend>
88
<dl>
9-
<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt>
9+
<dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_CLIENT_ID}{L_COLON}</label></dt>
1010
<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>
1111
</dl>
1212
<dl>
13-
<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt>
13+
<dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_CLIENT_SECRET}{L_COLON}</label></dt>
1414
<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>
1515
</dl>
1616
</fieldset>

‎phpBB/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
"ext-zlib": "*",
3333
"ext-sodium": "*",
3434
"bantu/ini-get-wrapper": "~1.0",
35-
"carlos-mg89/oauth": "^0.8.15",
3635
"composer/composer": "^2.0",
3736
"composer/installers": "^2.3",
3837
"composer/package-versions-deprecated": "^1.11",
3938
"doctrine/dbal": "^4.4",
4039
"google/recaptcha": "~1.1",
4140
"guzzlehttp/guzzle": " ^7.0",
41+
"league/oauth2-client": "2.*",
4242
"marc1706/fast-image-size": "^1.1",
4343
"minishlink/web-push": "^8.0",
4444
"s9e/text-formatter": "^2.0",

0 commit comments

Comments
 (0)