avmtrf1-tools 0.41.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ccec06864f6a302202ebb37a37c7bad52f3c9ee3d336cbd775069eb699ef9f
-  data.tar.gz: 79845abb8223ddca954e98f2144de63756e07b1b1e3551071bed763eddc6c413
+  metadata.gz: 7c004c200bbd53b895d1ab4b9df5d5e2f01f7d0b3c77605fb6f1049e96c01d66
+  data.tar.gz: 100127b8522690406d21d3f352e97546ddbd9b066127955d227b9bd57f6fa07a
 SHA512:
-  metadata.gz: b83e3b6b85b4047ee4e37aa83e73dee02846c454a4b7ca7704e94d0fe614fd0c95a2e0ac47700f107abb8dc897d4c7100c37f7bc1d23068daedfc252b0e3ed94
-  data.tar.gz: 47dd7a59ec8f390e5ab61c4fbc5fcddc08da6b1889db15ef0bbcd90038f9b3816255c93e21d14d15aec7354ebb4da9c577e415729270db471e2c7f605a92775d
+  metadata.gz: b46dc0766ba4a2f5b3c6515608192f79ad8fc301b23b2b57a8a892b1307dc5bd35a95e2daf7435c4b575211d039456b28ee6eb2721e4995dd8386fc55f25c357
+  data.tar.gz: a3eb77e607af031c654dd26e5fef97dc7cfc195d140073dd3343b1087e6e073a6757b7a38084e6dc83cf741736df47cb27acdcdc16e1057a3a2ca6dfabfbaa4e

data/lib/avmtrf1/tools/msgraph/api/entity.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'eac_rest/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        class Entity < ::EacRest::Entity
+          def request_data(url_suffix)
+            req = api.request(url_suffix)
+            req.response.body_data_or_raise
+          rescue ::Avmtrf1::Tools::Msgraph::InvalidTokenError
+            api.clear_token_info
+            req.response.body_data_or_raise
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph/api/member.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_rest/entity'
+require 'avmtrf1/tools/msgraph/api/entity'
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
     module Msgraph
       class Api < ::EacRest::Api
-        class Member < ::EacRest::Entity
+        class Member < ::Avmtrf1::Tools::Msgraph::Api::Entity
           %w[displayName email roles tenantId userId visibleHistoryStartDateTime]
             .each do |key|
             define_method key.underscore do

data/lib/avmtrf1/tools/msgraph/api/root.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/tools/msgraph/api/entity'
 require 'avmtrf1/tools/msgraph/api/team'
-require 'eac_rest/entity'
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
     module Msgraph
       class Api < ::EacRest::Api
-        class Root < ::EacRest::Entity
+        class Root < ::Avmtrf1::Tools::Msgraph::Api::Entity
           # @return [Array<Avmtrf1::Tools::Msgraph::Api::Group>]
           def joined_teams
-            api.request('/me/joinedTeams').response.body_data.fetch('value').map do |team_data|
+            request_data('/me/joinedTeams').map do |team_data|
               child_entity(::Avmtrf1::Tools::Msgraph::Api::Team, team_data)
             end
           end

data/lib/avmtrf1/tools/msgraph/api/team.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'eac_rest/entity'
+require 'avmtrf1/tools/msgraph/api/entity'
 require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Tools
     module Msgraph
       class Api < ::EacRest::Api
-        class Team < ::EacRest::Entity
+        class Team < ::Avmtrf1::Tools::Msgraph::Api::Entity
           %w[classification createdDateTime description discoverySettings displayName funSettings
              guestSettings internalId isArchived isMembershipLimitedToOwners memberSettings
              messagingSettings specialization summary tenantId visibility webUrl].each do |key|
@@ -21,8 +21,7 @@ module Avmtrf1
             end
 
             def members
-              api.request("/teams/#{id}/members").response.body_data.fetch('value')
-                .map do |member_data|
+              request_data("/teams/#{id}/members").map do |member_data|
                 child_entity(::Avmtrf1::Tools::Msgraph::Api::Member, member_data)
               end
             end

data/lib/avmtrf1/tools/msgraph/api.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/tools/msgraph/request_mixin'
 require 'eac_rest/api'
 require 'eac_ruby_utils/core_ext'
 
@@ -17,10 +18,18 @@ module Avmtrf1
           token_info.fetch(:token).fetch(:accessToken)
         end
 
+        # @return [void]
+        def clear_token_info
+          token_info_cache.clear
+          reset_cache(:token_info)
+        end
+
         # @return [EacRest::Request]
         def request(service_url_suffix, headers = {}, &body_data_proc)
-          super(service_url_suffix, headers, &body_data_proc)
-            .header('Authorization', "Bearer #{access_token}")
+          r = super(service_url_suffix, headers, &body_data_proc)
+                .header('Authorization', "Bearer #{access_token}")
+          r.singleton_class.prepend(::Avmtrf1::Tools::Msgraph::RequestMixin)
+          r
         end
 
         def fs_object_id

data/lib/avmtrf1/tools/msgraph/invalid_token_error.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_rest/error'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class InvalidTokenError < ::EacRest::Error
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph/request_mixin.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/response_mixin'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      module RequestMixin
+        def response
+          r = super
+          r.singleton_class.prepend(::Avmtrf1::Tools::Msgraph::ResponseMixin)
+          r
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/msgraph/response_mixin.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/invalid_token_error'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      module ResponseMixin
+        ERROR_KEY = 'error'
+        INVALID_TOKEN_CODE = 'InvalidAuthenticationToken'
+        VALUE_KEY = 'value'
+
+        def body_data_or_raise
+          check_invalid_token
+          r = super
+          return r unless r.is_a?(::Hash)
+
+          body_hash_or_raise(r)
+        end
+
+        # @return [String, nil]
+        def error_code
+          return false unless body_data.is_a?(::Hash)
+          return false unless body_data.key?(ERROR_KEY)
+
+          body_data.fetch(ERROR_KEY).fetch('code')
+        end
+
+        protected
+
+        def body_hash_or_raise(result_data)
+          return result_data.fetch(VALUE_KEY) if result_data.key?(VALUE_KEY)
+          return raise_error_from_hash(result_data.fetch(ERROR_KEY)) if result_data.key?(ERROR_KEY)
+
+          nbr
+        end
+
+        def check_invalid_token
+          return unless error_code == INVALID_TOKEN_CODE
+
+          raise ::Avmtrf1::Tools::Msgraph::InvalidTokenError
+        end
+
+        def raise_error_from_hash(error_hash)
+          raise ::EacRest::Error, error_hash.pretty_inspect
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.41.0'
+    VERSION = '0.41.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium
@@ -33,7 +33,7 @@ dependencies:
         version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: avm-tools
   requirement: !ruby/object:Gem::Requirement
@@ -318,9 +318,13 @@ files:
 - lib/avmtrf1/tools/core_ext.rb
 - lib/avmtrf1/tools/msgraph.rb
 - lib/avmtrf1/tools/msgraph/api.rb
+- lib/avmtrf1/tools/msgraph/api/entity.rb
 - lib/avmtrf1/tools/msgraph/api/member.rb
 - lib/avmtrf1/tools/msgraph/api/root.rb
 - lib/avmtrf1/tools/msgraph/api/team.rb
+- lib/avmtrf1/tools/msgraph/invalid_token_error.rb
+- lib/avmtrf1/tools/msgraph/request_mixin.rb
+- lib/avmtrf1/tools/msgraph/response_mixin.rb
 - lib/avmtrf1/tools/msgraph/token_retrieve.rb
 - lib/avmtrf1/tools/runner.rb
 - lib/avmtrf1/tools/runner/check_point.rb