From 4773d98e835dd14bd73e7bde0d5bcf4754355976 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 3 Nov 2015 17:58:12 +0100 Subject: [PATCH] Add Facebook authentication --- CHANGELOG | 1 + Gemfile | 1 + Gemfile.lock | 3 + .../images/auth_buttons/facebook_64.png | Bin 0 -> 2970 bytes app/helpers/auth_helper.rb | 2 +- config/gitlab.yml.example | 29 +++--- doc/integration/facebook.md | 96 ++++++++++++++++++ doc/integration/facebook_api_keys.png | Bin 0 -> 125921 bytes doc/integration/facebook_app_settings.png | Bin 0 -> 134387 bytes doc/integration/facebook_website_url.png | Bin 0 -> 42292 bytes doc/integration/omniauth.md | 3 +- 11 files changed, 119 insertions(+), 16 deletions(-) create mode 100644 app/assets/images/auth_buttons/facebook_64.png create mode 100644 doc/integration/facebook.md create mode 100644 doc/integration/facebook_api_keys.png create mode 100644 doc/integration/facebook_app_settings.png create mode 100644 doc/integration/facebook_website_url.png diff --git a/CHANGELOG b/CHANGELOG index 16055208db5..0ec6030b130 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,7 @@ v 8.2.0 (unreleased) v 8.1.3 - Spread out runner contacted_at updates - New design for user profile page + - Add Facebook authentication v 8.1.1 - Fix cloning Wiki repositories via HTTP (Stan Hu) diff --git a/Gemfile b/Gemfile index bb31c147b26..8379e5eea17 100644 --- a/Gemfile +++ b/Gemfile @@ -19,6 +19,7 @@ gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.1.3' gem 'omniauth', '~> 1.2.2' gem 'omniauth-bitbucket', '~> 0.0.2' +gem 'omniauth-facebook', '~> 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 65abc45ff19..c9ba4959ddf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -423,6 +423,8 @@ GEM multi_json (~> 1.7) omniauth (~> 1.1) omniauth-oauth (~> 1.0) + omniauth-facebook (3.0.0) + omniauth-oauth2 (~> 1.2) omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) @@ -859,6 +861,7 @@ DEPENDENCIES octokit (~> 3.7.0) omniauth (~> 1.2.2) omniauth-bitbucket (~> 0.0.2) + omniauth-facebook (~> 3.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.2.0) diff --git a/app/assets/images/auth_buttons/facebook_64.png b/app/assets/images/auth_buttons/facebook_64.png new file mode 100644 index 0000000000000000000000000000000000000000..1f1a80d7368ceb08b3e47d688f9e039b41ecfc0e GIT binary patch literal 2970 zcmbVO2~<;O7ET0YDU@9)pu|8aiex2_#3Yi9MP)f`f(jCnXMK{5BtW1tA_Cfq7N#sB z3NlkXMS+P36`c+s1r$f1h>%JtTW54!5U~iOwlMF7EyHr=oXI&a@BiwiPK~qwprU+2*P)d|a{y`|VL&oOB8;C{uHcFJz&t$&(X+@*ceV%7o#}!1z~i|D zGK0tH1NzzvG0MufJHmOdEGmH|A4L>4NM2pO84B!asrB8Gs0*7kCb zc`ywNYt%aT=PnhE6}nXzMi6r0hGG~^Jhb`)0--DM<1j;&$g%zV<1Cq0Gl`ys9$;0~ z-!4_DN6TIM8KL`9&8;8q9sly(KZ-|9&HfTNgV19Rab7W*N6jXgLFRSQDm`;u>$(Sh zeSOZw&W}1$0*-LhPQ<#WHSI6Uihpju-+6z!qo_#Ib=hbtN}ZBFF=qRaSa3ygn`M?S zGeK9gqq3c*0K>gg5hfhvoCU*D|Tb(FK`Z_{7YSvpj2N%Lt; z_0zefzL8$?!-b|2(f1_X2qzx3-|m{Kq7DCQAjj1pX5vB6-pqun#j_UV>pWKN?2~7S zt(c~JRSng)u7&qHe*e7PDXXFNQeZjn{M&yi@bk)~{u>;*ZCl zY=~l|+0Y8_{%~OA&w1hDx_K7LYD{UGy=650{pR7`+^&&Cj=rid(5dI9$1LTOtp)_{ z$-Bm1%(hPE;U?`+{^mwC)n>iEVIqc<(s*vekZV}_jjHmhH{?{|?%S_7n1`~1>+68% z+k^|ZsWDPz@HaY}r&62ie)`?Y#ow^C_rhn0JCumW)%%>MFNI_uPbTqRZK?6;+S$#v zc&>Nt19FYQjM3DocTqLJnK~7HwKe335t-%Hp5qtV^1S2KVdE^`t~?BJ>-H0e1>4V( zTi1P^Rl2Q`Y-(eF*~^cGv1!f-w?{hYe^Rr*eA{*Xa5VBDSo|%xsriSiq4sI6u0(If0RB@O2y85zMxy<=u3C7j4@n%$R z*Z>B#PS`bVs3MNm)s7>h?c#St59z$fR=SOSmZtU|IIEsU>~M_U4b{BP{KhYD=uMrc z)DIf;m7{e~oc|^k74!6^+=+oZUXNtG9C4@YXfy-Negv1%b&? zq+ZKsI#-`