authz_jurnal_client 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d451a03c29d40d2db74d2e4ecb7a3af61869f0851603f588ab17fe7f7ff79c0f
-  data.tar.gz: 196c69edecba8d9151f1040b3d99d5501a29bacae2758e305aea4e0c78881e06
+  metadata.gz: cce433a0abf6a809cf51a500be0f95a23c581af6bc2b05ce56ff7514e4af6d9e
+  data.tar.gz: 3c67c5b9589d9c351df4e6d1c6ee6e4a9454957caa5fdcc50cae0b370760131f
 SHA512:
-  metadata.gz: 03dc07308fdd976ca844f90790ff12bd1259d26db55b048206d4aa85b75aefa9d3f63fc919afd9e491630fdb2bdc60db56b6230de6fa54540d6f4ef695a6401d
-  data.tar.gz: 034cdd2ba58fe841bf15e21b8a024e79f700e686d7824120e5622ac60b39283a50337a1fa6be8e3dcade4180c09d932275a8d6ec1a77102d66a7bdda498c588c
+  metadata.gz: 6edc9d4d7222acd96f9c46225edb44228b1c9e2dcc25666250d02a8e5c2ebbba6b7ab0989d05ab998f9e3611107d843e838ca750abf6c0f0a52602183c5b860b
+  data.tar.gz: 44e59bb6cd13a5c813d220e023be9f97a50062b3259d662c5b78ea5cd0a7e7265948c3cc7b96bc23b1370357cfff051aa01d3b0b29e28189057c6d565e370aee

data/Gemfile

@@ -15,5 +15,5 @@ gem "redis"
 
 gem "faraday"
 
-gem "byebug"
+gem 'simplecov', require: false
 

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    authz_jurnal_client (0.0.5)
+    authz_jurnal_client (0.0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    byebug (11.1.3)
     connection_pool (2.3.0)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
@@ -24,13 +24,13 @@ GEM
       redis-client (>= 0.9.0)
     redis-client (0.12.1)
       connection_pool
-    regexp_parser (2.6.2)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.1)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -39,7 +39,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.44.1)
+    rubocop (1.45.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
@@ -53,6 +53,12 @@ GEM
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     unicode-display_width (2.4.2)
 
 PLATFORMS
@@ -60,12 +66,12 @@ PLATFORMS
 
 DEPENDENCIES
   authz_jurnal_client!
-  byebug
   faraday
   rake (~> 13.0)
   redis
   rspec (~> 3.0)
   rubocop (~> 1.21)
+  simplecov
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -10,7 +10,7 @@ AuthzJurnalClient allows you to access the user roles API directly. It also prov
 Install the gem thusly in the gemfile
 
 ``` markdown
-gem 'authz_jurnal_client' or gem install authz_jurnal_client
+gem 'authz_jurnal_client',  git: 'git@bitbucket.org:jurnal/authz-jurnal-client.git', tag: 'v0.0.1'
 ```
 
 
@@ -20,7 +20,7 @@ TODO: Write usage instructions here
 
 ``` Ruby
 Default :
-AuthzJurnalClient::UserRoles.config(authorization: "Basic ApiToken")
+AuthzJurnalClient::UserRoles.config(authorization: "Basic ApiToken") or AuthzJurnalClient::UserRoles.config(username: nil, password: nil)
 roles = AuthzJurnalClient::UserRoles.call(uid, cid)
 puts roles
 

data/lib/authz_jurnal_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AuthzJurnalClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.8"
 end

data/lib/authz_jurnal_client.rb

@@ -2,7 +2,6 @@ require "ostruct"
 require "json"
 require "faraday"
 require "redis"
-require 'byebug'
 
 require_relative "authz_jurnal_client/version"
 
@@ -11,34 +10,51 @@ module AuthzJurnalClient
 
   class UserRoles
     class << self
-      attr_accessor :redis, :domain, :authorization, :expiry
+      attr_accessor :redis, :domain, :authorization, :username, :password, :expiry, :cache
       def config(opts = {})
-        @authorization = opts[:authorization]
-        @headers = {"Authorization" => @authorization}
+        @username = opts[:username]
+        @password = opts[:password]
+        @authorization = init_auth(opts)
+        @headers = { "Authorization": @authorization }
         @domain = opts[:domain] || 'http://localhost:3000'
         redis_path = opts[:redis] || 'redis://localhost:6379'
         @redis = Redis.new(url: redis_path)
         @expiry = opts[:expiry] || 3600
+        @cache = opts[:cache].nil? ? true : opts[:cache]
+      end
+
+      def init_auth(opts)
+        @authorization = opts[:authorization]
+
+        if @username && @password
+          @authorization = "Basic #{Base64.encode64("#{@username}:#{@password}")}"
+        end
+
+        @authorization
       end
 
       def call(id, cid)
-        if @redis
+        return get_errors({ errors: { messages: "uid or cid cannot be blank!" } }) if id.nil? || cid.nil?
+
+        if @redis && @cache
           cached = @redis.get(make_key(id, cid))
-          return get_roles(cached) if cached
+          return get_response(cached) if cached
         end
 
         response = backend_request(id, cid)
-        return unless response.success?
+        return get_errors(JSON.parse(response.body)) if !response.success?
 
         @redis&.setex(make_key(id, cid), @expiry, response.body)
-        get_roles(response.body)
+        get_response(response.body)
       rescue Redis::CannotConnectError
         response = backend_request(id, cid)
-        get_roles(response.body)
+        get_response(response.body)
       end
 
       def backend_request(id, cid)
         conn = Faraday.new("#{@domain}/api/v1/users/#{id}") do |f|
+          f.options.open_timeout = 10
+          f.options.timeout = 60
           f.adapter :net_http
         end
 
@@ -49,9 +65,15 @@ module AuthzJurnalClient
         "manage_roles:#{id}-#{cid}"
       end
 
-      def get_roles(j)
+      def get_response(j)
         data = eval(j)
-        JSON.parse( data.to_json, object_class: OpenStruct).data.roles
+        response = JSON.parse(data.to_json, object_class: OpenStruct)
+        response.data.roles
+      end
+
+      def get_errors(e)
+        data = e.is_a?(Hash) ? e : eval(e)
+        JSON.parse(data.to_json, object_class: OpenStruct)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authz_jurnal_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Alam Topani
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -17,21 +17,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".rspec"
-- ".rspec_status"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
-- authz_jurnal_client-0.0.1.gem
-- authz_jurnal_client-0.0.2.gem
-- authz_jurnal_client-0.0.3.gem
-- authz_jurnal_client-0.0.4.gem
 - lib/authz_jurnal_client.rb
 - lib/authz_jurnal_client/version.rb
 - lib/sig/authz_jurnal_client.rbs
-homepage: https://bitbucket.org/jurnal/authz-jurnal-client/src/nat-dev/
+homepage: https://bitbucket.org/jurnal/authz-jurnal-client/src/master/
 licenses: []
 metadata: {}
 post_install_message:

data/.byebug_history

@@ -1,11 +0,0 @@
-continue
-d.to_json
-d
-continue
-JSON.parse( j, object_class: OpenStruct).data.roles
-j
-continue
-JSON.parse( j, object_class: OpenStruct).data.roles
-j
-continue
-roles = AuthzJurnalClient::UserRoles.call(1, 1)

data/.rspec_status

@@ -1,9 +0,0 @@
-example_id                                | status | run_time        |
------------------------------------------ | ------ | --------------- |
-./spec/authz_jurnal_client_spec.rb[1:1:1] | passed | 0.0031 seconds  |
-./spec/authz_jurnal_client_spec.rb[1:2:1] | passed | 0.01582 seconds |
-./spec/authz_jurnal_client_spec.rb[1:2:2] | passed | 0.00067 seconds |
-./spec/authz_jurnal_client_spec.rb[1:3:1] | passed | 0.00443 seconds |
-./spec/authz_jurnal_client_spec.rb[1:3:2] | passed | 0.00199 seconds |
-./spec/authz_jurnal_client_spec.rb[1:4:1] | passed | 0.00143 seconds |
-./spec/authz_jurnal_client_spec.rb[1:4:2] | passed | 0.00153 seconds |