volt-user_templates 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145bf08ec26e29200d73efe316caeec2374efe25
-  data.tar.gz: eb4990ffeb13fae9a9c107116b6cce6d26d1944b
+  metadata.gz: 7ef97ee96b9b07032420a48e92daf33344d57735
+  data.tar.gz: 7e4403bf01ddb8327290915c9753fa0fad7c9d46
 SHA512:
-  metadata.gz: 69a7cca480dcb1d833dc0ca04341191388d2bb555e4bbc0cc90b4bf759e7784c01ec5fab592af922762b05bc376575b86745ae7d3afaf539310f7549383c7a8a
-  data.tar.gz: 52daf097444a39267f1fe516daf7680dba838f976845cb8a41addd3d2aef12f08438ec4ead2badc036414003cc5763eba0635ceab285f76e3c9cb89f3dfc5417
+  metadata.gz: d560a321793d17042556aac4db166e410dec2240012259cb732cbc466ec02e98d0be62f3458a82678e576c8073bf68d86602d7058f458a51b4ee92f37cfeff05
+  data.tar.gz: 8d681d3ff453aab5b317fe178f79346cdbc79671cf9377f416b6d3e23727bbec509a6fa5246858b1b147c5ccb8b27f9e9dcdae34d00dca4a703cdc96c4f414ae

data/README.md

@@ -31,6 +31,7 @@ client '/signup', component: 'user_templates', controller: 'signup'
 client '/password_reset', component: 'user_templates', controller: 'password_reset', action: 'index'
 client '/forgot', component: 'user_templates', controller: 'login', action: 'forgot'
 client '/login', component: 'user_templates', controller: 'login', action: 'index'
+client '/account', component: 'user_templates', controller: 'account', action: 'index'
 ```
 
 Now you can link to /signup and /login

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/app/user_templates/controllers/login_controller.rb

@@ -36,7 +36,7 @@ module UserTemplates
         flash._notices << 'Reset email sent.'
         redirect_to(attrs.post_forgot_url || '/login')
       end.fail do |err|
-        flash._errors << err.to_s
+        flash._errors << err.message
       end
     end
 

data/app/user_templates/controllers/password_reset_controller.rb

@@ -1,10 +1,29 @@
 module UserTemplates
   class PasswordResetController < Volt::ModelController
-    reactive_accessor :new_password
+    reactive_accessor :user, :errors
+
+    def index
+      self.user = store.users.buffer
+      user.password = ''
+    end
 
     def reset_password
+      self.errors = nil
+      user.mark_all_fields!
+      user.validate!.fail do |errs|
+        # .validate! changed with the sql branch, so we support both versions
+        # here
+        unless errs[:password]
+          PasswordResetTasks.reset_password(params._user_id, params._token, user.password).then do
+            flash._notices << 'Password updated'
+            user.password = ''
 
+            redirect_to '/'
+          end.fail do |err|
+            self.errors = err
+          end
+        end
+      end
     end
-
   end
-end
+end

data/app/user_templates/lib/password_reset_token.rb

@@ -0,0 +1,23 @@
+require 'digest'
+
+module UserTemplates
+  module PasswordResetToken
+    def self.for_user(user_id, time_offset=0)
+      # Get a token with the hour as part of the hash.
+      time_num = time_offset.hours.ago.beginning_of_hour.to_i
+
+      Digest::SHA256.hexdigest("#{user_id}||#{Volt.config.app_secret}||#{time_num}")
+    end
+
+    # Checks for the current hour or the previous for the valid token
+    def self.valid_token_for_user?(user_id, token)
+      if for_user(user_id, 0) == token
+        true
+      elsif for_user(user_id, 1) == token
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/app/user_templates/tasks/password_reset_tasks.rb

@@ -1,5 +1,21 @@
+require 'user_templates/lib/password_reset_token'
+
 class PasswordResetTasks < Volt::Task
   def reset_password(user_id, token, new_password)
+    valid = UserTemplates::PasswordResetToken.valid_token_for_user?(user_id, token)
+
+    if valid
+      Volt.skip_permissions do
+        user = store.users.where(id: user_id).first.sync.buffer
 
+        user.password = new_password
+        user.save!.then do
+          login_as(user)
+          nil
+        end
+      end
+    else
+      raise "The password reset link has expired."
+    end
   end
 end

data/app/user_templates/tasks/user_template_tasks.rb

@@ -1,31 +1,30 @@
-require 'digest'
+require 'user_templates/lib/password_reset_token'
 
 class UserTemplateTasks < Volt::Task
   def send_reset_email(email)
     # Find user by e-mail
     Volt.skip_permissions do
-      store._users.where(email: email).fetch_first do |user|
+      store._users.where(email: email).first.then do |user|
         if user
-          reset_token = password_reset_token(user.id)
+          reset_token = UserTemplates::PasswordResetToken.for_user(user.id)
 
-          reset_base_url = url_for(component: 'user_templates',
-            controller: 'password_reset', action: 'index')
-
-          reset_url = "http://#{Volt.config.domain}/#{reset_base_url}/?"
-            + "user_id=#{user_id}&token=#{reset_token}"
+          reset_url, _ = url_for(
+            component: 'user_templates',
+            controller: 'password_reset',
+            action: 'index',
+            user_id: user.id,
+            token: reset_token
+          )
 
           Mailer.deliver('user_templates/mailers/forgot',
             {to: email, name: user._name, reset_url: reset_url}
           )
+
+          nil
         else
           raise "There is no account with the e-mail of #{email}."
         end
       end
     end
   end
-
-  private
-  def password_reset_token(user_id)
-    Digest::SHA256.hexdigest("#{user_id}||#{Volt.config.app_secret}")
-  end
 end

data/app/user_templates/views/mailers/forgot.email

@@ -2,6 +2,7 @@
   Reset your Password
 
 <:Html>
+  <a href="{{ reset_url }}">Some Url</a>
   <html>
     <body>
       <table cellspacing="0" cellpadding="0" border="0" style="color: #333; background: #fff; padding: 0; margin: 0; width: 100%; font: 15px/1.25em 'Helvetica Neue', Arial, Helvetica;">

data/app/user_templates/views/password_reset/index.html

@@ -2,9 +2,24 @@
   Reset Password
 
 <:Body>
-  <h1>Reset Password</h1>
+   <div class="row">
+    <div class="col-md-6 col-md-offset-3">
+      <div class="span4 offset4 well">
+        <legend>Reset Your Password</legend>
+
+        <form e-submit="reset_password">
+          {{ if errors.present? }}
+            <div class="alert alert-danger">{{ errors }}</div>
+          {{ end }}
+
+          <div class="form-group">
+            <label class="control-label">New Password</label>
+            <:fields:text type="password" label="false" value="{{ user.password }}" />
+          </div>
+
+          <button class="btn btn-info btn-block">Reset Password</button>
+        </form>
+      </div>
+    </div>
+  </div>
 
-  <form e-click="reset_password">
-    <:fields:password label="New Password" value="{{ new_password }}" />
-    <button>Reset Password</button>
-  </form>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-user_templates
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: volt-fields
@@ -71,6 +71,7 @@ files:
 - app/user_templates/controllers/menu_controller.rb
 - app/user_templates/controllers/password_reset_controller.rb
 - app/user_templates/controllers/signup_controller.rb
+- app/user_templates/lib/password_reset_token.rb
 - app/user_templates/tasks/password_reset_tasks.rb
 - app/user_templates/tasks/user_template_tasks.rb
 - app/user_templates/views/account/index.html