SplendidBear-Websites/MineSeeker
Private
Public Access
1
0
Fork 0
Code Pull Requests 1 Releases Activity

bugfix hwioauth remember me && centralize hwioauth and facebook settings

Browse Source
This commit is contained in:
Root
2016-12-21 16:15:25 +01:00
parent 1e2a231c6c
commit ccfb621c2b
7 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/config/config.yml
View File

@@ -28,10 +28,10 @@ framework:
trusted_hosts: ~
trusted_proxies: ~
session:
# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
# handler_id: session.handler.native_file
handler_id: session.handler.pdo
save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
# save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
fragments: ~
http_method_override: true
assets: ~
@@ -41,8 +41,9 @@ twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
globals:
version: "0.27.16 (beta4)"
version: "0.29.18 (beta6)"
facebook_api: "%facebook.api%"
facebook_scope: "%facebook.scope%"
facebook_api_version: "%facebook.version%"
# Doctrine Configuration
@@ -84,9 +85,23 @@ assetic:
# FOS User Configuration
fos_user:
db_driver: orm # other valid values are 'mongodb', 'couchdb' and 'propel'
firewall_name: main
firewall_name: secured_area
user_class: Jotunheimr\UserBundle\Entity\User
# Facebook OAuth
hwi_oauth:
firewall_names: [secured_area]
resource_owners:
facebook:
type: facebook
client_id: "%facebook.api%"
client_secret: "%facebook.api-secret%"
scope: "%facebook.scope%"
options:
display: popup
auth_type: rerequest
csrf: true
# Slack integration
cl_slack:
api_token: xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001

16
app/config/config_dev.yml
View File

@@ -34,19 +34,7 @@ monolog:
parameters:
facebook.api: 320599508311862
facebook.api-secret: 18d4f48cdd274bccee2678e5eff3f557
facebook.version: 'v2.8'
facebook.scope: 'public_profile,email,user_friends'
mineseeker.websocket: 6450
# Facebook OAuth
hwi_oauth:
firewall_names: [secured_area]
resource_owners:
facebook:
type: facebook
client_id: 320599508311862
client_secret: 18d4f48cdd274bccee2678e5eff3f557
scope: "public_profile,email"
options:
display: popup
auth_type: rerequest
csrf: true

16
app/config/config_prod.yml
View File

@@ -25,19 +25,7 @@ monolog:
parameters:
facebook.api: 320597498312063
facebook.api-secret: c751bec8a3c5313ff2e5a83769bf1109
facebook.version: 'v2.8'
facebook.scope: 'public_profile,email,user_friends'
mineseeker.websocket: 8080
# Facebook OAuth
hwi_oauth:
firewall_names: [secured_area]
resource_owners:
facebook:
type: facebook
client_id: 320597498312063
client_secret: c751bec8a3c5313ff2e5a83769bf1109
scope: "public_profile,email"
options:
display: popup
auth_type: rerequest
csrf: true

10
app/config/security.yml
View File

@@ -21,13 +21,19 @@ security:
login_path: /login
failure_path: /login
use_forward: false
oauth_user_provider:
service: my.custom.user_provider
service: jotun.user_provider
remember_me:
secret: "%secret%"
lifetime: 604800
path: /
domain: ~
user_provider: fos_userbundle
form_login:
provider: fos_userbundle
csrf_token_generator: security.csrf.token_manager
default_target_path: /
remember_me: true
logout:
path: /logout
target: /

3
src/Jotunheimr/UserBundle/Resources/config/routing.yml
View File

@@ -9,9 +9,12 @@ hwi_oauth_login:
facebook_login:
path: /login/check-facebook
defaults: { _remember_me: on }
google_login:
path: /login/check-google
defaults: { _remember_me: on }
github_login:
path: /login/check-github
defaults: { _remember_me: on }

2
src/Jotunheimr/UserBundle/Resources/config/services.yml
View File

@@ -1,4 +1,4 @@
services:
my.custom.user_provider:
jotun.user_provider:
class: Jotunheimr\UserBundle\Security\Core\User\MyFOSUBUserProvider
arguments: ['@fos_user.user_manager', { facebook: facebookId }, '@doctrine.orm.entity_manager']

20
src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
View File

@@ -40,23 +40,17 @@
$(document).snowfall({deviceorientation: true, round: true, minSize: 5, maxSize: 8});
$('#fbLogin').length && $('#fbLogin').on('click', function () {
FB.getLoginStatus(function (response) {
if (response.status === 'connected') {
document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";
} else {
FB.login(function (response) {
if (response.authResponse) {
document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";
}
}, {scope: 'email'});
{#FB.getLoginStatus(function (response) {#}
{#if (response.status === 'connected') {#}
{#document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";#}
{#} else {#}
{#FB.login(function (response) {#}
{#if (response.authResponse) {#}
{#document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";#}
{#}#}
{#}, {scope: 'email'});#}
{#}#}
{#});#}
}, {scope: '{{ facebook_scope }}'});
}
});
});
});
</script>