devise_sms_verifiable 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9341cde59779b8f48240a8bbbb5fa732a0e607
-  data.tar.gz: 16aa797f5ea693d554ba6cee746d5f0e6f3629b7
+  metadata.gz: c51a8259b8b1fa460ebf008eaa844531ca4c92e4
+  data.tar.gz: d854dd3f18aa902e15ca032d16579c6c29c02ec2
 SHA512:
-  metadata.gz: d51869dee0ad6abe2b2a85b2d2b45c624fd5d09c94f0a3636c1581869d7654eb4459c332b88e2f7daa852d5aeb8144d5bf6e0a9b9991218f4e2cfc67ac243b84
-  data.tar.gz: ef7018d8502a2fd4c3cb0048b355ed436a6211a48ef75fd0d0440ffa0235988d96361ca129145dd9b001c0f8a9ef2d3ee39b17a7fbfbb8339b60840c6b9c9296
+  metadata.gz: 5f1b9bc706b2849084769f69bf30140a931ee95fd3a326912d619540241ee30b75785b2a02111ce9a501e074416305489d045794e082827d58a1bc869c498cb3
+  data.tar.gz: 8d1b8d98dcde47c913205ae0e9fdcab07a7df8888da30d6242ecce94186790358d3973271f9cad125eaef49f20d69266d02ba612a3dbbac6e979a9048e2ade05

data/app/controllers/devise/sms_verifiable_controller.rb

@@ -1,16 +1,18 @@
 class Devise::SmsVerifiableController < DeviseController
-  append_before_filter :sms_check_settings
+  append_before_filter :sms_check_settings!
 
   def new
+    set_flash_message :notice, :sms_activation_required
   end
 
   def create
     resource.sms_secret = public_send("current_#{resource_name}").public_send(Devise::sms_answer_field)
     secret = params[:user][:sms_secret]
-    if secret && resource.sms_secret && resource.valid_secret?(secret)
-      public_send("current_#{resource_name}").public_send(:update, Hash[Devise::phone_confirmation_field, true])
+    if secret && resource.sms_secret && resource.valid_token?(secret)
+      public_send("current_#{resource_name}").public_send(:update, Hash[Devise::phone_confirmation_field, true, :sms_token_confirmed_at, DateTime.now])
       redirect_to Devise::successful_path
     else
+      set_flash_message :notice, :sms_token_invalid
       render :new
     end
   end
@@ -18,13 +20,16 @@ class Devise::SmsVerifiableController < DeviseController
   def send_pass
     number = public_send("current_#{resource_name}").public_send(Devise::phone_field)
     provider = Devise::sms_provider
-    pass_word = public_send(Devise::sms_secret_method)
-    if [number, provider, pass_word].all?
-      provider.public_send(:send_sms, number, pass_word)
+    if [number, provider].all? && !public_send("current_#{resource_name}").sms_confirmed?
+      token = public_send("current_#{resource_name}").sms_confirm!
+      provider.public_send(:send_sms, number, token)
+      set_flash_message :notice, :send_token, phone: number
     end
     render :new
   end
 
+  protected
+
   def resource
     _resource = resource_class.new
     instance_variable_set(:@user, _resource)

data/app/views/devise/sms_verifiable/new.html.erb

@@ -1,8 +1,9 @@
+<%= flash[:notice] if flash[:notice] %>
 <h2>Sms verifiable</h2>
 <%= form_for(resource, :as => resource_name, :url => sms_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
     <p><%= f.label :sms_secret %><br />
-    <%= f.text_field :sms_secret %></p>
+    <%= f.text_field :sms_secret, value: nil %></p>
     <p><%= f.submit "send" %></p>
   <% end %>
 <%= button_to 'send sms', public_send("send_pass_#{resource_name}_sms_path"), data: { method: :post } %>

data/config/locales/en.yml

@@ -0,0 +1,10 @@
+en:
+  errors:
+     messages:
+       sms_token_invalid: "Invalid token"
+  devise:
+    sms_verifiable:
+      send_token: 'An activation token was sent by SMS to %{phone}.'
+      sms_token_invalid: 'The sms token provided is not valid!'
+      confirmed: 'Your account has been activated.'
+      sms_activation_required: 'SMS Activation is required'

data/config/locales/ru.yml

@@ -0,0 +1,10 @@
+ru:
+  errors:
+     messages:
+       sms_token_invalid: "Неверный код"
+  devise:
+    sms_verifiable:
+      send_token: 'Выслано SMS с кодом подтверждения на номер %{phone}.'
+      sms_token_invalid: 'Неверный код'
+      confirmed: 'Спасибо Ваш номер подтверждён'
+      sms_activation_required: 'Подтвердите аккаунт с помощью телефона'

data/lib/devise_sms_verifiable.rb

@@ -12,12 +12,6 @@ require 'devise_sms_verifiable/engine'
 require 'devise_sms_verifiable/errors'
 
 module Devise
-  mattr_accessor :sms_confirmation_method
-  @@sms_confirmation_method = :sms_confirmation?
-
-  mattr_accessor :sms_secret_method
-  @@sms_secret_method = :sms_secret
-
   mattr_accessor :sms_answer_field
   @@sms_answer_field = :sms_answer
 
@@ -30,6 +24,9 @@ module Devise
   mattr_accessor :successful_path
   @@successful_path = '/'
 
+  mattr_accessor :token_generator
+  @@token_generator = :default
+
   mattr_accessor :sms_provider
   @@sms_provider = DeviseSmsVerifiable::Provider
 

data/lib/devise_sms_verifiable/controllers/internal_helpers.rb

@@ -1,22 +1,32 @@
 module DeviseSmsVerifiable
   module Controllers
     module InternalHelpers
-      extend ActiveSupport::Concern
 
-      def sms_check_settings
-        raise UnauthorizedAccess unless signed_in?(Devise::default_scope)
-        raise PhoneFieldNotFound unless public_send("current_#{resource_name}").respond_to?(Devise::phone_field)
-        raise PhoneFieldEmpty unless public_send("current_#{resource_name}").public_send(Devise::phone_field)
-        raise SecretMethodNotFound unless InternalHelpers::valid_method?(self, Devise::sms_secret_method)
+      def sms_check_settings!
+        if public_send("current_#{Devise::default_scope}").nil?
+          public_send(:redirect_to, %I[new #{Devise::default_scope} session]) and return
+        end
+        raise PhoneFieldNotFound unless public_send("current_#{Devise::default_scope}").respond_to?(Devise::phone_field)
+        raise PhoneFieldEmpty unless public_send("current_#{Devise::default_scope}").public_send(Devise::phone_field)
         raise ValidSendSmsMethodNotFound unless InternalHelpers::valid_method?(Devise::sms_provider, :send_sms)
       rescue DeviseSmsVerifiableError, ArgumentError
         raise "DeviseSmsVerifiableError module error: #{$!.message} "
       end
 
+      def require_sms_verifiable!
+        sms_check_settings!
+        unless public_send(:"current_#{Devise::default_scope}").public_send("#{Devise::phone_confirmation_field}?")
+          redirect_to %I[new #{Devise::default_scope} sms] and return
+        end
+      end
+
+      protected
+
       def self.valid_method?(caller, method)
         method.kind_of?(Symbol) && caller.respond_to?(method)
       end
     end
   end
 end
+ActionController::Base.send :include, DeviseSmsVerifiable::Controllers::InternalHelpers
 

data/lib/devise_sms_verifiable/errors.rb

@@ -1,7 +1,5 @@
 class DeviseSmsVerifiableError < RuntimeError;end
-class UnauthorizedAccess < DeviseSmsVerifiableError;end
 class ConfirmationMethodNotFound < DeviseSmsVerifiableError;end
-class SecretMethodNotFound < DeviseSmsVerifiableError;end
 class PhoneFieldNotFound < DeviseSmsVerifiableError;end
 class PhoneFieldEmpty < DeviseSmsVerifiableError;end
 class ValidSendSmsMethodNotFound < DeviseSmsVerifiableError;end

data/lib/devise_sms_verifiable/model.rb

@@ -5,8 +5,39 @@ module Devise
       mattr_accessor :sms_secret
       @@sms_secret = nil
 
-      def valid_secret?(incoming_secret)
-        @@sms_secret == incoming_secret.to_s
+      def sms_confirmed?
+        public_send("#{Devise::phone_confirmation_field}?")
+      end
+
+      def sms_unconfirm!
+	unconfirm_hash = Hash[Devise::sms_answer_field, nil,
+		              Devise::phone_confirmation_field, false,
+			      Devise::sms_token_sent_at, nil,
+			      Devise::sms_token_confirmed_at, nil]
+        public_send(:update, unconfirm_hash)
+      end
+
+      def sms_confirm!
+        token = generate_token!
+        public_send(:update, Hash[Devise::sms_answer_field, token,
+				  :sms_token_sent_at, DateTime.now])
+        token
+      end
+
+      def valid_token?(incoming_token)
+        @@sms_secret == incoming_token.to_s
+      end
+
+      protected
+
+      def generate_token!
+	meth = Devise::token_generator
+	token = if meth.is_a? Symbol
+		  rand(2000..4000)
+		elsif meth.is_a? Proc
+		  meth.call
+		end
+	token
       end
     end
   end

data/lib/devise_sms_verifiable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSmsVerifiable
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/generators/devise_sms_verifiable/install_generator.rb

@@ -17,10 +17,6 @@ module DeviseSmsVerifiable
 # ==> Configuration for :sms_verifiable
   # Field in model for confirm phone(must be boolean)
   #config.phone_confirmation_field = :phone_confirm
-  # Method for check sms confirmation. Define in ApplicationController
-  #config.sms_confirmation_method = :sms_confirmation?
-  # Method generate secret and write to model. Define in ApplicationController
-  #config.sms_secret_method = :sms_secret
   # Attribut on model return rigth answer
   #config.sms_answer_field = :sms_answer
   # Field in model which phone number
@@ -29,6 +25,9 @@ module DeviseSmsVerifiable
   #config.phone_confirmation_field = :phone_confirm
   # Path after successful confirmation
   #config.successful_path = '/'
+  # Token generator method(default 4 digit)
+  # must return valid token
+  #config.token_generator = -> { rand(1000..2000) }
   # SMS provider module(have default for STREAM-TELECOM)
   #config.sms_provider = DeviseSmsVerifiable::Provider
   # Send sms silent for test

data/lib/generators/devise_sms_verifiable/migration_generator.rb

@@ -6,19 +6,20 @@ module DeviseSmsVerifiable
     def add_migrations
       table_name = Devise::default_scope.to_s.pluralize
       exist_migration = Dir.glob('db/migrate/*_devise_sms_verifiable_add_to_*')
-      exist_migration.any? ? p("Check db/migrate, look like have sms verifiable migration") : nil
-      if exist_migration.blank?
+      if exist_migration.any? && self.behavior == :invoke
+        p("Check db/migrate, look like have sms verifiable migration")
+      end
+      if exist_migration.blank? && self.behavior != :revoke
         migration_path = "db/migrate/#{Time.now.strftime("%Y%m%d%H%M%S")}_devise_sms_verifiable_add_to_#{table_name}.rb"
         migration_template = <<-RUBY
 class DeviseSmsVerifiableAddTo#{table_name.camelize} < ActiveRecord::Migration
   def self.up
     change_table :#{table_name} do |t|
-      # Field in the model which phone number
       t.string   :phone
-      # Field in the model which returns the correct answer
       t.string   :sms_answer
-      # Field in the model which returns phone confirm or no
       t.boolean  :phone_confirm, default: false
+      t.datetime  :sms_token_sent_at
+      t.datetime  :sms_token_confirmed_at
     end
   end
 
@@ -26,10 +27,14 @@ class DeviseSmsVerifiableAddTo#{table_name.camelize} < ActiveRecord::Migration
     remove_column :#{table_name}, :phone
     remove_column :#{table_name}, :sms_answer
     remove_column :#{table_name}, :phone_confirm
+    remove_column :#{table_name}, :sms_token_sent_at
+    remove_column :#{table_name}, :sms_token_confirmed_at
   end
 end
 RUBY
         create_file(migration_path, migration_template)
+      elsif self.behavior == :revoke
+        FileUtils.rm_rf *exist_migration if exist_migration.any?
       end
     end
   end

data/lib/generators/devise_sms_verifiable/templates/README

@@ -5,12 +5,6 @@ Some setup you must do manually if you haven't yet(in config/initializers/devise
   You need field in model for confirm phone(must be boolean).
   config.phone_confirmation_field = :phone_confirm
 
-  You need define method for check sms confirmation. (in ApplicationController)
-  config.sms_confirmation_method = :sms_confirmation?
-
-  Need a method that generates, writes the word model, returns the secret word. (in ApplicationController)
-  config.sms_secret_method = :sms_secret
-
   Field in the model which returns the correct answer
   config.sms_answer_field = :sms_answer
 

metadata

@@ -1,139 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: devise_sms_verifiable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Kiselenko Roman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -148,6 +106,8 @@ files:
 - Rakefile
 - app/controllers/devise/sms_verifiable_controller.rb
 - app/views/devise/sms_verifiable/new.html.erb
+- config/locales/en.yml
+- config/locales/ru.yml
 - lib/devise_sms_verifiable.rb
 - lib/devise_sms_verifiable/controllers/internal_helpers.rb
 - lib/devise_sms_verifiable/controllers/url_helpers.rb
@@ -163,7 +123,8 @@ files:
 - lib/generators/devise_sms_verifiable/templates/README
 - lib/generators/devise_sms_verifiable/views_generator.rb
 homepage: https://github.com/fishbullet/devise_sms_verifiable
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -171,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: DeviseSmsVerifiable it is simple fork devise_sms_activable for my project`s