authkit 0.4.0 → 0.5.0

data/lib/generators/authkit/templates/app/models/avatar.rb

@@ -0,0 +1,45 @@
+class Avatar < ActiveRecord::Base
+  # Avatar images are publicly available (you can share the URL and it won't
+  # expire, but you probably can't guess it). Also, the images should be
+  # cached on the client side as the path name includes a hash.
+  has_attached_file :attachment,
+    styles: {thumb: "200x200#"},
+    s3_permissions: 'public-read',
+    s3_headers: {"Cache-Control" => "max-age=#{1.year.to_i}", "Expires" => 1.year.from_now.httpdate}
+
+  before_validation :prepare_import
+  validates :attachment, attachment_presence: true, unless: :attachment_importing?
+  after_save :async_import
+
+  def as_json(options = {})
+    super({
+      methods: [:url]
+    }.merge(options))
+  end
+
+  def url
+    self.attachment.url(:thumb)
+  end
+
+  def import!
+    return false unless self.attachment_importing?
+    self.attachment_importing = false
+    if self.remote_url.present?
+      uri = URI.parse(self.remote_url)
+      self.attachment = uri
+      self.attachment_file_name = File.basename(URI.decode(uri.path))
+    end
+    self.save
+  end
+
+  protected
+
+  def prepare_import
+    return unless self.remote_url.present? && self.remote_url_changed?
+    self.attachment_importing = true
+  end
+
+  def async_import
+    AvatarImportWorker.perform_async(self.id) if self.attachment_importing?
+  end
+end

data/lib/generators/authkit/templates/app/models/user.rb

@@ -1,37 +1,49 @@
 require 'email_format_validator'
-
+require 'full_name_splitter'
+<% if username? %>require 'username_format_validator'
+<% end %>
 class User < ActiveRecord::Base
-  has_secure_password
-  has_one_time_password
+  <% if oauth? %>
+  has_many :auths
+  <% end %>
 
-  # Uncomment if you are not using strong params (note, that email is only permitted on
-  # signup and confirmation_email is only permitted on update):
-  #
-  # attr_accessible :username,
-  #  :email,
-  #  :confirmation_email,
-  #  :password,
-  #  :password_confirmation,
-  #  :time_zone,
-  #  :first_name,
-  #  :last_name,
-  #  :bio,
-  #  :website,
-  #  :phone_number
+  has_secure_password validations: false
+  has_one_time_password
 
   before_validation :downcase_email
   before_validation :set_confirmation_email
 
-  # Whenever the password is set, validate (not only on create)
-  validates :password, presence: true, confirmation: true, length: {minimum: 6}, if: :password_set?
-  validates :username, presence: true, uniqueness: {case_sensitive: false}
-  validates :email, email_format: true, presence: true, uniqueness: true
-  validates :confirmation_email, email_format: true, presence: true
-
+  validates :password, confirmation: true, length: { minimum: 6 }, if: :has_password?
+  validates :email, email_format: true, uniqueness: { allow_nil: true }
+  validates :confirmation_email, email_format: true
+  <% if username? %>validates :username, username_format: true, uniqueness: { case_sensitive: false, allow_nil: true }
+  <% end %>
+  validates :password, presence: true, unless: :has_auth_or_skip_password_validation?
+  validates :email, presence: true, unless: :has_auth?
+  validates :confirmation_email, presence: true, unless: :has_auth?
+  <% if username? %>validates :username, presence: true, unless: :has_auth?
+  <% end %>
   # Confirm emails check for existing emails for uniqueness as a convenience
   validate  :confirmation_email_uniqueness, if: :confirmation_email_set?
 
-  def display_name
+  def suspended?
+    self.suspended_at.present?
+  end
+
+  def incomplete?
+    <% if username? %>username.blank? || <% end %>email.blank? || password_digest.blank?
+  end
+
+  def full_name=(value)
+    return if value.blank?
+
+    splitter = FullNameSplitter.new(value)
+    self.first_name = splitter.first_name
+    self.last_name = splitter.last_name
+    self.full_name
+  end
+
+  def full_name
     [first_name, last_name].compact.join(" ")
   end
 
@@ -141,7 +153,23 @@ class User < ActiveRecord::Base
 
   protected
 
-  def password_set?
+  def has_auth?
+    <% if oauth? %>
+    self.auths.first.present?
+    <% else %>
+    false
+    <% end %>
+  end
+
+  def has_auth_or_skip_password_validation?
+    has_auth? || skip_password_validation?
+  end
+
+  def skip_password_validation?
+    self.password.blank? && self.password_digest.present?
+  end
+
+  def has_password?
     self.password.present?
   end
 
@@ -167,5 +195,4 @@ class User < ActiveRecord::Base
   def confirmation_email_uniqueness
     errors.add(:confirmation_email, :taken, value: email) if User.where('email = ?', confirmation_email).count > 0
   end
-
 end

data/lib/generators/authkit/templates/app/views/auths/connect.html.erb

@@ -0,0 +1,34 @@
+<div class="providers">
+  <%% providers.each do |provider| %>
+    <a href="/auth/<%%= provider %>?connect=1" class="oauth <%%= provider %>"><i class="fa <%%= provider_font_awesome_icon(provider) %>"></i> <%%= provider_formatted_name(provider) %> Account</a>
+  <%% end %>
+</div>
+
+<table class="connected">
+  <%% current_user.auths.order('provider, id').each do |auth| %>
+    <tr class="auth <%%= auth.provider %>">
+      <td width="30">
+        <%% unless auth.image_url.blank? %>
+          <img src="<%%= auth.image_url %>" class="avatar">
+        <%% end %>
+      </td>
+      <td>
+        <span class="name"><%%= auth.name %></span>
+        <%%= link_to 'Disconnect', disconnect_url(auth) %>
+      </td>
+      <td align="center">
+        <span class="icon"><i class="fa <%%= provider_font_awesome_icon(auth.provider) %>"></i></span>
+      </td>
+    </li>
+  <%% end %>
+  <%% if current_user.auths.count == 0 %>
+    <tr>
+      <td colspan="3">You have not connected any social accounts</td>
+    </tr>
+  <%% end %>
+</table>
+
+<div class="agreement">
+  By connecting your account you are also agreeing to our<br />
+  <a href="<%%= terms_path %>" target="_blank">Terms &amp; Conditions</a> and <a href="<%%= privacy_path %>" target="_blank">Privacy Policy</a>
+</div>

data/lib/generators/authkit/templates/app/views/password_change/show.html.erb

@@ -1,17 +1,17 @@
 <h1>Please enter a new password</h1>
 
-<%= form_tag(password_change_path, method: "post") do %>
-  <%= hidden_field_tag :token, params[:token] %>
-  <%= hidden_field_tag :email, params[:email] %>
+<%%= form_tag(password_change_path, method: "post") do %>
+  <%%= hidden_field_tag :token, params[:token] %>
+  <%%= hidden_field_tag :email, params[:email] %>
 
   <div class="field">
-    <%= label_tag "password" %>
-    <%= password_field_tag "password" %>
+    <%%= label_tag "password" %>
+    <%%= password_field_tag "password" %>
   </div>
   <div class="field">
-    <%= label_tag "password_confirmation" %>
-    <%= password_field_tag "password_confirmation" %>
+    <%%= label_tag "password_confirmation" %>
+    <%%= password_field_tag "password_confirmation" %>
   </div>
 
-  <%= submit_tag "Change" %>
-<% end %>
+  <%%= submit_tag "Change" %>
+<%% end %>

data/lib/generators/authkit/templates/app/views/password_reset/show.html.erb

@@ -1,12 +1,12 @@
 <h1>Reset your password</h1>
 
-<%= form_tag(password_reset_path, method: "post") do %>
-  <%= hidden_field_tag :token, params[:token] %>
+<%%= form_tag(password_reset_path, method: "post") do %>
+  <%%= hidden_field_tag :token, params[:token] %>
 
   <div class="field">
-    <%= label_tag "email", "Email or username" %>
-    <%= text_field_tag "email" %>
+    <%%= label_tag "email", "Email<% if username? %> or username<% end %>" %>
+    <%%= text_field_tag "email" %>
   </div>
 
-  <%= submit_tag "Reset" %>
-<% end %>
+  <%%= submit_tag "Reset" %>
+<%% end %>

data/lib/generators/authkit/templates/app/views/sessions/new.html.erb

@@ -1,17 +1,35 @@
 <h1>Sign In</h1>
 
-<%= form_tag(login_path, method: "post") do %>
+<%%= form_tag(login_path, method: "post") do %>
   <div class="field">
-    <%= label_tag "email", "Email or username" %>
-    <%= text_field_tag "email" %>
+    <%%= label_tag "email", "Email<% if username? %> or username<% end %>" %>
+    <%%= text_field_tag "email" %>
   </div>
   <div class="field">
-    <%= label_tag "password" %>
-    <%= password_field_tag "password" %>
+    <%%= label_tag "password" %>
+    <%%= password_field_tag "password" %>
   </div>
   <div class="field">
-    <%= check_box_tag :remember_me, "1", true %>
+    <%%= check_box_tag :remember_me, "1", true %>
     <label for="remember_me">Keep me signed in on this computer</label>
   </div>
-  <%= submit_tag "Login" %>
+  <div class="login">
+    <%%= submit_tag "Login" %>
+  </div>
+
+  <div class="forgot">
+    <a href="/password/reset" class="forgot">Forgot your password?</a>
+  </div>
+<%% end %>
+
+<% if oauth? %>
+<div class="or">
+  or sign in using a connected account
+</div>
+
+<div class="providers">
+  <%% providers.each do |provider| %>
+    <a href="/auth/<%%= provider %>?login=1" class="oauth <%%= provider %>"><i class="fa <%%= provider_font_awesome_icon(provider) %>"></i> <%%= provider_formatted_name(provider) %> Account</a>
+  <%% end %>
+</div>
 <% end %>

data/lib/generators/authkit/templates/app/views/signup/new.html.erb

@@ -1,62 +1,74 @@
 <h1>Sign Up</h1>
 
-<% if @signup.errors.any? %>
+<% if oauth? %>
+<div class="providers">
+  <%% providers.each do |provider| %>
+    <a href="/auth/<%%= provider %>?signup=1" class="oauth <%%= provider %>"><i class="fa <%%= provider_font_awesome_icon(provider) %>"></i> <%%= provider_formatted_name(provider) %> Account</a>
+  <%% end %>
+</div>
+
+<div class="or">
+  or sign up using your email
+</div>
+<% end %>
+
+<%% if @signup.errors.any? %>
   <div id="error_explanation">
     <div class="alert alert-error">
-      The form contains <%= pluralize(@signup.errors.count, "error") %>.
+      The form contains <%%= pluralize(@signup.errors.count, "error") %>.
     </div>
     <ul>
-    <% @signup.errors.full_messages.each do |msg| %>
-      <li>* <%= msg %></li>
-    <% end %>
+    <%% @signup.errors.full_messages.each do |msg| %>
+      <li>* <%%= msg %></li>
+    <%% end %>
     </ul>
   </div>
-<% end %>
+<%% end %>
 
-<%= form_for @signup, url: signup_path do |f| %>
+<%%= form_for @signup, url: signup_path do |f| %>
   <div class="field">
-    <%= f.label "first_name" %>
-    <%= f.text_field "first_name" %>
+    <%%= f.label "first_name" %>
+    <%%= f.text_field "first_name" %>
   </div>
   <div class="field">
-    <%= f.label "last_name" %>
-    <%= f.text_field "last_name" %>
+    <%%= f.label "last_name" %>
+    <%%= f.text_field "last_name" %>
   </div>
   <div class="field">
-    <%= f.label "bio" %>
-    <%= f.text_area "bio" %>
+    <%%= f.label "bio" %>
+    <%%= f.text_area "bio" %>
   </div>
   <div class="field">
-    <%= f.label "website" %>
-    <%= f.text_field "website" %>
+    <%%= f.label "website" %>
+    <%%= f.text_field "website" %>
   </div>
   <div class="field">
-    <%= f.label "phone_number" %>
-    <%= f.text_field "phone_number" %>
+    <%%= f.label "phone_number" %>
+    <%%= f.text_field "phone_number" %>
   </div>
   <div class="field">
-    <%= f.label "time_zone" %>
-    <%= f.time_zone_select('time_zone', ActiveSupport::TimeZone.us_zones, :default => "Pacific Time (US & Canada)") %>
+    <%%= f.label "time_zone" %>
+    <%%= f.time_zone_select('time_zone', ActiveSupport::TimeZone.us_zones, :default => "Pacific Time (US & Canada)") %>
   </div>
   <div class="field">
-    <%= f.label "email" %>
-    <%= f.text_field "email" %>
+    <%%= f.label "email" %>
+    <%%= f.text_field "email" %>
   </div>
-  <div class="field">
-    <%= f.label "username" %>
-    <%= f.text_field "username" %>
+  <% if username? %><div class="field">
+    <%%= f.label "username" %>
+    <%%= f.text_field "username" %>
   </div>
-  <div class="field">
-    <%= f.label "password" %>
-    <%= f.password_field "password" %>
+  <% end %><div class="field">
+    <%%= f.label "password" %>
+    <%%= f.password_field "password" %>
   </div>
   <div class="field">
-    <%= f.label "password_confirmation" %>
-    <%= f.password_field "password_confirmation" %>
+    <%%= f.label "password_confirmation" %>
+    <%%= f.password_field "password_confirmation" %>
   </div>
   <div class="field">
-    <%= check_box_tag :remember_me, "1", true %>
+    <%%= check_box_tag :remember_me, "1", true %>
     <label for="remember_me">Keep me signed in on this computer</label>
   </div>
-  <%= f.submit "Sign up" %>
-<% end %>
+  <%%= f.submit "Sign up" %>
+<%% end %>

data/lib/generators/authkit/templates/app/views/users/complete.html.erb

@@ -0,0 +1,39 @@
+<h1>One more step to complete your account</h1>
+
+<%% if @user.errors.any? %>
+  <div id="error_explanation">
+    <div class="alert alert-error">
+      The form contains <%%= pluralize(@user.errors.count, "error") %>.
+    </div>
+    <ul>
+    <%% @user.errors.full_messages.each do |msg| %>
+      <li>* <%%= msg %></li>
+    <%% end %>
+    </ul>
+  </div>
+<%% end %>
+
+<%%= form_for @user do |f| %>
+  <div class="field">
+    <%%= f.label "first_name" %>
+    <%%= f.text_field "first_name" %>
+  </div>
+  <div class="field">
+    <%%= f.label "last_name" %>
+    <%%= f.text_field "last_name" %>
+  </div>
+  <div class="field">
+    <%%= f.label "email" %>
+    <%%= f.text_field "confirmation_email" %>
+  </div>
+  <div class="field">
+    <%%= f.label "password" %>
+    <%%= f.password_field "password" %>
+  </div>
+  <div class="field">
+    <%%= f.label "password_confirmation" %>
+    <%%= f.password_field "password_confirmation" %>
+  </div>
+  <%%= f.submit "Finish" %>
+<%% end %>
+

data/lib/generators/authkit/templates/app/views/users/edit.html.erb

@@ -1,58 +1,58 @@
 <h1>Account</h1>
 
-<% if @user.errors.any? %>
+<%% if @user.errors.any? %>
   <div id="error_explanation">
     <div class="alert alert-error">
-      The form contains <%= pluralize(@user.errors.count, "error") %>.
+      The form contains <%%= pluralize(@user.errors.count, "error") %>.
     </div>
     <ul>
-    <% @user.errors.full_messages.each do |msg| %>
-      <li>* <%= msg %></li>
-    <% end %>
+    <%% @user.errors.full_messages.each do |msg| %>
+      <li>* <%%= msg %></li>
+    <%% end %>
     </ul>
   </div>
-<% end %>
+<%% end %>
 
-<%= form_for @user do |f| %>
+<%%= form_for @user do |f| %>
   <div class="field">
-    <%= f.label "first_name" %>
-    <%= f.text_field "first_name" %>
+    <%%= f.label "first_name" %>
+    <%%= f.text_field "first_name" %>
   </div>
   <div class="field">
-    <%= f.label "last_name" %>
-    <%= f.text_field "last_name" %>
+    <%%= f.label "last_name" %>
+    <%%= f.text_field "last_name" %>
   </div>
   <div class="field">
-    <%= f.label "bio" %>
-    <%= f.text_area "bio" %>
+    <%%= f.label "bio" %>
+    <%%= f.text_area "bio" %>
   </div>
   <div class="field">
-    <%= f.label "website" %>
-    <%= f.text_field "website" %>
+    <%%= f.label "website" %>
+    <%%= f.text_field "website" %>
   </div>
   <div class="field">
-    <%= f.label "phone_number" %>
-    <%= f.text_field "phone_number" %>
+    <%%= f.label "phone_number" %>
+    <%%= f.text_field "phone_number" %>
   </div>
   <div class="field">
-    <%= f.label "time_zone" %>
-    <%= f.time_zone_select('time_zone', ActiveSupport::TimeZone.us_zones, :default => "Pacific Time (US & Canada)") %>
+    <%%= f.label "time_zone" %>
+    <%%= f.time_zone_select('time_zone', ActiveSupport::TimeZone.us_zones, :default => "Pacific Time (US & Canada)") %>
   </div>
   <div class="field">
-    <%= f.label "email" %>
-    <%= f.text_field "confirmation_email" %>
+    <%%= f.label "email" %>
+    <%%= f.text_field "confirmation_email" %>
   </div>
-  <div class="field">
-    <%= f.label "username" %>
-    <%= f.text_field "username" %>
+  <% if username? %><div class="field">
+    <%%= f.label "username" %>
+    <%%= f.text_field "username" %>
   </div>
-  <div class="field">
-    <%= f.label "password" %>
-    <%= f.password_field "password" %>
+  <% end %><div class="field">
+    <%%= f.label "password" %>
+    <%%= f.password_field "password" %>
   </div>
   <div class="field">
-    <%= f.label "password_confirmation" %>
-    <%= f.password_field "password_confirmation" %>
+    <%%= f.label "password_confirmation" %>
+    <%%= f.password_field "password_confirmation" %>
   </div>
-  <%= f.submit "Save" %>
-<% end %>
+  <%%= f.submit "Save" %>
+<%% end %>