From: Dan Brown <redacted>
Date: Sun, 29 Jul 2018 15:18:10 +0000 (+0100)
Subject: Merge pull request #904 from lommes/903-socialite-discord
X-Git-Tag: v0.23.0~1^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c83a51f7e2085762bc24e841741e6014bb8c99f6?ds=sidebyside;hp=-c

Merge pull request #904 from lommes/903-socialite-discord

add everything needed to use discord as social login provider
---

c83a51f7e2085762bc24e841741e6014bb8c99f6
diff --combined .env.example
index d09db93d3,68d268635..eda20ea26
--- a/.env.example
+++ b/.env.example
@@@ -56,6 -56,8 +56,8 @@@ TWITCH_APP_SECRET=fals
  GITLAB_APP_ID=false
  GITLAB_APP_SECRET=false
  GITLAB_BASE_URI=false
+ DISCORD_APP_ID=false
+ DISCORD_APP_SECRET=false
  
  # External services such as Gravatar and Draw.IO
  DISABLE_EXTERNAL_SERVICES=false
@@@ -67,13 -69,6 +69,13 @@@ LDAP_DN=fals
  LDAP_PASS=false
  LDAP_USER_FILTER=false
  LDAP_VERSION=false
 +# Do you want to sync LDAP groups to BookStack roles for a user
 +LDAP_USER_TO_GROUPS=false
 +# What is the LDAP attribute for group memberships
 +LDAP_GROUP_ATTRIBUTE="memberOf"
 +# Would you like to remove users from roles on BookStack if they do not match on LDAP
 +# If false, the ldap groups-roles sync will only add users to roles
 +LDAP_REMOVE_FROM_GROUPS=false
  
  # Mail settings
  MAIL_DRIVER=smtp
diff --combined config/services.php
index 9c550f2fa,05ec09ec0..fab0c1d75
--- a/config/services.php
+++ b/config/services.php
@@@ -108,6 -108,12 +108,12 @@@ return 
          'redirect' => env('APP_URL') . '/login/service/twitch/callback',
          'name'          => 'Twitch',
      ],
+     'discord' => [
+         'client_id' => env('DISCORD_APP_ID'),
+         'client_secret' => env('DISCORD_APP_SECRET'),
+         'redirect' => env('APP_URL') . '/login/service/discord/callback',
+         'name' => 'Discord',
+     ],
  
      'ldap' => [
          'server' => env('LDAP_SERVER', false),
@@@ -118,9 -124,6 +124,9 @@@
          'version' => env('LDAP_VERSION', false),
          'email_attribute' => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
          'follow_referrals' => env('LDAP_FOLLOW_REFERRALS', false),
 -    ]
 +		'user_to_groups' => env('LDAP_USER_TO_GROUPS',false),
 +		'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
 +		'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS',false),
 +	]
  
  ];