sticapi_client 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd3ce8254131e6409b38ebe8cd3d9a829021e93c
-  data.tar.gz: 7d40c5f79f0f18850068b275b5c3ad29cd7c753b
+SHA256:
+  metadata.gz: '084c3daf5fec27576f77895e5584dbee80c923fd3658b55d189c43c56eb52f45'
+  data.tar.gz: cfef2715e6012f123bef69796bd08aaeb9209e6212a3c14b542dfa51e29a760e
 SHA512:
-  metadata.gz: cd0ac5a2963d64ced2942d7af0475ecfa3d18e5f1ade62662f4d773a461aca72283927b8525a87e07484c7d147b023762f41cb3a3aef82139f42a4843776c759
-  data.tar.gz: 7b696163f61581489ae8ea1749eacabb671c662d4ebe86b153d458c4e68f567c2a930a6611cf46daa8ff0ad9f52d4e6514412b8953621040a03366879e1aec5c
+  metadata.gz: 72d3591bf062171141f150753baf8fed511e344ec1f7b3769802107911c8e632f9f1bcc86953348529fc4c0137d67c5d9c9396fdf8bf59941601da03b78c08f7
+  data.tar.gz: ce697b3373443a3824743db757921d364b34bff715a3fbfa167009d0a4c222a2ed0a369e530ca446a0c97fd2f81f95a4ddecde0b4687d4c7a944d81e3e1935df

data/lib/sticapi_client/intranet.rb

@@ -0,0 +1,7 @@
+module SticapiClient
+  class Intranet
+    def self.tipo_usuario(username)
+      Sticapi::SticapiClient.instance.sticapi_request('/intranet/tipo_usuario', username: username)
+    end
+  end
+end

data/lib/sticapi_client/sticapi_devise_strategy.rb

@@ -11,49 +11,75 @@ module Devise
 
       def authenticate!
         if params[:user]
-          secret = Sticapi::SticapiClient.instance.access_token
-          payload = {
-            user: params[:user][:username],
-            password: params[:user][:password]
-          }
-          token = JWT.encode payload, secret, 'HS256'
+          if params[:user].has_key?(:username) || params[:user].has_key?(:email)
+            field = params[:user][:username]
+            field ||= params[:user][:email]
+            if field.include? '@'
+              resource  = password.present? && mapping.to.find_for_database_authentication(authentication_hash)
+              hashed = false
 
-          uri = URI.parse("#{Sticapi::SticapiClient.instance.uri}/users/log_in")
-          http = Net::HTTP.new(uri.host, uri.port)
-          request = Net::HTTP::Post.new(uri.request_uri)
-          request['Content-Type'] = 'application/json'
-          request['access-token'] = Sticapi::SticapiClient.instance.access_token
-          request['client'] = Sticapi::SticapiClient.instance.client
-          request['uid'] = Sticapi::SticapiClient.instance.uid
-          request.body = { data: token }.to_json
-          response = http.request(request)
-          Sticapi::SticapiClient.instance.update_token(response)
+              if validate(resource){ hashed = true; resource.valid_password?(password) }
+                remember_me(resource)
+                resource.after_database_authentication
+                success!(resource)
+              end
 
-          case response
-            when Net::HTTPSuccess
-              data = JSON.parse(response.body)
-              if data['user']
-                unless user = User.find_by(username: data['user']['username'])
-                  user = User.new
-                  user.name = data['user']['name'] if user.respond_to? :name
-                  user.username = data['user']['username'] if user.respond_to? :username
-                  user.email = data['user']['email']
-                  user.cpf = data['user']['cpf'] if user.respond_to? :cpf
-                  user.password = params[:user][:password]
-                end
-                user.unities = data['user']['unities'] if user.respond_to? :unities
-                user.save
-                success!(user)
-                return
-              else
-                return fail(:invalid)
+              mapping.to.new.password = password if !hashed && Devise.paranoid
+              unless resource
+                Devise.paranoid ? fail(:invalid) : fail(:not_found_in_database)
               end
-            when Net::HTTPUnauthorized
-              return fail(:invalid)
-            when Net::HTTPServerError
-              return fail(:invalid)
             else
-              return fail(:invalid)
+              secret = Sticapi::SticapiClient.instance.access_token
+              payload = {
+                user: field,
+                password: params[:user][:password]
+              }
+              token = JWT.encode payload, secret, 'HS256'
+
+              uri = URI.parse("#{Sticapi::SticapiClient.instance.uri}/users/log_in")
+              http = Net::HTTP.new(uri.host, uri.port)
+              request = Net::HTTP::Post.new(uri.request_uri)
+              request['Content-Type'] = 'application/json'
+              request['access-token'] = Sticapi::SticapiClient.instance.access_token
+              request['client'] = Sticapi::SticapiClient.instance.client
+              request['uid'] = Sticapi::SticapiClient.instance.uid
+              request.body = { data: token }.to_json
+              response = http.request(request)
+              Sticapi::SticapiClient.instance.update_token(response)
+
+              case response
+                when Net::HTTPSuccess
+                  data = JSON.parse(response.body)
+                  if data['user']
+                    unless user = User.find_by(username: data['user']['username'])
+                      user = User.new
+                      user.name = data['user']['name'] if user.respond_to? :name
+                      user.username = data['user']['username'] if user.respond_to? :username
+                      user.email = data['user']['email']
+                      user.cpf = data['user']['cpf'] if user.respond_to? :cpf
+                      user.password = params[:user][:password]
+                      user.password_confirmation = params[:user][:password] if user.respond_to? :password_confirmation
+                    end
+                    user.unities = data['user']['unities'] if user.respond_to? :unities
+                    user.skip_confirmation!
+                    user.save
+                    puts user.errors.full_messages
+                    success!(user)
+                    puts user.errors.full_messages
+                    return
+                  else
+                    return fail(:invalid)
+                  end
+                when Net::HTTPUnauthorized
+                  return fail(:invalid)
+                when Net::HTTPServerError
+                  return fail(:invalid)
+                else
+                  return fail(:invalid)
+              end
+            end
+          else
+            return fail(:invalid)
           end
         end
         return fail(:invalid)

data/lib/sticapi_client/version.rb

@@ -1,3 +1,3 @@
 module SticapiClient
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/sticapi_client.rb

@@ -6,7 +6,6 @@ require 'rails'
 require 'sticapi_client/sticapi_devise_strategy'
 require 'sticapi_client/sticapi_controller'
 require 'sticapi_client/etjpi'
-require 'sticapi_client/sip'
 require 'net/http'
 
 module Sticapi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticapi_client
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,7 @@ files:
 - lib/generators/sticapi_client/templates/sticapi.yml
 - lib/sticapi_client.rb
 - lib/sticapi_client/etjpi.rb
-- lib/sticapi_client/sip.rb
+- lib/sticapi_client/intranet.rb
 - lib/sticapi_client/sticapi_controller.rb
 - lib/sticapi_client/sticapi_devise_strategy.rb
 - lib/sticapi_client/version.rb
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Client to use TJPI sticapi services

data/lib/sticapi_client/sip.rb

@@ -1,7 +0,0 @@
-module SticapiClient
-  class Sip
-    def self.unidades
-      Sticapi::SticapiClient.instance.sticapi_request('/sip/unidades')
-    end
-  end
-end