avmtrf1-tools 0.40.0 → 0.41.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409b614dd9df105476d7d7ce456efbaf3166b6c7eacf0d51bf507e84b0814423
-  data.tar.gz: ce1872a84c657132015e826bb8bbc59fc939b031f5cb7c9d90ea706877618eda
+  metadata.gz: 7c004c200bbd53b895d1ab4b9df5d5e2f01f7d0b3c77605fb6f1049e96c01d66
+  data.tar.gz: 100127b8522690406d21d3f352e97546ddbd9b066127955d227b9bd57f6fa07a
 SHA512:
-  metadata.gz: 786b256eb94d24cad76a280e6621c5b37b8042b38bf0a95d0c7df81592e917b3698abb774d27569087146a78c782bc62c0fae488235bdc888464db610699ced0
-  data.tar.gz: c53d815127b4e1da902e3ac1e239c55aa40b2c4817e6c4d911b50507c94c6052c3e05b2d9bc1778dfed303bb0052ab019be9e72af0ec7c060d671b439b62d156
+  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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/api/entity'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Api < ::EacRest::Api
+        class Member < ::Avmtrf1::Tools::Msgraph::Api::Entity
+          %w[displayName email roles tenantId userId visibleHistoryStartDateTime]
+            .each do |key|
+            define_method key.underscore do
+              data.fetch(key)
+            end
+          end
+
+          # @return [String]
+          def id_from_data
+            data.fetch('id')
+          end
+
+          # @return [String]
+          def type
+            data.fetch('@odata.type')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,24 +1,24 @@
 # 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
 
-          # @return [Avmtrf1::Tools::Msgraph::Api::Group]
-          def group(group_id)
-            child_entity(::Avmtrf1::Tools::Msgraph::Api::Group, group_id)
+          # @return [Avmtrf1::Tools::Msgraph::Api::Team]
+          def team(team_id)
+            child_entity(::Avmtrf1::Tools::Msgraph::Api::Team, team_id)
           end
         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|
@@ -19,6 +19,12 @@ module Avmtrf1
             def id_from_data
               data.fetch('id')
             end
+
+            def members
+              request_data("/teams/#{id}/members").map do |member_data|
+                child_entity(::Avmtrf1::Tools::Msgraph::Api::Member, member_data)
+              end
+            end
           end
         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/runner/msgraph/request.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Request
+          runner_with :help do
+            pos_arg :url_suffix
+          end
+
+          def run
+            request_banner
+            fetch_response
+          end
+
+          private
+
+          def request_banner
+            api_banner
+            infov 'URL', request.url
+          end
+
+          def fetch_response
+            infom 'Requesting...'
+            infov 'Response status', response.status
+            infov 'Response body class', response.body_data.class
+            infov 'Response body', '*'
+            out response.body_data.to_yaml + "\n"
+          end
+
+          def request_uncached
+            api.request_json(parsed.url_suffix)
+          end
+
+          def response_uncached
+            request.response
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/msgraph/team/members.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Team
+          class Members
+            runner_with :help, :output
+
+            def run
+              infov 'Found', members.count
+              run_output
+            end
+
+            private
+
+            def members_uncached
+              team.members.sort_by { |m| [m.email, m.id] }
+            end
+
+            def format_member(member)
+              %w[email display_name].map { |k| member.send(k) }.join('|')
+            end
+
+            def output_content
+              members.map { |member| "#{format_member(member)}\n" }.join
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Team
+          runner_with :help, :subcommands do
+            pos_arg :team_id
+            subcommands
+          end
+          for_context :team
+
+          private
+
+          def team_uncached
+            api.root_entity.team(parsed.team_id)
+          end
+
+          require_sub __FILE__
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,12 @@ module Avmtrf1
           arg_opt '-i', '--client-id', 'ID de aplicação cliente alternativo.'
           subcommands
         end
-        for_context :api
+        for_context :api, :api_banner
+
+        def api_banner
+          infov 'Client ID', api.client_id
+          infov 'Root URL', api.root_url
+        end
 
         def client_id
           client_id_by_argument || client_id_by_config

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.40.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.40.0
+  version: 0.41.1
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-30 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,21 +43,21 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.153'
+        version: '0.154'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.153'
+        version: '0.154'
 - !ruby/object:Gem::Dependency
   name: eac_rest
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ dependencies:
         version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.2
+        version: 1.15.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
         version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.2
+        version: 1.15.3
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -318,8 +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
@@ -341,6 +346,9 @@ files:
 - lib/avmtrf1/tools/runner/inventario_sistemas.rb
 - lib/avmtrf1/tools/runner/msgraph.rb
 - lib/avmtrf1/tools/runner/msgraph/joined_teams.rb
+- lib/avmtrf1/tools/runner/msgraph/request.rb
+- lib/avmtrf1/tools/runner/msgraph/team.rb
+- lib/avmtrf1/tools/runner/msgraph/team/members.rb
 - lib/avmtrf1/tools/runner/msgraph/token.rb
 - lib/avmtrf1/tools/runner/node_js.rb
 - lib/avmtrf1/tools/runner/node_js/docker.rb