avmtrf1-tools 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ccec06864f6a302202ebb37a37c7bad52f3c9ee3d336cbd775069eb699ef9f
-  data.tar.gz: 79845abb8223ddca954e98f2144de63756e07b1b1e3551071bed763eddc6c413
+  metadata.gz: 73ca9a438c2acc50c74bda3da77ac125188cde76748561f720fce83c98501594
+  data.tar.gz: abd8fb430e69bc6e79612950f519f390ac2ba1113642e6be8d615c16e25599e0
 SHA512:
-  metadata.gz: b83e3b6b85b4047ee4e37aa83e73dee02846c454a4b7ca7704e94d0fe614fd0c95a2e0ac47700f107abb8dc897d4c7100c37f7bc1d23068daedfc252b0e3ed94
-  data.tar.gz: 47dd7a59ec8f390e5ab61c4fbc5fcddc08da6b1889db15ef0bbcd90038f9b3816255c93e21d14d15aec7354ebb4da9c577e415729270db471e2c7f605a92775d
+  metadata.gz: 56891d5de729710444c7279ed072e826b5f2bb91fe575415d92bf40789187e8342e6db923c0faabd784ac175f6e2601ac8b14e503bcc27217ae0308b67126cb5
+  data.tar.gz: fa085736e91ce1b4064c4e2ca217810de040ccc44cac42476ed553ca729f757d0c633d56cfaaee2bef0f9c36b3f9909895879ff303e6313f0821beff9fabf088

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/msgraph/request_mixin'
+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, &block)
+            req = request_data_request(url_suffix, &block)
+            req.response.body_data_or_raise
+          rescue ::Avmtrf1::Tools::Msgraph::Error => e
+            raise e unless e.invalid_token?
+
+            api.clear_token_info
+            req.response.body_data_or_raise
+          end
+
+          private
+
+          # @return [EacRest::Request]
+          def request_data_request(url_suffix, &block)
+            req = api.request(url_suffix)
+            req = block.call(req) if block
+            req.singleton_class.prepend(::Avmtrf1::Tools::Msgraph::RequestMixin)
+            req
+          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/member_add.rb

@@ -0,0 +1,36 @@
+# 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 Team < ::Avmtrf1::Tools::Msgraph::Api::Entity
+          class MemberAdd
+            acts_as_instance_method
+
+            common_constructor :team, :user_id
+
+            # @return [Hash]
+            def result
+              team.members_request do |req|
+                req.verb(:post).header('Content-type', 'application/json')
+                  .body_data(body_hash.to_json)
+              end
+            end
+
+            # @return [Hash]
+            def body_hash
+              {
+                '@odata.type' => '#microsoft.graph.aadUserConversationMember',
+                'user@odata.bind' => "https://graph.microsoft.com/v1.0/users('#{user_id}')"
+              }
+            end
+          end
+        end
+      end
+    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|
@@ -21,11 +21,17 @@ module Avmtrf1
             end
 
             def members
-              api.request("/teams/#{id}/members").response.body_data.fetch('value')
-                .map do |member_data|
+              members_request.map do |member_data|
                 child_entity(::Avmtrf1::Tools::Msgraph::Api::Member, member_data)
               end
             end
+
+            # @return [EacRest::Request]
+            def members_request(&block)
+              request_data("/teams/#{id}/members", &block)
+            end
+
+            require_sub __FILE__, require_mode: :kernel
           end
         end
       end

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

@@ -17,6 +17,12 @@ 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)

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'eac_rest/error'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      class Error < ::EacRest::Error
+        INVALID_TOKEN_CODE = 'InvalidAuthenticationToken'
+
+        attr_reader :data
+
+        def initialize(data)
+          @data = data
+          super(data.pretty_inspect)
+        end
+
+        # @return [String]
+        def code
+          data.fetch('code')
+        end
+
+        # @return [Boolean]
+        def invalid_token?
+          code == INVALID_TOKEN_CODE
+        end
+      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,23 @@
+# frozen_string_literal: true
+
+require 'eac_rest/response'
+require 'avmtrf1/tools/msgraph/error'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Tools
+    module Msgraph
+      module ResponseMixin
+        ERROR_KEY = 'error'
+        VALUE_KEY = 'value'
+
+        def body_data_or_raise
+          r = super
+          r.is_a?(::Hash) && r.key?(VALUE_KEY) ? r.fetch(VALUE_KEY) : r
+        rescue ::EacRest::Response => e
+          raise ::Avmtrf1::Tools::Msgraph::Error, e.body_data.fetch(ERROR_KEY)
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,9 @@ module Avmtrf1
     class Runner
       class Msgraph
         class JoinedTeams
-          runner_with :help, :output do
+          LIST_COLUMNS = %w[id display_name].freeze
+
+          runner_with :help, :output_list do
             desc 'Lista as próprias equipes no MS Teams.'
           end
 
@@ -17,12 +19,16 @@ module Avmtrf1
             run_output
           end
 
-          private
+          def list_columns
+            LIST_COLUMNS
+          end
 
-          def output_content
-            teams.map { |t| "#{t.id}|#{t.display_name}\n" }.join
+          def list_rows
+            teams
           end
 
+          private
+
           def teams_uncached
             api.root_entity.joined_teams.sort_by { |t| [t.display_name, t.id] }
           end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+require 'avmtrf1/tools/msgraph/error'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Team
+          class Member
+            class Add
+              runner_with :help, :output_item
+
+              def run
+                start_banner
+                add_member
+                run_output
+                fatal_error error.code if error.present?
+              end
+
+              private
+
+              attr_accessor :error, :result_data
+
+              def add_member
+                self.error = nil
+                self.result_data = team.member_add(member_id)
+              rescue ::Avmtrf1::Tools::Msgraph::Error => e
+                self.error = e
+                self.result_data = error.data
+              end
+
+              def start_banner
+                infov 'Team', team.id
+                infov 'Member ID', member_id
+              end
+
+              def item_hash
+                result_data
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/tools/core_ext'
+
+module Avmtrf1
+  module Tools
+    class Runner
+      class Msgraph
+        class Team
+          class Member
+            runner_with :help, :subcommands do
+              pos_arg :member_id
+              subcommands
+            end
+            for_context :member_id
+
+            delegate :member_id, to: :parsed
+
+            require_sub __FILE__
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,25 +8,27 @@ module Avmtrf1
       class Msgraph
         class Team
           class Members
-            runner_with :help, :output
+            LIST_COLUMNS = %w[id email display_name].freeze
+
+            runner_with :help, :output_list
 
             def run
               infov 'Found', members.count
               run_output
             end
 
-            private
-
-            def members_uncached
-              team.members.sort_by { |m| [m.email, m.id] }
+            def list_columns
+              LIST_COLUMNS
             end
 
-            def format_member(member)
-              %w[email display_name].map { |k| member.send(k) }.join('|')
+            def list_rows
+              members
             end
 
-            def output_content
-              members.map { |member| "#{format_member(member)}\n" }.join
+            private
+
+            def members_uncached
+              team.members.sort_by { |m| [m.email || '_BLANK_', m.id] }
             end
           end
         end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.41.0'
+    VERSION = '0.42.0'
   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.42.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-10-05 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
@@ -64,20 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +95,7 @@ dependencies:
         version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 1.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +105,7 @@ dependencies:
         version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.3
+        version: 1.15.4
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -318,9 +312,14 @@ 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/api/team/member_add.rb
+- lib/avmtrf1/tools/msgraph/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
@@ -344,6 +343,8 @@ files:
 - 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/member.rb
+- lib/avmtrf1/tools/runner/msgraph/team/member/add.rb
 - lib/avmtrf1/tools/runner/msgraph/team/members.rb
 - lib/avmtrf1/tools/runner/msgraph/token.rb
 - lib/avmtrf1/tools/runner/node_js.rb