Merge pull request #149 from coeventer/133_gh_email

Reenabled GH auth
coeventer · Mar 4, 2017 · 589c7ef · 589c7ef
2 parents bdbba3e + 0210233
commit 589c7ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -27,7 +27,7 @@ def self.create_with_omniauth(auth, organization=nil)
     user = pu.user if pu
 
     # 2. If 1 didn't work, attempt to find the user by auth provided email address
-    user = User.find_by(email: auth.info.email) if !user and auth.info.has_key?('email')
+    user = User.find_by(email: auth.info.email) if !user and auth.info.has_key?('email') && !auth.info.email.blank?
 
     # 3. If 1 and 2 didn't work, assume the user doesn't exist yet. 
     user ||= create! do |new_user|
@@ -36,7 +36,7 @@ def self.create_with_omniauth(auth, organization=nil)
       new_user.image = auth.info.image
       new_user.verified = false
 
-      if auth.info.key?('email')
+      if auth.info.key?('email') && !auth.info.email.blank?
         new_user.email = auth.info.email
         # Assume the OAuth provider has confirmed the user's email address
         new_user.email_confirmed = true

diff --git a/app/views/layouts/common/_sign_in.html.erb b/app/views/layouts/common/_sign_in.html.erb
@@ -15,6 +15,9 @@
           <%=link_to facebook_path, class: "btn btn-primary" do%>
             <i class="fa fa-facebook-square"></i> Facebook Sign in
           <% end %>
+          <%=link_to github_path, class: "btn btn-primary" do%>
+            <i class="fa fa-github"></i> Github Sign in
+          <% end %>
         </p>
         <p>
           <%=link_to meetup_path, class: "btn btn-primary" do%>