From c98efc53a80150b6f9189c9b194855c748e9b03d Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 7 Nov 2014 14:27:00 +0100 Subject: [ticket/12620] Fix rebase (move config file to the right directory) PHPBB3-12620 --- phpBB/config/default/container/services_auth.yml | 100 +++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 phpBB/config/default/container/services_auth.yml (limited to 'phpBB/config/default/container/services_auth.yml') diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml new file mode 100644 index 0000000000..88a90ca2d6 --- /dev/null +++ b/phpBB/config/default/container/services_auth.yml @@ -0,0 +1,100 @@ +services: +# ----- Auth management ----- + auth: + class: phpbb\auth\auth + +# ----- Auth providers ----- + auth.provider_collection: + class: phpbb\auth\provider_collection + arguments: + - @service_container + - @config + tags: + - { name: service_collection, tag: auth.provider } + + auth.provider.db: + class: phpbb\auth\provider\db + arguments: + - @dbal.conn + - @config + - @passwords.manager + - @request + - @user + - @service_container + - %core.root_path% + - %core.php_ext% + tags: + - { name: auth.provider } + + auth.provider.apache: + class: phpbb\auth\provider\apache + arguments: + - @dbal.conn + - @config + - @passwords.manager + - @request + - @user + - %core.root_path% + - %core.php_ext% + tags: + - { name: auth.provider } + + auth.provider.ldap: + class: phpbb\auth\provider\ldap + arguments: + - @dbal.conn + - @config + - @passwords.manager + - @user + tags: + - { name: auth.provider } + + auth.provider.oauth: + class: phpbb\auth\provider\oauth\oauth + arguments: + - @dbal.conn + - @config + - @passwords.manager + - @request + - @user + - %tables.auth_provider_oauth_token_storage% + - %tables.auth_provider_oauth_account_assoc% + - @auth.provider.oauth.service_collection + - %tables.users% + - @service_container + - %core.root_path% + - %core.php_ext% + tags: + - { name: auth.provider } + +# ----- OAuth services providers ----- + auth.provider.oauth.service_collection: + class: phpbb\di\service_collection + arguments: + - @service_container + tags: + - { name: service_collection, tag: auth.provider.oauth.service } + + auth.provider.oauth.service.bitly: + class: phpbb\auth\provider\oauth\service\bitly + arguments: + - @config + - @request + tags: + - { name: auth.provider.oauth.service } + + auth.provider.oauth.service.facebook: + class: phpbb\auth\provider\oauth\service\facebook + arguments: + - @config + - @request + tags: + - { name: auth.provider.oauth.service } + + auth.provider.oauth.service.google: + class: phpbb\auth\provider\oauth\service\google + arguments: + - @config + - @request + tags: + - { name: auth.provider.oauth.service } -- cgit v1.2.1 From d9d89cad94eada62e900a012046b8d45c5aa3129 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 7 Dec 2015 13:11:22 -0800 Subject: [ticket/14247] Use quotes around @ and % strings in YAML PHPBB3-14247 --- phpBB/config/default/container/services_auth.yml | 80 ++++++++++++------------ 1 file changed, 40 insertions(+), 40 deletions(-) (limited to 'phpBB/config/default/container/services_auth.yml') diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index 88a90ca2d6..57c6c73525 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -7,63 +7,63 @@ services: auth.provider_collection: class: phpbb\auth\provider_collection arguments: - - @service_container - - @config + - '@service_container' + - '@config' tags: - { name: service_collection, tag: auth.provider } auth.provider.db: class: phpbb\auth\provider\db arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - @service_container - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '@service_container' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } auth.provider.apache: class: phpbb\auth\provider\apache arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } auth.provider.ldap: class: phpbb\auth\provider\ldap arguments: - - @dbal.conn - - @config - - @passwords.manager - - @user + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@user' tags: - { name: auth.provider } auth.provider.oauth: class: phpbb\auth\provider\oauth\oauth arguments: - - @dbal.conn - - @config - - @passwords.manager - - @request - - @user - - %tables.auth_provider_oauth_token_storage% - - %tables.auth_provider_oauth_account_assoc% - - @auth.provider.oauth.service_collection - - %tables.users% - - @service_container - - %core.root_path% - - %core.php_ext% + - '@dbal.conn' + - '@config' + - '@passwords.manager' + - '@request' + - '@user' + - '%tables.auth_provider_oauth_token_storage%' + - '%tables.auth_provider_oauth_account_assoc%' + - '@auth.provider.oauth.service_collection' + - '%tables.users%' + - '@service_container' + - '%core.root_path%' + - '%core.php_ext%' tags: - { name: auth.provider } @@ -71,30 +71,30 @@ services: auth.provider.oauth.service_collection: class: phpbb\di\service_collection arguments: - - @service_container + - '@service_container' tags: - { name: service_collection, tag: auth.provider.oauth.service } auth.provider.oauth.service.bitly: class: phpbb\auth\provider\oauth\service\bitly arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.facebook: class: phpbb\auth\provider\oauth\service\facebook arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } auth.provider.oauth.service.google: class: phpbb\auth\provider\oauth\service\google arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } -- cgit v1.2.1 From 8ed59fb82a9381914a4ccce91c0c5fac44616556 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Fri, 23 Oct 2015 02:44:41 +0200 Subject: [ticket/14250] Change token_storage class to fit changed interface PHPBB3-14250 --- phpBB/config/default/container/services_auth.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config/default/container/services_auth.yml') diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index 57c6c73525..5306644256 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -58,6 +58,7 @@ services: - '@request' - '@user' - '%tables.auth_provider_oauth_token_storage%' + - '%tables.auth_provider_oauth_states%' - '%tables.auth_provider_oauth_account_assoc%' - '@auth.provider.oauth.service_collection' - '%tables.users%' -- cgit v1.2.1 From 33d1d19f9775242a260adbb33b0bfa4b5324dedf Mon Sep 17 00:00:00 2001 From: Jakub Senko Date: Sun, 22 May 2016 15:05:49 +0200 Subject: [ticket/14586] Add OAuth1 support PHPBB3-14586 --- phpBB/config/default/container/services_auth.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpBB/config/default/container/services_auth.yml') diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index 5306644256..a0f9fbd8ef 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -99,3 +99,11 @@ services: - '@request' tags: - { name: auth.provider.oauth.service } + + auth.provider.oauth.service.twitter: + class: phpbb\auth\provider\oauth\service\twitter + arguments: + - @config + - @request + tags: + - { name: auth.provider.oauth.service } -- cgit v1.2.1 From 89461d982c3356f5389caaae7bec1fa76fbe6beb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 23 Jul 2016 16:23:42 +0200 Subject: [ticket/14717] Quote strings beginning with @ or % in yaml definitions This type of use was deprecated in symfony 2.8 and will be dropped in 3.x. Also see: https://github.com/symfony/symfony/pull/16285 PHPBB3-14717 --- phpBB/config/default/container/services_auth.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/config/default/container/services_auth.yml') diff --git a/phpBB/config/default/container/services_auth.yml b/phpBB/config/default/container/services_auth.yml index a0f9fbd8ef..ee6f7ef448 100644 --- a/phpBB/config/default/container/services_auth.yml +++ b/phpBB/config/default/container/services_auth.yml @@ -103,7 +103,7 @@ services: auth.provider.oauth.service.twitter: class: phpbb\auth\provider\oauth\service\twitter arguments: - - @config - - @request + - '@config' + - '@request' tags: - { name: auth.provider.oauth.service } -- cgit v1.2.1