muck-auth 3.3.3 → 3.4.0

data/README.rdoc

@@ -22,6 +22,7 @@ Add services by including the proper credentials in secrets.yml:
     twitter: # Twitter api access: http://www.twitter.com/apps 
       key: '{get a key}'
       secret: '{it comes with a secret}'
+      valid_signin: true   # include if you want to use this service to let your users signin/register for your site
     
 === OAuth Services
 Here's a list of common oauth services. For a complete list of all available services please consult the omniauth documentation as the available services are constantly changing:
@@ -41,4 +42,10 @@ Render a full list of all services with links to authorize the service and icons
 Render a list of all services that the current_user has authorized:
   <%= render :partial => 'authentications/current_services', :locals => { :include_icons => true, :authentications => current_user.authentications } %>
 
+Let users sign in and/or register on your site via oauth. Just remember to set valid_signin to true in your secrets.yml file:
+  <%= render :partial => 'users/signup_services' %>
+
+There is a default template ('authentications/signup') that will be rendered if the sign up fails. Override that template if you want to provide the user with a custom experience:
+  
+
 Copyright (c) 2009-2011 Tatemae.com. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-3.3.3
+3.4.0

data/app/controllers/muck/authentications_controller.rb

@@ -19,8 +19,8 @@ class Muck::AuthenticationsController < ApplicationController
       status = :logged_in_success
     elsif authentication = Authentication.find_by_provider_and_uid(@omniauth['provider'], @omniauth['uid']) # Try to log the user in via the service
       flash[:notice] = t('muck.users.login_success')
-      UserSession.create(authentication.user)
-      @user = current_user
+      @user = authentication.authenticatable
+      UserSession.create(@user)
       status = :log_via_oauth_in_success      
     else
       # Could not find any information. Create a new account.
@@ -35,6 +35,7 @@ class Muck::AuthenticationsController < ApplicationController
         # Have to build a new user to get rid of the password
         @user = User.new
         @user.apply_omniauth(@omniauth)
+        @user.valid?
         status = :new_signup_failure
       end
     end

data/app/helpers/muck_auth_helper.rb

@@ -14,6 +14,13 @@ module MuckAuthHelper
     services
   end
   
+  def signin_services(services_to_exclude = nil)
+    services = Secrets.auth_credentials    
+    services = services.keys.find_all{|key| services[key]['valid_signin']}
+    services = services - services_to_exclude.map(&:provider) if services_to_exclude
+    services
+  end
+  
   def auth_icon_back(auth, include_icons = true)
     if include_icons
       icon = service_icon_background(auth)

data/app/views/authentications/signup.html.erb

@@ -1,41 +1,8 @@
-<%= muck_form_for @user, :url => users_path, :html => {:id => "register-user-form", :name => 'register-user-form'} do |f| -%>
-
-	<%= t('muck.auth.sign_up_prompt') %>
-	
-	<% if MuckUsers.configuration.require_access_code -%>
-    <%= f.text_field :access_code_code, { :label => translate('muck.users.access_code'), 
-                                          :extra_html => translate('muck.users.access_code_help', 
-                                            :access_request_anchor => %Q{<a class="fancy-pop iframe" href="#{new_access_code_request_path}">},
-                                            :access_request_anchor_end => "</a>").html_safe } -%>
-  <% end -%>
-  
-	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 
-	                           :extra_html => '', 
-	                           :tip => t('muck.users.username_help'),
-	                           :required_label => t('muck.users.username') } -%>
-	<%= f.text_field :email, { :label => t('muck.users.email_address'),
-	                           :tip => t('muck.users.email_help'),
-	                           :extra_html => '' } -%>
-	<%= f.password_field :password, { :label => t('muck.users.password'),
-	                                  :tip => t('muck.users.password_help')} -%>
-	<%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password'),
-                                                 :tip => t('muck.users.password_confirmation_help') } -%>
-	
-	<% if MuckUsers.configuration.validate_terms_of_service -%>
-    <div class="checklist">
-      <%= f.check_box :terms_of_service, { :label => t('muck.users.terms_and_service', :tos_link_anchor => '<a href="/terms_of_service">', :link_end => '</a>').html_safe,
-     																		   :tip => t('muck.users.terms_and_service_tip') } -%>
-    </div>
-  <% end -%>
-	
+<%= signup_form(@user) do |f| -%>
+  <%# can add form fields as desired here -%>  
 	<%= f.fields_for :authentications do |af| -%>
     <%= af.hidden_field :provider %>
     <%= af.hidden_field :uid %>
     <%= af.hidden_field :raw_auth %>
   <% end %>
-	
-	<div class="button form-row">
-  	<%= f.submit t('muck.users.sign_up_now') %>
-  </div>
-  
 <% end -%>

data/lib/muck-auth/models/user.rb

@@ -10,8 +10,47 @@ module MuckAuth
       end
       
       def apply_omniauth(omniauth)
-        self.email = omniauth['user_info']['email'] if email.blank?
-        authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'], :raw_auth => omniauth.to_json)
+        self.email = omniauth['user_info']['email'] if self.email.blank?
+        
+        self.first_name = omniauth['user_info']['first_name'] if self.first_name.blank?
+        self.last_name = omniauth['user_info']['last_name'] if self.last_name.blank?
+        
+        # In case first and last name weren't provided:
+        names = User.parse_name(omniauth['user_info']['name'])
+        self.first_name = names[0] if self.first_name.blank?
+        self.last_name = names[1] if self.last_name.blank?
+        
+        self.login = omniauth['user_info']['nickname'] if self.login.blank?
+        # Some providers don't provide a valid nickname so try the first name
+        self.login = self.first_name if !self.valid? && self.errors[:login].any?
+        
+        self.authentications.build(:provider => omniauth['provider'], :uid => omniauth['uid'], :raw_auth => omniauth.to_json,
+                              :token => omniauth['credentials']['token'], :secret => omniauth['credentials']['secret'] )
+                                             
+      end
+      
+      def profile_from_omniauth(omniauth)
+        if self.respond_to?(:profile)
+          self.profile.location = omniauth['user_info']['location'] if self.profile.location.blank?
+          self.profile.about = omniauth['user_info']['description'] if self.profile.about.blank?
+          
+          # TODO figure out how to get their profile image
+          # self.profile.image = omniauth['user_info']['image'] if self.profile.image.blank?
+        end
+      end
+      
+      def feeds_from_omniauth(omniauth)
+        uris = omniauth['user_info']['urls']
+        return unless uris && defined?(Service)
+        uris.each_pair do |name, uri|
+          feeds = Feed.make_feeds_or_website(uri, self, name)
+          feeds.compact!
+          if !feeds.blank?
+            feeds.each do |feed|
+              self.own_feeds << feed
+            end
+          end
+        end
       end
       
       def password_required?

data/muck-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-auth}
-  s.version = "3.3.3"
+  s.version = "3.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-02}
   s.description = %q{A simple wrapper for the omniauth gem so that it is faster to include oauth in muck based applications.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-auth
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 23
   prerelease: 
   segments: 
   - 3
-  - 3
-  - 3
-  version: 3.3.3
+  - 4
+  - 0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -07:00
+date: 2011-03-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency