simply_auth 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0001e3ce2a6ca0f68b35de04fde16ccf62818250f061efedaf6139b4037b7839
-  data.tar.gz: 9126aeca9a3e00085c1991d0bdf80017cb7098b950bc25139b391fd7881443c3
+  metadata.gz: 750533d97a9a4c3cf78e8edbba37de4de5747551c95de6635dddf1b296b1f067
+  data.tar.gz: 1ac2b5510e6fddeaa74aa5ea27e1c31f2e15554c7c572bec4cf8b116e2ccef1e
 SHA512:
-  metadata.gz: d9b60106600ae9cd02ff8d8d265d8b4bca505eba968218ded87244f7033b2636a5938d3abb30e4e2cad232acd84ebe41a79ae16a101e08342f4d7e1355bcad10
-  data.tar.gz: 437797106a7e8ab995a3ca3127f9332885529702c1a12397de0c4ceedc3b7ef1ae831a325029b31c347310a155a3bcfefe5cb1ce067ad6098dc5bab3fa3f643e
+  metadata.gz: 8c1954bf11a7d3c6e2e8660dcf53376e5e6143d476a03197a9fa83277a6fcc21a21e5c1380e427e98ecdedb91ef0c7116c657bef52e05234f9f87eb125f77dba
+  data.tar.gz: 5cd9bef3147731ad68e3563e121b1ea51a1d39a8771f940851456c8bfb42bed99222d3f1d5caadf52b31b7c057ac2dc042ca98845e7b4abec3b9aafee7f7e245

data/app/controllers/simply_auth/registrations_controller.rb

@@ -1,7 +1,8 @@
 module SimplyAuth
   class RegistrationsController < ApplicationController
+    before_action :load_signup_form
     def new
-      @user = SimplyAuth::User.new
+      @html = @step["html"].gsub("/registrations", registrations_path(form: @signup_form.id))
     end
 
     def index
@@ -12,23 +13,65 @@ module SimplyAuth
     def after_registration(user); end
 
     def create
-      @user = SimplyAuth::User.new(user_params)
-      if @user.save
+      session["simply_auth_form_submission"] ||= {}
+      if (session["simply_auth_form_submission"]["id"] != @signup_form.id)
+        session["simply_auth_form_submission"] = {}
+      end
+      session["simply_auth_form_submission"]["id"] = @signup_form.id
+      session["simply_auth_form_submission"]["attributes"] ||= {}
+      user_params = user_params(@step["attributes"])
+      user_params.each do |k, v|
+        v = v.to_h if v.respond_to?(:to_h)
+        session["simply_auth_form_submission"]["attributes"][k] = v
+      end
+      if @step == @signup_form.steps.last
+        @user = SimplyAuth::User.new(session["simply_auth_form_submission"]["attributes"])
+        @user.save
         after_registration(@user)
-
-        @session = SimplyAuth::Session.new(email: user_params[:email], password: user_params[:password])
+        
+        @session = SimplyAuth::Session.new(email: @user.email, password: session["simply_auth_form_submission"]["attributes"]["password"])
         @session.save
+        session.delete("simply_auth_form_submission")
         session[:simply_auth_session_id] = @session.id
         redirect_to "/"
       else
-        render :new
+        redirect_to new_registration_path(form: @signup_form.id)
       end
     end
 
     private
 
-    def user_params
-      params.require(:user).permit(:name, :email, :password, data: params[:user][:data].try(:keys))
+    def user_params(step_attributes)
+      permissions = []
+      data_attributes = []
+      step_attributes.each do |attribute|
+        if attribute.starts_with?("data.")
+          data_attributes.push(attribute.gsub("data.", ""))
+        else
+          permissions << attribute
+        end
+      end
+      if data_attributes.any?
+        permissions.push(data: data_attributes)
+      end
+      params.require(:user).permit(permissions)
+    end
+
+    def load_signup_form
+      @user_pool = SimplyAuth::UserPool.find(SimplyAuth::Config.user_pool_id)
+      forms = SimplyAuth::SignupForm.all(@user_pool.application_id)
+      @signup_form = params[:form] ? forms.find{|f| f.id == params[:form]} : forms.first
+      session["simply_auth_form_submission"] ||= {}
+      session["simply_auth_form_submission"]["attributes"] ||= {}
+      @step = @signup_form.steps.find do |s|
+        s["attributes"].any? do |attribute|
+          if attribute.starts_with?("data.")
+            session["simply_auth_form_submission"]["attributes"]["data"][attribute.gsub("data.", "")].blank?
+          else
+            session["simply_auth_form_submission"]["attributes"][attribute].blank?
+          end
+        end
+      end
     end
   end
 end

data/app/models/simply_auth/user_pool.rb

@@ -1,9 +1,9 @@
 module SimplyAuth
   class UserPool < Model
     validates :name, presence: true
-    attr_accessor :name
+    attr_accessor :name, :application_id
     def attributes
-      super.merge(name: name)
+      super.merge(name: name, application_id: application_id)
     end
 
     def self.instance_path(ids = [])

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

@@ -1,72 +1 @@
-<div class='container'>
-  <div class='d-flex flex-row'>
-    <h2 class='mr-auto'>Sign Up</h2>
-    <div>
-      <span class='mr-2'>Already a member?</span>
-      <%= link_to "Log In", new_session_path, class: "btn btn-secondary" %>
-    </div>
-  </div>
-  <%= form_for @user, url: [:registrations], html: {class: "needs-validation", novalidate: true} do |f| %>
-    <div class='form-group'>
-      <%= f.label :name, "Name *" %>
-      <%= f.text_field :name, class: "form-control #{"is-invalid" if @user.errors[:name].any? }", required: true %>
-      <div class='invalid-feedback'>
-        <% if @user.errors[:name].any? %>
-          <%= @user.errors[:name].map{|m| "Name #{m}."}.join(" ") %>
-        <% else %>
-          Please provide your name.
-        <% end %>
-      </div>
-    </div>
-    <div class='form-group'>
-      <%= f.label :email, "Email *" %>
-      <%= f.text_field :email, class: "form-control #{"is-invalid" if @user.errors[:email].any? }", required: true, type: :email %>
-      <div class='invalid-feedback'>
-        <% if @user.errors[:email].grep(/taken/).any? %>
-          That email is already registered. Would you like to <%= link_to "sign in", new_session_path(session: {email: @user.email}) %>?
-        <% elsif @user.errors[:email].any? %>
-          <%= @user.errors[:email].map{|m| "Email #{m}."}.join(" ") %>
-        <% else %>
-          Please provide your email.
-        <% end %>
-      </div>
-    </div>
-    <div class='form-group'>
-      <%= f.label :password, "Password *" %>
-      <%= f.password_field :password, class: "form-control #{"is-invalid" if @user.errors[:password].any? }", required: true %>
-      <div class='invalid-feedback'>
-        <% if @user.errors[:password].any? %>
-          <%= @user.errors[:password].map{|m| "Password #{m}."}.join(" ") %>
-        <% else %>
-          Please provide a password.
-        <% end %>
-      </div>
-    </div>
-    <%= render partial: "additional_fields", locals: {form: f} %>
-    <%= f.submit "Sign Up", class: "btn btn-primary" %>
-  <% 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>
+<%= @html.html_safe %>

data/app/views/simply_auth/registrations/old-new.html.erb

@@ -0,0 +1,72 @@
+<div class='container'>
+  <div class='d-flex flex-row'>
+    <h2 class='mr-auto'>Sign Up</h2>
+    <div>
+      <span class='mr-2'>Already a member?</span>
+      <%= link_to "Log In", new_session_path, class: "btn btn-secondary" %>
+    </div>
+  </div>
+  <%= form_for @user, url: [:registrations], html: {class: "needs-validation", novalidate: true} do |f| %>
+    <div class='form-group'>
+      <%= f.label :name, "Name *" %>
+      <%= f.text_field :name, class: "form-control #{"is-invalid" if @user.errors[:name].any? }", required: true %>
+      <div class='invalid-feedback'>
+        <% if @user.errors[:name].any? %>
+          <%= @user.errors[:name].map{|m| "Name #{m}."}.join(" ") %>
+        <% else %>
+          Please provide your name.
+        <% end %>
+      </div>
+    </div>
+    <div class='form-group'>
+      <%= f.label :email, "Email *" %>
+      <%= f.text_field :email, class: "form-control #{"is-invalid" if @user.errors[:email].any? }", required: true, type: :email %>
+      <div class='invalid-feedback'>
+        <% if @user.errors[:email].grep(/taken/).any? %>
+          That email is already registered. Would you like to <%= link_to "sign in", new_session_path(session: {email: @user.email}) %>?
+        <% elsif @user.errors[:email].any? %>
+          <%= @user.errors[:email].map{|m| "Email #{m}."}.join(" ") %>
+        <% else %>
+          Please provide your email.
+        <% end %>
+      </div>
+    </div>
+    <div class='form-group'>
+      <%= f.label :password, "Password *" %>
+      <%= f.password_field :password, class: "form-control #{"is-invalid" if @user.errors[:password].any? }", required: true %>
+      <div class='invalid-feedback'>
+        <% if @user.errors[:password].any? %>
+          <%= @user.errors[:password].map{|m| "Password #{m}."}.join(" ") %>
+        <% else %>
+          Please provide a password.
+        <% end %>
+      </div>
+    </div>
+    <%= render partial: "additional_fields", locals: {form: f} %>
+    <%= f.submit "Sign Up", class: "btn btn-primary" %>
+  <% 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/lib/simply_auth/version.rb

@@ -1,3 +1,3 @@
 module SimplyAuth
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simply_auth
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryan Fogle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,6 +88,7 @@ files:
 - 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/registrations/old-new.html.erb
 - app/views/simply_auth/sessions/new.html.erb
 - config/routes.rb
 - lib/simply_auth.rb