volt-user_templates 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62412eb3bb8518f0265635d4e9eb5be024d41a7c
-  data.tar.gz: 90f2ce74a486c78799acc24dc900a6bbd79e9374
+  metadata.gz: 145bf08ec26e29200d73efe316caeec2374efe25
+  data.tar.gz: eb4990ffeb13fae9a9c107116b6cce6d26d1944b
 SHA512:
-  metadata.gz: 54015581a0c66f3b80afd0917a2815e691afeb2623747deb7f03953542488abf037a36b66e4283a0cb19fa4d69c3537b7255123c6220809201da3ebaa00cb2b5
-  data.tar.gz: 08917295aeff55475203165c7104b93003bf266835a9aa354c58037d24287262e5cd25247c0069189fdbdae7869ec2ca41dd414c44588475bf3556dd7cb7182b
+  metadata.gz: 69a7cca480dcb1d833dc0ca04341191388d2bb555e4bbc0cc90b4bf759e7784c01ec5fab592af922762b05bc376575b86745ae7d3afaf539310f7549383c7a8a
+  data.tar.gz: 52daf097444a39267f1fe516daf7680dba838f976845cb8a41addd3d2aef12f08438ec4ead2badc036414003cc5763eba0635ceab285f76e3c9cb89f3dfc5417

data/README.md

@@ -28,6 +28,7 @@ Add the following to your main components route file:
 
 ```ruby
 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'
 ```

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app/user_templates/controllers/account_controller.rb

@@ -3,7 +3,7 @@ module UserTemplates
     before_action :require_login
 
     def index
-      self.model = Volt.fetch_current_user.then(&:buffer)
+      self.model = Volt.current_user.then(&:buffer)
     end
 
     def save

data/app/user_templates/controllers/login_controller.rb

@@ -4,6 +4,7 @@ module UserTemplates
     reactive_accessor :login
     reactive_accessor :password
     reactive_accessor :reset_email
+    reactive_accessor :new_password
 
     def do_login
       Volt.login(login, password).then do |res|

data/app/user_templates/controllers/menu_controller.rb

@@ -1,8 +1,13 @@
 module UserTemplates
   class MenuController < Volt::ModelController
     def show_name
-      Volt.fetch_current_user.then do |user|
-        user._name || user._email || user._username
+      Volt.current_user.then do |user|
+        # Make sure there is a user
+        if user
+          user._name || user._email || user._username
+        else
+          ''
+        end
       end
     end
 

data/app/user_templates/controllers/password_reset_controller.rb

@@ -0,0 +1,10 @@
+module UserTemplates
+  class PasswordResetController < Volt::ModelController
+    reactive_accessor :new_password
+
+    def reset_password
+
+    end
+
+  end
+end

data/app/user_templates/tasks/password_reset_tasks.rb

@@ -0,0 +1,5 @@
+class PasswordResetTasks < Volt::Task
+  def reset_password(user_id, token, new_password)
+
+  end
+end

data/app/user_templates/tasks/user_template_tasks.rb

@@ -1,10 +1,6 @@
 require 'digest'
 
 class UserTemplateTasks < Volt::Task
-  def password_reset_token(user_id)
-    Digest::SHA256.hexdigest("#{user_id}||#{Volt.config.app_secret}")
-  end
-
   def send_reset_email(email)
     # Find user by e-mail
     Volt.skip_permissions do
@@ -12,7 +8,11 @@ class UserTemplateTasks < Volt::Task
         if user
           reset_token = password_reset_token(user.id)
 
-          reset_url = "http://#{Volt.config.domain}/#{reset_token}"
+          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}"
 
           Mailer.deliver('user_templates/mailers/forgot',
             {to: email, name: user._name, reset_url: reset_url}
@@ -23,4 +23,9 @@ class UserTemplateTasks < Volt::Task
       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/password_reset/index.html

@@ -0,0 +1,10 @@
+<:Title>
+  Reset Password
+
+<:Body>
+  <h1>Reset Password</h1>
+
+  <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.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: volt-fields
@@ -69,13 +69,16 @@ files:
 - app/user_templates/controllers/account_controller.rb
 - app/user_templates/controllers/login_controller.rb
 - 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/tasks/password_reset_tasks.rb
 - app/user_templates/tasks/user_template_tasks.rb
 - app/user_templates/views/account/index.html
 - app/user_templates/views/login/forgot.html
 - app/user_templates/views/login/index.html
 - app/user_templates/views/mailers/forgot.email
 - app/user_templates/views/menu/index.html
+- app/user_templates/views/password_reset/index.html
 - app/user_templates/views/signup/index.html
 - lib/volt/user-templates.rb
 - volt-user_templates.gemspec