safeguard-devise 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQzZmMyNjY0NTRmZmY1Y2U1MjhjZmVmOTNmMWQ4NDdiMjgyZDQwMw==
+    NTcyZjJkM2M3MGU2NDMwOTA2MGU0ZWNiN2JmYTk4ZjFmMDk5MTRjNg==
   data.tar.gz: !binary |-
-    ZGUxOWViNTgzMzMxODkyYWFjYTlmYzA3YTZlMjdkYmFkZThhNjYwMA==
+    OTEzZDY2MzEzNjU3NTFmZGYyZmQ3ODhmMDcwNzI2YWUzZTg2MTBmMw==
 SHA512:
   metadata.gz: !binary |-
-    NTc0N2IwNmQ3MGM3MWQ3NDEwNjdkZGFiYjJiNWMyZWQ2MmQxYTkwNTkxZTM1
-    MThiNDJmMzU5ZWJkNmRjM2VlMmExODFkMGJjNGFkOGNlOGE4YmVkNGNjZWQz
-    YTAxMTE5OWEwZjZiODhiN2IxN2VjNmY0YTk5YTIyMzBkYzNhNjA=
+    MjgyOTJlOTljYWFhOWUxZmRmMDEyYjQyZjgxNjBlMTVmNTA1YTNkODljMmU5
+    NWEwZjJjZWFmNTk1YWFiYzg5MzlmOTBjODNhYmRkMTEwODU5MTIzNGExZTY2
+    NTZkODI5N2UwNWYzN2I4ODk3MjkxNzc1ODMyMWVlZjBmZTI2OTY=
   data.tar.gz: !binary |-
-    OTYwMjNiM2I5NDUwN2RkMTEwZmIxNmFiYzAyM2UzNGJlYzUwODY1MmQ0Y2Zm
-    OTRiZGY0MTJiMWE4MjhjNDYxZmY5NjdiNTExM2I5YmE5OTkzMzhiMTI3N2Zm
-    ODlmNWQwNzMzZjc5MmZjNGNkZWMzYzFiYmE5YjliNDk2YmQzMmU=
+    ZGRkMTI5YTY2MmY5NDMyN2ViMmRiYmFiNGFhMzM5MTFmZDM2OWJhZDMzZjI2
+    ZjZhNTUwMTcxM2NkN2ZmYmNiOGEyYTRhMzcxZTYzMDBmMzcyY2Q1OTU1NmJl
+    OWZjYmZiYzc2NTc3NDlmOGRhMWIxY2VhOGQ2ZDAwZTA4MDcyOWM=

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "devise"
-gem 'safeguard-api'
+gem 'safeguard-api', '0.2.1'
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -130,7 +130,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    safeguard-api (0.2.0)
+    safeguard-api (0.2.1)
       httpclient (>= 2.3.4)
     sass (3.2.14)
     sass-rails (4.0.1)
@@ -179,7 +179,7 @@ DEPENDENCIES
   rdoc
   rspec
   rspec-rails
-  safeguard-api
+  safeguard-api (= 0.2.1)
   sass-rails
   simplecov
   sqlite3

data/README.md

@@ -3,15 +3,21 @@
 ## Instalação
 
 Adicione as seguintes linhas nos arquivos de configurações
-`Safeguard.api_url=[API_URL]
-`Safeguard.api_key=[API_KEY]
+
+>Safeguard.api_url=[API_URL]
+
+>Safeguard.api_key=[API_KEY]
 
 Adiciona a gem do safeguard no Gemfile
-`gem 'devise-safeguard'
+
+>gem 'devise-safeguard'
 
 Execute o comando abaixo para criar/editar os arquivos necessários para o funcionamento da Gem
-` rails g devise_safeguard:install
-` rails g devise_safeguard [MODEL]
-` rake db:migrate
+
+>rails g devise_safeguard:install
+
+>rails g devise_safeguard [MODEL]
+
+>rake db:migrate
 
 

data/app/assets/stylesheets/devise_safeguard.css

@@ -1,17 +1,28 @@
 #safeguard-form-token{
-  width: 320px;
+  width: 312px;
+  font-size: 15px;
   position: relative;
   left: 50%;
-  margin-left: -160px;
+  margin-left: -166px;
   margin-top: 100px;
   font-family: 'OpenSansRegular', sans-serif;
 }
 
+#safeguard-form-token .devise-logo-safeguard{
+    background: url("devise_logo_safeguard.png") no-repeat;
+    position: relative;
+    float: left;
+    height: 65px;
+    width: 100%;
+    text-align: center;
+    left: 37px;
+}
+
 #safeguard-form-token form{
   background: none repeat scroll 0 0 #FBFBFB;
   border: 1px solid #E5E5E5;
   font-weight: normal;
-  height: 90px;
+  height: 160px;
   margin-left: 8px;
   padding: 26px 24px 46px;
 }
@@ -61,3 +72,11 @@
   background-clip: padding-box;
   background: #fff;
 }
+
+#safeguard-form-token .token-type{
+  font-size: 14px;
+  position: relative;
+  float: left;
+  padding-right: 20px;
+  padding-bottom: 20px;
+}

data/app/assets/stylesheets/devise_safeguard.sass

@@ -1,15 +1,24 @@
 #safeguard-form-token
-  width: 320px
+  width: 312px
+  font-size: 15px
   position: relative
   left: 50%
-  margin-left: -160px
+  margin-left: -166px
   margin-top: 100px
   font-family: 'OpenSansRegular', sans-serif
+  .devise-logo-safeguard
+    background: url("devise_logo_safeguard.png") no-repeat
+    position: relative
+    float: left
+    height: 65px
+    width: 100%
+    text-align: center
+    left: 37px
   form
     background: none repeat scroll 0 0 #FBFBFB
     border: 1px solid #E5E5E5
     font-weight: normal
-    height: 90px
+    height: 160px
     margin-left: 8px
     padding: 26px 24px 46px
   #safeguard-token
@@ -54,3 +63,9 @@
     -webkit-background-clip: padding-box
     background-clip: padding-box
     background: #fff
+  .token-type
+    font-size: 14px
+    position: relative
+    float: left
+    padding-right: 20px
+    padding-bottom: 20px

data/app/controllers/devise/devise_safeguard_controller.rb

@@ -28,7 +28,8 @@ class Devise::DeviseSafeguardController < DeviseController
   def token_ok?
     resp = Safeguard::API.is_valid?({
       :email => @resource.email,
-      :token => params[:safeguard_token]
+      :token => params[:safeguard_token],
+      :token_type => params[:token][:type]
     })
     resp
   end

data/app/views/devise/verify_safeguard.html.erb

@@ -1,9 +1,22 @@
 <%= stylesheet_link_tag "devise_safeguard", :media => "all" %>
 <div id="safeguard-form-token">
   <%= form_tag([resource_name, :verify_safeguard], :id => 'devise_safeguard', :class => 'safeguard-form', :method => :post) do %>
+    <div class="devise-logo-safeguard"></div>
     <%= hidden_field_tag(:"#{resource_name}_id", @resource.email) %>
-    <%= label_tag :safeguard_token %>
+    <label>
+      <%= I18n.t('devise.safeguard_form_title') %>
+    </label>
     <%= text_field_tag :safeguard_token, "", :autocomplete => :off, :id => 'safeguard-token' %>
+    <div class="token-types">
+      <div class="normal-token token-type">
+        <%= radio_button 'token', 'type', 'normal', checked: 'checked' %>
+        <%= I18n.t('devise.safeguard_token_normal') %>
+      </div>
+      <div class="smartphone-token token-type">
+        <%= radio_button 'token', 'type', 'smartphone' %>
+        <%= I18n.t('devise.safeguard_token_smartphone') %>
+      </div>
+    </div>
     <%= submit_tag I18n.t('safeguard_token_button', {:scope => 'devise'}), :class => 'button' %>
   <% end %>
 </div>

data/app/views/devise/verify_safeguard.html.haml

@@ -1,7 +1,18 @@
 = stylesheet_link_tag "devise_safeguard", :media => "all"
 #safeguard-form-token
   = form_tag([resource_name, :verify_safeguard], :id => 'devise_safeguard', :class => 'safeguard-form', :method => :post) do
+    .devise-logo-safeguard
     = hidden_field_tag(:"#{resource_name}_id", @resource.email)
-    = label_tag :safeguard_token
+    %label
+      = I18n.t('devise.safeguard_form_title')
     = text_field_tag :safeguard_token, "", :autocomplete => :off, :id => 'safeguard-token'
+    .token-types
+
+      .normal-token.token-type
+        = radio_button 'token', 'type', 'normal', checked: 'checked'
+        = I18n.t('devise.safeguard_token_normal')
+      .smartphone-token.token-type
+        = radio_button 'token', 'type', 'smartphone'
+        = I18n.t('devise.safeguard_token_smartphone')
     = submit_tag I18n.t('safeguard_token_button', {:scope => 'devise'}), :class => 'button'
+

data/config/locales/en.yml

@@ -3,3 +3,5 @@ en:
     safeguard_form_title: Hardware Token password
     safeguard_token_button: Send password 
     safeguard_token: Token
+    safeguard_token_normal: Default
+    safeguard_token_smartphone: Smartphone

data/config/locales/pt-BR.yml

@@ -1,5 +1,7 @@
 pt-BR:
   devise:
-    safeguard_form_title: Por favor informe a senha do seu token.
+    safeguard_form_title: Informe a senha do seu token
     safeguard_token_button: Enviar senha 
     safeguard_token: Token
+    safeguard_token_normal: Padrão
+    safeguard_token_smartphone: Smartphone

data/lib/generators/devise_safeguard/install_generator.rb

@@ -35,6 +35,7 @@ module DeviseSafeguard
         else
           copy_file '../../../app/assets/stylesheets/devise_safeguard.css', 'app/assets/stylesheets/devise_safeguard.css'
         end
+          copy_file '../../../app/assets/images/logo_safeguard.png', 'app/assets/images/devise_logo_safeguard.png'
       end
 
       def inject_assets_in_layout

data/safeguard-devise.gemspec

@@ -6,7 +6,7 @@
 
 Gem::Specification.new do |s|
   s.name = "safeguard-devise"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -131,7 +131,6 @@ Gem::Specification.new do |s|
     "puppet/modules/redis/templates/redis.rhel.conf.erb",
     "puppet/modules/redis/tests/init.pp",
     "puppet/upgrade-puppet.sh",
-    "safeguard-devise-0.0.2.gem",
     "safeguard-devise.gemspec",
     "spec/controllers/safeguard_devise_controller_spec.rb",
     "spec/devise/safeguard_authenticatable_spec.rb",

data/spec/safeguard-devise-test-app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    safeguard-devise (0.0.2)
+    safeguard-devise (0.0.4)
       devise
       safeguard-api
 
@@ -82,7 +82,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    safeguard-api (0.2.0)
+    safeguard-api (0.2.1)
       httpclient (>= 2.3.4)
     sprockets (2.11.0)
       hike (~> 1.2)

data/spec/safeguard-devise-test-app/app/assets/stylesheets/devise_safeguard.css

@@ -1,17 +1,28 @@
 #safeguard-form-token{
-  width: 320px;
+  width: 312px;
+  font-size: 15px;
   position: relative;
   left: 50%;
-  margin-left: -160px;
+  margin-left: -166px;
   margin-top: 100px;
   font-family: 'OpenSansRegular', sans-serif;
 }
 
+#safeguard-form-token .devise-logo-safeguard{
+    background: url("devise_logo_safeguard.png") no-repeat;
+    position: relative;
+    float: left;
+    height: 65px;
+    width: 100%;
+    text-align: center;
+    left: 37px;
+}
+
 #safeguard-form-token form{
   background: none repeat scroll 0 0 #FBFBFB;
   border: 1px solid #E5E5E5;
   font-weight: normal;
-  height: 90px;
+  height: 160px;
   margin-left: 8px;
   padding: 26px 24px 46px;
 }
@@ -61,3 +72,11 @@
   background-clip: padding-box;
   background: #fff;
 }
+
+#safeguard-form-token .token-type{
+  font-size: 14px;
+  position: relative;
+  float: left;
+  padding-right: 20px;
+  padding-bottom: 20px;
+}

data/spec/safeguard-devise-test-app/app/views/devise/devise_safeguard/verify_safeguard.html.erb

@@ -1,9 +1,22 @@
 <%= stylesheet_link_tag "devise_safeguard", :media => "all" %>
 <div id="safeguard-form-token">
   <%= form_tag([resource_name, :verify_safeguard], :id => 'devise_safeguard', :class => 'safeguard-form', :method => :post) do %>
+    <div class="devise-logo-safeguard"></div>
     <%= hidden_field_tag(:"#{resource_name}_id", @resource.email) %>
-    <%= label_tag :safeguard_token %>
+    <label>
+      <%= I18n.t('devise.safeguard_form_title') %>
+    </label>
     <%= text_field_tag :safeguard_token, "", :autocomplete => :off, :id => 'safeguard-token' %>
+    <div class="token-types">
+      <div class="normal-token token-type">
+        <%= radio_button 'token', 'type', 'normal', checked: 'checked' %>
+        <%= I18n.t('devise.safeguard_token_normal') %>
+      </div>
+      <div class="smartphone-token token-type">
+        <%= radio_button 'token', 'type', 'smartphone' %>
+        <%= I18n.t('devise.safeguard_token_smartphone') %>
+      </div>
+    </div>
     <%= submit_tag I18n.t('safeguard_token_button', {:scope => 'devise'}), :class => 'button' %>
   <% end %>
 </div>

data/spec/safeguard-devise-test-app/config/initializers/devise.rb

@@ -256,4 +256,9 @@ Devise.setup do |config|
   # How long should the user's device be remembered for.
   # config.safeguard_remember_device = 1.month
 
+
+  # ==> Devise Safeguard Authentication Extension
+  # How long should the user's device be remembered for.
+  # config.safeguard_remember_device = 1.month
+
 end

data/spec/safeguard-devise-test-app/config/locales/devise.safeguard.en.yml

@@ -3,3 +3,5 @@ en:
     safeguard_form_title: Hardware Token password
     safeguard_token_button: Send password 
     safeguard_token: Token
+    safeguard_token_normal: Default
+    safeguard_token_smartphone: Smartphone

data/spec/safeguard-devise-test-app/config/locales/devise.safeguard.pt-BR.yml

@@ -1,5 +1,7 @@
 pt-BR:
   devise:
-    safeguard_form_title: Por favor informe a senha do seu token.
+    safeguard_form_title: Por favor informe a senha do seu token
     safeguard_token_button: Enviar senha 
     safeguard_token: Token
+    safeguard_token_normal: Padrão
+    safeguard_token_smartphone: Smartphone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: safeguard-devise
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - diegonakamashi
@@ -284,7 +284,6 @@ files:
 - puppet/modules/redis/templates/redis.rhel.conf.erb
 - puppet/modules/redis/tests/init.pp
 - puppet/upgrade-puppet.sh
-- safeguard-devise-0.0.2.gem
 - safeguard-devise.gemspec
 - spec/controllers/safeguard_devise_controller_spec.rb
 - spec/devise/safeguard_authenticatable_spec.rb