redhat_access 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5bab54004d88ce1ec7130d84eadd5afd5956b88
-  data.tar.gz: ecc0e95ad8765e7c36a87240c32892216eec30e6
+  metadata.gz: 47d065b4e0e037360599bb40ce34305ced86765b
+  data.tar.gz: 4723e3f4898c2dd722591f66d6f5d52312fd9e6d
 SHA512:
-  metadata.gz: dbb4c89af2a1b45faabf49edde514595c71f013fe0b6048d1ef72495f06defe1c1f056bfbb1b9523c6ee3801b9956f66c5d412cb105a4595cb9d26a77ee3ad26
-  data.tar.gz: 73cd36b923ef356914f0eface777a3d071839df9c08cb36cc6dc519421c1fc179d31a14ce7151579e727e2d2f91866491b743bb9e13281af68b66b5de5e4049a
+  metadata.gz: 1af2a3ab5854b3ca38fb76c1f5a543d2d9060684c63d289ba9ba0983bfc9f9011fce82fddc7cffb0c6884255df9d0aa81c12cdb12749c49310da715b4f8e4cea
+  data.tar.gz: fc5133fb5d6a4ae75ebdfc4dabfd9571a62f777071c795d49b3590a9a7a70d45db1febe99fc6af75f48eb65948793607748a21953ec016c08b2bf45899d77e1a

data/app/assets/javascripts/insights/app.module.js

@@ -1,64 +1,64 @@
-(function() {
-  'use strict';
-  angular.module('RedhatAccessInsights', [
-      'ui.router',
-      'ui.bootstrap',
-      'insights',
-      'templates'
-    ])
-    .config(['$httpProvider', '$stateProvider', '$urlRouterProvider', '$locationProvider', '$provide', 'InsightsConfigProvider', '$injector',
-      function($httpProvider, $stateProvider, $urlRouterProvider, $locationProvider, $provide, InsightsConfigProvider, $injector) {
-        $httpProvider.defaults.headers.common = {
-          'X-CSRF-TOKEN': $('meta[name=csrf-token]').attr('content')
-        };
-        $provide.factory('AuthInterceptor', ['$injector',
-          function($injector) {
-            return {
-              responseError: function(response) {
-                var $q = $injector.get('$q');
-                var $window = $injector.get('$window');
-                if (response.status === 401) {
-                  $window.location.reload();
-                } else
-                if (response.status === 403) {
-                  var message = 'You are not authorized to perform this action.';
-                  response.data.errors = [message];
-                  response.data.displayMessage = message;
-                  $window.location.reload();
-                }
-                return $q.reject(response);
-              }
+(function () {
+    'use strict';
+    angular.module('RedhatAccessInsights', [
+        'ui.router',
+        'ui.bootstrap',
+        'insights',
+        'templates'
+    ]).config(['$httpProvider', '$stateProvider', '$urlRouterProvider', '$locationProvider', '$provide', 'InsightsConfigProvider', '$injector',
+        function ($httpProvider, $stateProvider, $urlRouterProvider, $locationProvider, $provide, InsightsConfigProvider, $injector) {
+            $httpProvider.defaults.headers.common = {
+                'X-CSRF-TOKEN': $('meta[name=csrf-token]').attr('content')
             };
-          }
-        ]);
-        $httpProvider.interceptors.push('AuthInterceptor');
-        $stateProvider.state('manage', {
-          url: '/manage',
-          templateUrl: '/redhat_access/insights/templates/configuration', //TODO HACK!
-          controller: 'ConfigurationCtrl'
-        });
-        $stateProvider.state('help', {
-          url: '/help',
-          templateUrl: '/redhat_access/insights/templates/help' //TODO HACK
-        });
-        $stateProvider.state('serviceerror', {
-          url: '/proxyerror',
-          templateUrl: '/redhat_access/insights/templates/error' //TODO HACK
-        });
-        $urlRouterProvider.otherwise('/overview');
-        $locationProvider.html5Mode(true);
+            $provide.factory('AuthInterceptor', ['$injector',
+                function ($injector) {
+                    return {
+                        responseError: function (response) {
+                            var $q = $injector.get('$q');
+                            var $window = $injector.get('$window');
+                            if (response.status === 401) {
+                                $window.location.reload();
+                            } else if (response.status === 403) {
+                                var message = 'You are not authorized to perform this action.';
+                                response.data.errors = [message];
+                                response.data.displayMessage = message;
+                                $window.location.reload();
+                            }
+                            return $q.reject(response);
+                        }
+                    };
+                }
+            ]);
+            $httpProvider.interceptors.push('AuthInterceptor');
+            $stateProvider.state('manage', {
+                url: '/manage',
+                templateUrl: '/redhat_access/insights/templates/configuration', //TODO HACK!
+                controller: 'ConfigurationCtrl'
+            });
+            $stateProvider.state('help', {
+                url: '/help',
+                templateUrl: '/redhat_access/insights/templates/help' //TODO HACK
+            });
+            $stateProvider.state('serviceerror', {
+                url: '/proxyerror',
+                templateUrl: '/redhat_access/insights/templates/error' //TODO HACK
+            });
+            $urlRouterProvider.otherwise('/overview');
+            $locationProvider.html5Mode(true);
+
+            // Insights UI configuration
+            InsightsConfigProvider.setApiPrefix('/redhat_access/r/insights/view/api/');
+            InsightsConfigProvider.setCanUnregisterSystems(REDHAT_ACCESS_SETTINGS.Insights.canUnregisterSystems);
+            InsightsConfigProvider.setCanIgnoreRules(REDHAT_ACCESS_SETTINGS.Insights.canIgnoreRules);
+            InsightsConfigProvider.setGettingStartedLink('https://access.redhat.com/insights/getting-started/satellite/6/');
+            InsightsConfigProvider.setAllowExport(true);
+            InsightsConfigProvider.setOverviewKey('overview-satellite6');
 
-        // Insights UI configuration
-        InsightsConfigProvider.setApiPrefix('/redhat_access/r/insights/view/api/');
-        InsightsConfigProvider.setCanUnregisterSystems(REDHAT_ACCESS_SETTINGS.Insights.canUnregisterSystems);
-        InsightsConfigProvider.setCanIgnoreRules(REDHAT_ACCESS_SETTINGS.Insights.canIgnoreRules);
-        InsightsConfigProvider.setGettingStartedLink('https://access.redhat.com/insights/getting-started/satellite/6/');
-        InsightsConfigProvider.setAllowExport(true);
-      }
+        }
     ]).value('SAT_CONFIG', {
-      enableBasicAuth: REDHAT_ACCESS_SETTINGS.Insights.allowBasicAuth,
-      isOrgSelected: REDHAT_ACCESS_SETTINGS.Insights.isOrgSelected,
-      isSubscribedToRedhat: REDHAT_ACCESS_SETTINGS.Insights.isSubscribedToRedhat,
-      isOrgDisconnected: REDHAT_ACCESS_SETTINGS.Insights.isOrgDisconnected,
+        enableBasicAuth: REDHAT_ACCESS_SETTINGS.Insights.allowBasicAuth,
+        isOrgSelected: REDHAT_ACCESS_SETTINGS.Insights.isOrgSelected,
+        isSubscribedToRedhat: REDHAT_ACCESS_SETTINGS.Insights.isSubscribedToRedhat,
+        isOrgDisconnected: REDHAT_ACCESS_SETTINGS.Insights.isOrgDisconnected,
     }).value('currentLocale', REDHAT_ACCESS_SETTINGS.currentLocale);
 })();

data/app/controllers/redhat_access/api/api_controller.rb

@@ -7,8 +7,6 @@ module RedhatAccess
       before_filter :session_expiry, :update_activity_time
       #around_filter :set_timezone
 
-      cache_sweeper :topbar_sweeper
-
       respond_to :json
 
       def http_error_response(msg,status)

data/app/services/redhat_access/telemetry/look_ups.rb

@@ -55,10 +55,6 @@ module RedhatAccess
         telemetry_enabled?(get_organization(uuid))
       end
 
-      def get_content_host_by_fqdn(name)
-        Katello::System.first(:conditions => {:name => name})
-      end
-
       def disconnected_org?(org)
         if org
           # TODO: fix hard coding
@@ -102,7 +98,7 @@ module RedhatAccess
       def get_ssl_options_for_org(org, ca_file)
         if org
           verify_peer = REDHAT_ACCESS_CONFIG[:telemetry_ssl_verify_peer] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
-          ssl_version = REDHAT_ACCESS_CONFIG[:telemetry_ssl_verify_peer] ? REDHAT_ACCESS_CONFIG[:telemetry_ssl_verify_peer] : nil
+          ssl_version = REDHAT_ACCESS_CONFIG[:telemetry_ssl_version] ? REDHAT_ACCESS_CONFIG[:telemetry_ssl_version] : nil
           ca_file = ca_file ? ca_file : get_default_ssl_ca_file
           Rails.logger.debug("Verify peer #{verify_peer}")
           if use_basic_auth?
@@ -171,9 +167,8 @@ module RedhatAccess
 
       def get_content_hosts(org)
         if org
-          org_id = org.id
-          environment_ids = Organization.find(org_id).kt_environments.pluck(:id)
-          hosts =  Katello::System.readable.where(:environment_id => environment_ids).pluck(:uuid).compact.sort
+         Katello::Host::SubscriptionFacet.joins(:host).where(:hosts => {:host_id => ::Host::Managed.authorized('view_hosts', ::Host::Managed)},
+                                                             :hosts => {:organization_id => org.id}).pluck(:uuid)
         else
           raise(RecordNotFound, 'Organization not found or invalid')
         end

data/app/services/redhat_access/telemetry/messaging_service.rb

@@ -21,7 +21,7 @@ module RedhatAccess
         current_user_map.each do |key,user|
           begin
             user_data = weekly_summary_data(user.login)
-            data.push(user_data) unless user_data.nil? || user_data.total_systems = 0
+            data.push(user_data) unless user_data.nil? || user_data[:data].nil? || user_data[:data].total_systems == 0
           rescue => e
             Rails.logger.warn("Unable to get weekly email data for user")
           end

data/app/views/redhat_access/insights_mailer/weekly_email.erb

@@ -85,7 +85,7 @@
                     <p>
                       You currently have
                       <a href="<%=@server_url%>/inventory?product=all&amp;utm_source=all_systems_first_paragraph&amp;utm_medium=email&amp;utm_campaign=WeeklyEmail">
-                        <strong><%= @data.total_systems %> systems</strong>
+                        <strong><%= @data.total_systems %> system(s)</strong>
                       </a>
                       registered with Insights in the <%=@org.name%> organization and
 

data/lib/redhat_access/version.rb

@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redhat_access
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Lindani Phiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redhat_access_lib
@@ -288,61 +288,61 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Plugin to add Redhat Access to Foreman
 test_files:
-- test/models/redhat_access/telemetry_proxy_credentials_test.rb
-- test/redhat_access_test.rb
-- test/fixtures/redhat_access/telemetry_configurations.yml
-- test/fixtures/redhat_access/telemetry_proxy_credentials.yml
-- test/integration/navigation_test.rb
-- test/test_helper.rb
-- test/unit/helpers/redhat_access/log_viewer_helper_test.rb
-- test/unit/helpers/redhat_access/analytics_dashboard_helper_test.rb
-- test/unit/helpers/redhat_access/logs_helper_test.rb
-- test/unit/helpers/redhat_access/cases_helper_test.rb
-- test/unit/helpers/redhat_access/search_helper_test.rb
-- test/unit/helpers/redhat_access/redhat_access_helper_test.rb
-- test/unit/helpers/redhat_access/telemetry_configuration_helper_test.rb
-- test/unit/helpers/redhat_access/attachments_helper_test.rb
-- test/unit/redhat_access/telemetry_configuration_test.rb
-- test/sos-report-test.rb
-- test/functional/redhat_access/redhat_access_controller_test.rb
-- test/functional/redhat_access/logs_controller_test.rb
-- test/functional/redhat_access/analytics_dashboard_controller_test.rb
-- test/functional/redhat_access/attachments_controller_test.rb
 - test/functional/redhat_access/log_viewer_controller_test.rb
-- test/functional/redhat_access/configuration_controller_test.rb
-- test/functional/redhat_access/search_controller_test.rb
 - test/functional/redhat_access/cases_controller_test.rb
+- test/functional/redhat_access/analytics_dashboard_controller_test.rb
+- test/functional/redhat_access/redhat_access_controller_test.rb
+- test/functional/redhat_access/search_controller_test.rb
+- test/functional/redhat_access/configuration_controller_test.rb
 - test/functional/redhat_access/telemetry_configuration_controller_test.rb
-- test/dummy/Rakefile
-- test/dummy/config.ru
+- test/functional/redhat_access/logs_controller_test.rb
+- test/functional/redhat_access/attachments_controller_test.rb
+- test/models/redhat_access/telemetry_proxy_credentials_test.rb
+- test/integration/navigation_test.rb
+- test/dummy/README.rdoc
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/script/rails
-- test/dummy/public/favicon.ico
-- test/dummy/public/422.html
-- test/dummy/public/404.html
-- test/dummy/public/500.html
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
 - test/dummy/config/application.rb
-- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/database.yml
-- test/dummy/README.rdoc
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/environment.rb
+- test/dummy/Rakefile
+- test/dummy/script/rails
+- test/dummy/config.ru
+- test/dummy/public/404.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/test_helper.rb
+- test/redhat_access_test.rb
+- test/fixtures/redhat_access/telemetry_configurations.yml
+- test/fixtures/redhat_access/telemetry_proxy_credentials.yml
+- test/sos-report-test.rb
+- test/unit/redhat_access/telemetry_configuration_test.rb
+- test/unit/helpers/redhat_access/cases_helper_test.rb
+- test/unit/helpers/redhat_access/log_viewer_helper_test.rb
+- test/unit/helpers/redhat_access/analytics_dashboard_helper_test.rb
+- test/unit/helpers/redhat_access/logs_helper_test.rb
+- test/unit/helpers/redhat_access/telemetry_configuration_helper_test.rb
+- test/unit/helpers/redhat_access/redhat_access_helper_test.rb
+- test/unit/helpers/redhat_access/search_helper_test.rb
+- test/unit/helpers/redhat_access/attachments_helper_test.rb