discourse

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS, Subversion, and other methods.

Fixed GitHub auth, GitHub can provide us with a valid email - so auto…

…matically log in for those cases

master

commit 803d023e2307309f8b776ab3b8b7e38ba91c0919 1 parent cf33326

SamSaffron authored August 01, 2013

Showing 1 changed file with 18 additions and 2 deletions. Show Diff Stats Hide Diff Stats

20  app/controllers/users/omniauth_callbacks_controller.rb

20  app/controllers/users/omniauth_callbacks_controller.rb

show inline notes

View file @ 803d023

            
    @@ -210,6 +210,8 @@ def create_or_sign_on_user_using_openid(auth_token)
  
                           if user_open_id.blank? && user = User.find_by_email(email)
                    
                             # we trust so do an email lookup
                    
                      +      # TODO some openid providers may not be trust worthy, allow for that
                    
                      +      #  for now we are good (google, yahoo are trust worthy)
                    
                             user_open_id = UserOpenId.create(url: identity_url , user_id: user.id, email: email, active: true)
                    
                           end
                    
    @@ -250,18 +252,32 @@ def create_or_sign_on_user_using_github(auth_token)
  
                           data = auth_token[:info]
                    
                           screen_name = data["nickname"]
                    
                      +    email = data["email"]
                    
                           github_user_id = auth_token["uid"]
                    
                           session[:authentication] = {
                    
                             github_user_id: github_user_id,
                    
                      -      github_screen_name: screen_name
                    
                      +      github_screen_name: screen_name,
                    
                      +      email: email,
                    
                      +      email_valid: true
                    
                           }
                    
                           user_info = GithubUserInfo.where(github_user_id: github_user_id).first
                    
                      +    if !user_info && user = User.find_by_email(email)
                    
                      +      # we trust so do an email lookup
                    
                      +      user_info = GithubUserInfo.create(
                    
                      +          user_id: user.id,
                    
                      +          screen_name: screen_name,
                    
                      +          github_user_id: github_user_id
                    
                      +      )
                    
                      +    end
                    
                      +
                    
                           @data = {
                    
                             username: screen_name,
                    
                      -      auth_provider: "Github"
                    
                      +      auth_provider: "Github",
                    
                      +      email: email,
                    
                      +      email_valid: true
                    
                           }
                    
                           process_user_info(user_info, screen_name)

0 notes on commit `803d023` Show line notes below

Please sign in to comment.

public discourse/discourse

HTTPS clone URL

Subversion checkout URL

0 notes on commit 803d023 Show line notes below

0 notes on commit `803d023` Show line notes below