simply_auth 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1708669fe57a25f6504a5453fa443ec069d89d43
-  data.tar.gz: 8827d47aee99628c8af6f7ea66d60c114b4c7093
+  metadata.gz: 5d9ba7185d95620632bf2d1ab1e5ccf4f1af9a82
+  data.tar.gz: e1a34f65489e3a60e296b644e736ca3a920afa4a
 SHA512:
-  metadata.gz: dde691af02f93c295f2d75317c070aa3f0d235e55e58b497ec5c0cbe8dd8a7791a4535ac3a77569e2c2766107f31bc85ad92194eb106689d8a8cb0110d5036cd
-  data.tar.gz: 4e9c5e11b31351082c0fd70b882e08fe5414fcb90c25e19ce95d0648bec49f7d9916c0486beb653ac6d48fa8006719fc91999663b18a59860b4fb5bc8cf3417c
+  metadata.gz: d37ce6d128b3bfee0e692ddaddf27663fc22a5b99a51e2c806898e613862b4b8c0634d70f606d76afce78937fa81f148e3d068d7abe88436fe0cd833522c9470
+  data.tar.gz: 6157387c00a0d9e5cb76454e04c939d0f2b6942968ed7dd713abf49ab900f89412e008909b33b6eccfe208acbdfe191ead8cf1fc70f4d0b8e59a2acb9601b591

data/app/controllers/simply_auth/passwords_controller.rb

@@ -0,0 +1,47 @@
+module SimplyAuth
+  class PasswordsController < ApplicationController
+    def new
+      @reset_password_token = SimplyAuth::ResetPasswordToken.new(permit_password_params)
+    end
+
+    def create
+      @reset_password_token = SimplyAuth::ResetPasswordToken.new(password_params)
+      if @reset_password_token.save
+        PasswordMailer.reset_password(@reset_password_token).deliver_now
+        flash[:notice] = "Please check your email for password reset instructions."
+        redirect_to new_session_path
+      else
+        render :new
+      end
+    end
+
+    def edit
+      @reset_password_token = SimplyAuth::ResetPasswordToken.find(params[:token])
+      @password_reset = SimplyAuth::PasswordReset.new(reset_password_token_id: params[:token])
+    end
+
+    def update
+      @password_reset = SimplyAuth::PasswordReset.new(password_reset_params)
+      @reset_password_token = SimplyAuth::ResetPasswordToken.find(@password_reset.reset_password_token_id)
+      if @password_reset.save
+        redirect_to new_session_path
+      else
+        render :edit
+      end
+    end
+
+    private
+
+    def password_params
+      params.require(:reset_password_token).permit(:email)
+    end
+
+    def password_reset_params
+      params.require(:password_reset).permit(:reset_password_token_id, :password)
+    end
+
+    def permit_password_params
+      params.permit(:reset_password_token => :email)[:reset_password_token]
+    end
+  end
+end

data/app/controllers/simply_auth/sessions_controller.rb

@@ -32,7 +32,7 @@ module SimplyAuth
     end
 
     def permit_session_params
-      params.permit(:session => [:email, :password])[:session]
+      params.permit(:session => :email)[:session]
     end
   end
 end

data/app/mailers/simply_auth/password_mailer.rb

@@ -0,0 +1,8 @@
+module SimplyAuth
+  class PasswordMailer < ApplicationMailer
+    def reset_password(reset_password_token)
+      @reset_password_token = reset_password_token
+      mail(to: reset_password_token.user.email, subject: 'Reset your Password')
+    end
+  end
+end

data/app/models/simply_auth/model.rb

@@ -40,6 +40,7 @@ module SimplyAuth
 
     def save
       if valid?
+        attributes = self.attributes.deep_transform_keys{|k| k.to_s.camelize(:lower)}
         # Rails.logger.error([
         #   persisted? ? :patch : :post,
         #   "https://api.simplyauth.com#{persisted? ? instance_path : collection_path}",
@@ -55,8 +56,8 @@ module SimplyAuth
           content_type: :json
         )
         body = JSON.parse(response.body)[model_name.element.camelize(:lower)]
-        body = body.deep_transform_keys { |key| key.to_s.underscore }
-        self.attributes = self.class.new.attributes.merge(body)
+        body = body.deep_transform_keys { |key| key.to_s.underscore } if body
+        self.attributes = self.class.new.attributes.merge(body || {})
         changes_applied
         self.persisted = true
         true

data/app/models/simply_auth/password_reset.rb

@@ -0,0 +1,14 @@
+module SimplyAuth
+  class PasswordReset < Model
+    attr_accessor :password, :reset_password_token_id, :user_pool_id
+    def attributes
+      super.merge(password: password, reset_password_token_id: reset_password_token_id, user_pool_id: user_pool_id)
+    end
+    def self.owner_class_name
+      "UserPool"
+    end
+    def owner_id
+      user_pool_id
+    end
+  end
+end

data/app/models/simply_auth/reset_password_token.rb

@@ -0,0 +1,19 @@
+module SimplyAuth
+  class ResetPasswordToken < Model
+    attr_accessor :email, :user_pool_id, :expires_at, :created_at, :user
+    validates :email, format: /[^@]+@[^@]+/
+    def attributes
+      super.merge(email: email)
+    end
+    def user
+      User.new(@user)
+    end
+
+    def self.owner_class_name
+      "UserPool"
+    end
+    def owner_id
+      user_pool_id
+    end
+  end
+end

data/app/views/simply_auth/password_mailer/reset_password.html.erb

@@ -0,0 +1,10 @@
+<p>Hey,<p>
+
+<p>Someone asked to change your password. If you requested the change, click the link below.<p>
+
+<p><%= link_to 'Change Password', edit_password_url(token: @reset_password_token.id) %>
+
+<p>If you did not request that your password be changed, you may safely ignore this email. Your password will only be changed if you click the link and follow its instructions.</p>
+
+<p>This link will expire in six hours, and can only be used once.</p>
+

data/app/views/simply_auth/passwords/edit.html.erb

@@ -0,0 +1,48 @@
+<div class='container'>
+  <div class='d-flex flex-row'>
+    <h2 class='mr-auto'>Reset Password</h2>
+    <div>
+      <span class='mr-2'>Not a member?</span>
+      <%= link_to "Sign Up", new_registration_path, class: "btn btn-secondary" %>
+    </div>
+  </div>
+  <%= form_for @password_reset, url: :password, method: :patch, html: {class: "needs-validation", novalidate: true}  do |f| %>
+    <%= f.hidden_field :reset_password_token_id %>
+    <div class='form-group'>
+      <%= f.label :password, "Password" %>
+      <%= f.password_field :password, class: "form-control #{"is-invalid" if @password_reset.errors[:password].any? }", required: true %>
+      <div class='invalid-feedback'>
+        <% if @password_reset.errors[:password].any? %>
+          <%= @password_reset.errors[:password].map{|m| "Password #{m}."}.join(" ") %>
+        <% else %>
+          Please choose a new password.
+        <% end %>
+      </div>
+    </div>
+    <%= f.submit "Reset my Password", class: "btn btn-primary mr-3" %>
+  <% end %>
+
+  <script>
+  (function() {
+    'use strict';
+    window.addEventListener('load', function() {
+      var forms = document.getElementsByClassName('needs-validation');
+      var validation = Array.prototype.filter.call(forms, function(form) {
+        form.addEventListener('submit', function(event) {
+          if (form.checkValidity() === false) {
+            event.preventDefault();
+            event.stopPropagation();
+          }
+          form.classList.add('was-validated');
+        }, false);
+      });
+    }, false);
+  })();
+  </script>
+  <style>
+    .field_with_errors ~ .invalid-feedback,
+    .field_with_errors ~ .invalid-tooltip {
+      display: block;
+    }
+  </style>
+</div>

data/app/views/simply_auth/passwords/new.html.erb

@@ -0,0 +1,48 @@
+<div class='container'>
+  <div class='d-flex flex-row'>
+    <h2 class='mr-auto'>Reset Password</h2>
+    <div>
+      <span class='mr-2'>Not a member?</span>
+      <%= link_to "Sign Up", new_registration_path, class: "btn btn-secondary" %>
+    </div>
+  </div>
+  <%= form_for @reset_password_token, url: :password, html: {class: "needs-validation", novalidate: true}  do |f| %>
+    <div class='form-group'>
+      <%= f.label :email, "Email" %>
+      <%= f.text_field :email, class: "form-control #{"is-invalid" if @reset_password_token.errors[:email].any? }", required: true, type: :email %>
+      <div class='invalid-feedback'>
+        <% if @reset_password_token.errors[:email].any? %>
+          <%= @reset_password_token.errors[:email].map{|m| "Email #{m}."}.join(" ") %>
+        <% else %>
+          Please provide your email.
+        <% end %>
+      </div>
+    </div>
+    <%= f.submit "Reset my Password", class: "btn btn-primary mr-3" %>
+    <%= link_to "I remembered my password", new_session_path %>
+  <% end %>
+
+  <script>
+  (function() {
+    'use strict';
+    window.addEventListener('load', function() {
+      var forms = document.getElementsByClassName('needs-validation');
+      var validation = Array.prototype.filter.call(forms, function(form) {
+        form.addEventListener('submit', function(event) {
+          if (form.checkValidity() === false) {
+            event.preventDefault();
+            event.stopPropagation();
+          }
+          form.classList.add('was-validated');
+        }, false);
+      });
+    }, false);
+  })();
+  </script>
+  <style>
+    .field_with_errors ~ .invalid-feedback,
+    .field_with_errors ~ .invalid-tooltip {
+      display: block;
+    }
+  </style>
+</div>

data/app/views/simply_auth/sessions/new.html.erb

@@ -29,7 +29,8 @@
         <% end %>
       </div>
     </div>
-    <%= f.submit "Log In", class: "btn btn-primary"%>
+    <%= f.submit "Log In", class: "btn btn-primary mr-3" %>
+    <%= link_to "I forgot my password", new_password_path %>
   <% end %>
 
   <script>

data/config/routes.rb

@@ -1,4 +1,5 @@
 SimplyAuth::Engine.routes.draw do
   resources :registrations
   resource :session
+  resource :password
 end

data/lib/simply_auth/version.rb

@@ -1,3 +1,3 @@
 module SimplyAuth
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simply_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryan Fogle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,17 +66,24 @@ files:
 - app/assets/javascripts/simply_auth/application.js
 - app/assets/stylesheets/simply_auth/application.css
 - app/controllers/simply_auth/application_controller.rb
+- app/controllers/simply_auth/passwords_controller.rb
 - app/controllers/simply_auth/registrations_controller.rb
 - app/controllers/simply_auth/sessions_controller.rb
 - app/helpers/simply_auth/application_helper.rb
 - app/jobs/simply_auth/application_job.rb
 - app/mailers/simply_auth/application_mailer.rb
+- app/mailers/simply_auth/password_mailer.rb
 - app/models/simply_auth/config.rb
 - app/models/simply_auth/model.rb
+- app/models/simply_auth/password_reset.rb
+- app/models/simply_auth/reset_password_token.rb
 - app/models/simply_auth/session.rb
 - app/models/simply_auth/user.rb
 - app/models/simply_auth/user_pool.rb
 - app/views/layouts/simply_auth/application.html.erb
+- app/views/simply_auth/password_mailer/reset_password.html.erb
+- app/views/simply_auth/passwords/edit.html.erb
+- app/views/simply_auth/passwords/new.html.erb
 - app/views/simply_auth/registrations/_additional_fields.html.erb
 - app/views/simply_auth/registrations/new.html.erb
 - app/views/simply_auth/sessions/new.html.erb