sticapi_client 3.5.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dd3eb13aa3830b54c36344e1cf486f8c1f6b81e2b9e1e5217fead5d3c198b6
-  data.tar.gz: 314bfbbffd6a42dbc84b8c646e874bb78a31198dbac1e3df70813cb02ff2d6a9
+  metadata.gz: c39976d2a163a0362a78fa8edd6c9e04d6bf5d7ea2d9a70406f0c29469ea4150
+  data.tar.gz: eb1eaad17f4e1a7c380e38d316c7c30dce8c7eb299987c463fc91c3c1942587c
 SHA512:
-  metadata.gz: dfcd9cabefff5ef0db7e0efe58de8109a4da014b201e781254fbefdd2e55c8e31fb1a8558ef8e3370324871cc6508eabae8547203825ed3391fbd073b0e7f54e
-  data.tar.gz: edc8c7b92948e5bf20b04672255db0292ce5a3c520feb32ca6ce0b0529fb8c02c5a5a36c402996598a93d94fc0998992ca7dc28e11ea3491a2924a58dd337265
+  metadata.gz: a8b344661c0c85a642940958a6376a9dc2a882c6e7d7444c9d9b67c9d7653c568ca17cca82ee512a84c46dbda86a49d13491978d7ba9e0a26216ad94acbab7d7
+  data.tar.gz: 716f21b6ff4ed3985d80c8a9acb7b29f452bd382debe3f1d2db81f0a7b14df84aa004754ace7b286aa963b6c8f3243ee9932484182089eecddbefa28543d7956

data/lib/sticapi_client/intranet.rb

@@ -174,6 +174,19 @@ module SticapiClient
       end
     end
 
+    # Registro de Frequência da pessoa por período no Intranet
+    # Parâmetro username [String] Nome de usuário da pessoa
+    # Parâmetro inicio [Date] Início do período requerido (padrao = início do mês atual)
+    # Parâmetro fim [Date] Fim do período requerido (padrao = fim do mês atual)
+    # Retorno [JSON] Frequência das pessoas no intranet
+    def self.frequencia(options = {})
+      if options[:username].present?
+        Sticapi::SticapiClient.instance.sticapi_request("/intranet/frequencia", options)
+      else
+        []
+      end
+    end
+
     # Direitos de pessoas do Intranet por competencia
     # Parâmetro ano [Integer] ano da competencia
     # Parâmetro inicio [Date] Início do período requerido

data/lib/sticapi_client/sticapi_devise_strategy.rb

@@ -49,13 +49,14 @@ module Devise
                 user.password_confirmation = params[:user][:password] if user.respond_to? :password_confirmation
                 user.unities = data['user']['unities'] if user.respond_to? :unities
                 user.skip_confirmation! if user.respond_to? 'skip_confirmation!'
-                user.save
-                success!(user)
-                return
-              else
-                Sticapi::SticapiClient.instance.expiry_now
-                return fail(:invalid)
+                if user.save
+                  remember_me(user)
+                  success!(user)
+                  return
+                end
               end
+              Sticapi::SticapiClient.instance.expiry_now
+              return fail(:invalid)
             end
           else
             Sticapi::SticapiClient.instance.expiry_now

data/lib/sticapi_client/version.rb

@@ -1,3 +1,3 @@
 module SticapiClient
-  VERSION = "3.5.5"
+  VERSION = "4.0.0"
 end

data/lib/sticapi_client.rb

@@ -3,7 +3,6 @@ require "singleton"
 require "devise"
 require "rails"
 require "sticapi_client/sticapi_devise_strategy"
-require "sticapi_client/sticapi_controller"
 require "sticapi_client/diario"
 require "sticapi_client/etjpi"
 require "sticapi_client/intranet"
@@ -19,38 +18,22 @@ require "sticapi_client/user"
 require "sticapi_client/group"
 require "sticapi_client/ou"
 require "net/http"
+require "erb"
+require "yaml"
+require "fileutils"
 
 module Sticapi
   class SticapiClient
     include Singleton
 
-    attr_accessor :host
-    attr_accessor :urn
-    attr_accessor :port
-    attr_accessor :ssl
-    attr_accessor :user
-    attr_accessor :password
-    attr_accessor :access_token
-    attr_accessor :client
-    attr_accessor :uid
-    attr_accessor :expiry
+    attr_accessor :host, :urn, :port, :ssl, :user, :password
+    attr_accessor :access_token, :client, :uid, :expiry
+
+    TOKEN_CACHE_PATH = "tmp/sticapi_token.yml"
 
     def initialize
-      configs = YAML.safe_load(
-        ERB.new(File.read("#{Rails.root}/config/sticapi.yml")).result,
-        aliases: true
-      )[Rails.env]
-      @host = configs["host"]
-      @port = configs["port"] || 80
-      @user = configs["user"]
-      @urn = configs["urn"]
-      @ssl = configs["ssl"] || false
-      @password = configs["password"]
-      @access_token = ""
-      @client = ""
-      @uid = ""
-      @expiry = ""
-      get_token
+      load_config
+      load_token
     end
 
     def uri
@@ -58,63 +41,145 @@ module Sticapi
     end
 
     def get_token
-      if @access_token.blank? || (DateTime.now > Time.at(@expiry.to_i))
-        uri = URI.parse("#{self.uri}/auth/sign_in")
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = @ssl
-        request = Net::HTTP::Post.new(uri.request_uri)
-        request["Content-Type"] = "application/json"
-        request["email"] = @user
-        request["password"] = @password
-        response = http.request(request)
-        update_token(response)
+      return unless @access_token.blank? || (DateTime.now > Time.at(@expiry.to_i))
+
+      if @access_token.present?
+        sign_out
       end
+
+      uri = URI.parse("#{self.uri}/auth/sign_in")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = @ssl
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request["Content-Type"] = "application/json"
+      request.body = { email: @user, password: @password }.to_json
+      response = http.request(request)
+      @access_token = response["access-token"] if response["access-token"]
+      @client = response["client"] if response["client"]
+      @uid = response["uid"] if response["uid"]
+      @expiry = response["expiry"] if response["expiry"]
+      save_token
     end
 
     def expiry_now
       @expiry = 0
     end
 
-    def update_token(response)
+    def sticapi_request(route, options = {})
+      get_token
+      response = http_request(route, options)
+
+      if response.code.to_i == 401
+        expiry_now
+        get_token
+        response = http_request(route, options)
+      end
+
       @access_token = response["access-token"] if response["access-token"]
       @client = response["client"] if response["client"]
       @uid = response["uid"] if response["uid"]
       @expiry = response["expiry"] if response["expiry"]
+      JSON.parse(response.body)
     end
 
-    def sticapi_request(route, options = {})
-      get_token
+    def sign_out
+      if @access_token.present?
+        uri = URI.parse("#{self.uri}/auth/sign_out")
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = @ssl
+        request = Net::HTTP::Delete.new(uri.request_uri)
+        request["Content-Type"] = "application/json"
+        request["access-token"] = @access_token
+        request["client"] = @client
+        request["uid"] = @uid
+        request["expiry"] = @expiry
+        http.request(request)
+      end
+      @access_token = ""
+      @client = ""
+      @uid = ""
+      @expiry = ""
+      File.delete(token_cache_path) if File.exist?(token_cache_path)
+    end
+
+    private
+
+    def load_config
+      if ENV["STICAPI_HOST"].present?
+        @host = ENV["STICAPI_HOST"]
+        @port = ENV.fetch("STICAPI_PORT", 80).to_i
+        @user = ENV["STICAPI_USER"]
+        @password = ENV["STICAPI_PASSWORD"]
+        @urn = ENV["STICAPI_URN"]
+        @ssl = ENV.fetch("STICAPI_SSL", "false") == "true"
+      else
+        configs = YAML.safe_load(
+          ERB.new(File.read("#{Rails.root}/config/sticapi.yml")).result,
+          aliases: true
+        )[Rails.env]
+        @host = configs["host"]
+        @port = configs["port"] || 80
+        @user = configs["user"]
+        @urn = configs["urn"]
+        @ssl = configs["ssl"] || false
+        @password = configs["password"]
+      end
+    end
+
+    def http_request(route, options = {})
       kind = options[:kind] || "post"
       uri = URI.parse("#{self.uri}#{route}")
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = @ssl
-      request = nil
-      request = Net::HTTP::Post.new(uri.request_uri) if kind == "post"
-      request = Net::HTTP::Get.new(uri.request_uri) if kind == "get"
+
+      request = if kind == "get"
+          params = options.except(:kind)
+          uri.query = URI.encode_www_form(params) if params.any?
+          Net::HTTP::Get.new(uri.request_uri)
+        else
+          req = Net::HTTP::Post.new(uri.request_uri)
+          req.body = options.except(:kind).to_json
+          req
+        end
+
       request["Content-Type"] = "application/json"
       request["access-token"] = @access_token
       request["client"] = @client
       request["uid"] = @uid
       request["expiry"] = @expiry
-      request.body = options.except(:kind).to_json
-      response = http.request(request)
-      update_token(response)
-      sign_out
-      JSON.parse(response.body)
+
+      http.request(request)
     end
 
-    def sign_out
-      uri = URI.parse("#{self.uri}/auth/sign_out")
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @ssl
-      request = Net::HTTP::Delete.new(uri.request_uri)
-      request["Content-Type"] = "application/json"
-      request["access-token"] = @access_token
-      request["client"] = @client
-      request["uid"] = @uid
-      request["expiry"] = @expiry
+    def token_cache_path
+      "#{Rails.root}/#{TOKEN_CACHE_PATH}"
+    end
+
+    def load_token
+      if File.exist?(token_cache_path)
+        cached = YAML.safe_load(File.read(token_cache_path), permitted_classes: [Symbol])
+        if cached
+          @access_token = cached[:access_token] || ""
+          @client = cached[:client] || ""
+          @uid = cached[:uid] || ""
+          @expiry = cached[:expiry] || ""
+          return
+        end
+      end
       @access_token = ""
-      response = http.request(request)
+      @client = ""
+      @uid = ""
+      @expiry = ""
+    end
+
+    def save_token
+      FileUtils.mkdir_p(File.dirname(token_cache_path))
+      File.write(token_cache_path, {
+        access_token: @access_token,
+        client: @client,
+        uid: @uid,
+        expiry: @expiry
+      }.to_yaml)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sticapi_client
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Ricardo Viana
@@ -27,70 +27,70 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 description: A gem who encapsulate api calls of TJPI sticapi
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Client to use TJPI sticapi services
 test_files: []