Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rendezvous
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VeNtura
rendezvous
Commits
8771f238
Commit
8771f238
authored
Nov 09, 2014
by
tady
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
email domain setting
parent
d44d364f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
.env.sample
+1
-0
app/controllers/users/omniauth_callbacks_controller.rb
+3
-3
config/settings.yml
+2
-0
No files found.
.env.sample
View file @
8771f238
RV_RENDEZVOUS_APP_HOST=http://localhost:3000
RV_RENDEZVOUS_APP_HOST=http://localhost:3000
RV_PERMITTED_LOGIN_DOMAIN=gmail.com,mycompany.com
RV_GOOGLE_API_CLIENT_ID=xxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
RV_GOOGLE_API_CLIENT_ID=xxxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.apps.googleusercontent.com
RV_GOOGLE_API_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
RV_GOOGLE_API_SECRET=xxxxxxxxxxxxxxxxxxxxxxxx
RV_S3_ASSESS_KEY_ID=xxxxxxxxxxxxxxxxxxxxxxxx
RV_S3_ASSESS_KEY_ID=xxxxxxxxxxxxxxxxxxxxxxxx
...
...
app/controllers/users/omniauth_callbacks_controller.rb
View file @
8771f238
...
@@ -4,8 +4,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -4,8 +4,8 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
def
google_oauth2
def
google_oauth2
email
=
request
.
env
[
'omniauth.auth'
].
info
[
'email'
]
email
=
request
.
env
[
'omniauth.auth'
].
info
[
'email'
]
# reject if email is not
zigexn nor ventura
.
# reject if email is not
permited
.
if
email
!~
/@zigexn\.co\.jp$/
&&
email
!~
/@zigexn\.vn$/
unless
Settings
.
permited_login_domain
.
split
(
/,/
).
include?
(
email
.
split
(
/@/
)[
1
])
gflash
error:
'Your email address is not permitted.'
gflash
error:
'Your email address is not permitted.'
redirect_to
root_path
redirect_to
root_path
return
return
...
@@ -15,7 +15,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
...
@@ -15,7 +15,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
@user
=
User
.
find_for_google_oauth2
(
request
.
env
[
'omniauth.auth'
],
current_user
)
@user
=
User
.
find_for_google_oauth2
(
request
.
env
[
'omniauth.auth'
],
current_user
)
if
@user
.
persisted?
if
@user
.
persisted?
gflash
success:
I18n
.
t
(
'devise.omniauth_callbacks.success'
)
gflash
success:
"You've successfully authenticated"
# flash[:notice] = I18n.t 'devise.omniauth_callbacks.success', kind: 'Google'
# flash[:notice] = I18n.t 'devise.omniauth_callbacks.success', kind: 'Google'
sign_in_and_redirect
@user
,
event: :authentication
sign_in_and_redirect
@user
,
event: :authentication
else
else
...
...
config/settings.yml
View file @
8771f238
...
@@ -4,6 +4,8 @@ defaults: &defaults
...
@@ -4,6 +4,8 @@ defaults: &defaults
# For amil body
# For amil body
app_host
:
<%= ENV['RV_RENDEZVOUS_APP_HOST'] %>
app_host
:
<%= ENV['RV_RENDEZVOUS_APP_HOST'] %>
permited_login_domain
:
<%= ENV['RV_PERMITTED_LOGIN_DOMAIN'] %>
# For login
# For login
google_api
:
google_api
:
client_id
:
<%= ENV['RV_GOOGLE_API_CLIENT_ID'] %>
client_id
:
<%= ENV['RV_GOOGLE_API_CLIENT_ID'] %>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment