Skip to content

Commit 66ded3b

Browse files
Update namespaces on Devise controllers
1 parent 34cd62d commit 66ded3b

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

app/controllers/ombu_labs/auth/callbacks_controller.rb

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
require "open-uri"
22

3-
module Auth2
4-
class CallbacksController < Devise::OmniauthCallbacksController
5-
skip_before_action :verify_authenticity_token, only: :developer
3+
module OmbuLabs
4+
module Auth
5+
class CallbacksController < Devise::OmniauthCallbacksController
6+
skip_before_action :verify_authenticity_token, only: :developer
67

7-
def github
8-
username = request.env["omniauth.auth"]["extra"]["raw_info"]["login"]
8+
def github
9+
username = request.env["omniauth.auth"]["extra"]["raw_info"]["login"]
910

10-
organization_name = ENV["ORGANIZATION_LOGIN"]
11-
member_logins = organization_members.map { |member| member["login"] }
11+
organization_name = ENV["ORGANIZATION_LOGIN"]
12+
member_logins = organization_members.map { |member| member["login"] }
1213

13-
if username.in?(member_logins)
14+
if username.in?(member_logins)
15+
@user = User.from_omniauth(request.env["omniauth.auth"])
16+
sign_in_and_redirect @user
17+
else
18+
flash[:error] = "This application is only available to members of #{organization_name}."
19+
redirect_to new_user_session_path
20+
end
21+
end
22+
23+
def developer
1424
@user = User.from_omniauth(request.env["omniauth.auth"])
1525
sign_in_and_redirect @user
16-
else
17-
flash[:error] = "This application is only available to members of #{organization_name}."
18-
redirect_to new_user_session_path
1926
end
20-
end
21-
22-
def developer
23-
@user = User.from_omniauth(request.env["omniauth.auth"])
24-
sign_in_and_redirect @user
25-
end
2627

27-
private
28+
private
2829

29-
def organization_members
30-
@organization_members ||= begin
31-
members_raw_response = URI.open("https://api.github.com/orgs/#{ENV["ORGANIZATION_LOGIN"]}/members").read
32-
JSON.parse(members_raw_response)
30+
def organization_members
31+
@organization_members ||= begin
32+
members_raw_response = URI.open("https://api.github.com/orgs/#{ENV["ORGANIZATION_LOGIN"]}/members").read
33+
JSON.parse(members_raw_response)
34+
end
3335
end
3436
end
3537
end

config/initializers/devise.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# ==> Controller configuration
2020
# Configure the parent class to the devise controllers.
21-
config.parent_controller = 'Ombulabs::Auth::ApplicationController'
21+
config.parent_controller = 'OmbuLabs::Auth::ApplicationController'
2222

2323
# ==> Mailer Configuration
2424
# Configure the e-mail address which will be shown in Devise::Mailer,

0 commit comments

Comments
 (0)