foreman_rh_cloud 5.0.34 → 5.0.37

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -6,18 +6,22 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
 
   setup do
     @forwarder = ::ForemanRhCloud::CloudRequestForwarder.new
+
+    ForemanRhCloud.stubs(:base_url).returns('https://cloud.example.com')
+    ForemanRhCloud.stubs(:cert_base_url).returns('https://cert.cloud.example.com')
+    ForemanRhCloud.stubs(:legacy_insights_url).returns('https://cert-api.access.example.com')
   end
 
   test 'should prepare correct cloud url' do
     paths = {
-      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
-      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.redhat.com/r/insights/v1/static/release/insights-core.egg",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json.asc",
-      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
-      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
-      "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
-      "/redhat_access/r/insights/" => "https://cert.cloud.redhat.com/api/apicast-tests/ping",
+      "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.example.com/api/module-update-router/v1/channel?module=insights-core",
+      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.example.com/r/insights/v1/static/release/insights-core.egg",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.example.com/r/insights/v1/static/uploader.v2.json",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.example.com/r/insights/v1/static/uploader.v2.json.asc",
+      "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.example.com/api/inventory/v1/hosts",
+      "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.example.com/api/ingress/v1/upload",
+      "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.example.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",
+      "/redhat_access/r/insights/" => "https://cert.cloud.example.com/api/apicast-tests/ping",
     }
 
     paths.each do |key, value|

data/test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb

@@ -9,10 +9,6 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
   test 'generates ping response for each org' do
     organizations = FactoryBot.create_list(:organization, 2)
 
-    ForemanRhCloud::CloudPingService::TokenPing.any_instance.expects(:execute_cloud_request).returns(
-      RestClient::Response.new('TEST RESPONSE')
-    )
-
     setup_certs_expectation do
       ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:candlepin_id_cert).with(organizations[0])
     end
@@ -33,22 +29,15 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 
-    assert actual[:token_auth][:success]
-    assert_nil actual[:token_auth][:error]
     assert actual[:cert_auth][organizations[0]][:success]
     assert_nil actual[:cert_auth][organizations[0]][:error]
     assert actual[:cert_auth][organizations[1]][:success]
     assert_nil actual[:cert_auth][organizations[1]][:error]
   end
 
-  test 'generates ping error response for org and token' do
+  test 'generates ping error response for org' do
     organizations = FactoryBot.create_list(:organization, 1)
 
-    ForemanRhCloud::CloudPingService::TokenPing.any_instance.expects(:execute_cloud_request).raises(
-      RuntimeError,
-      'TEST RESPONSE TOKEN'
-    )
-
     setup_certs_expectation do
       ForemanRhCloud::CloudPingService::CertPing.any_instance.expects(:candlepin_id_cert).with(organizations[0])
     end
@@ -62,8 +51,6 @@ class CloudStatusServiceTest < ActiveSupport::TestCase
     service = ForemanRhCloud::CloudPingService.new(organizations, nil)
     actual = service.ping
 
-    refute actual[:token_auth][:success]
-    assert_match /TEST RESPONSE TOKEN/, actual[:token_auth][:error]
     refute actual[:cert_auth][organizations[0]][:success]
     assert_match /TEST RESPONSE ORG 0/, actual[:cert_auth][organizations[0]][:error]
   end

data/test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb

@@ -2,13 +2,17 @@ require 'test_plugin_helper'
 
 class TemplateRendererHelperTest < ActiveSupport::TestCase
   include ForemanRhCloud::TemplateRendererHelper
+  include MockCerts
 
   setup do
     response = mock('respone')
     response.stubs(:body).returns('TEST PLAYBOOK')
     ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:query_playbook).returns(response)
     @host1 = FactoryBot.create(:host)
-    Setting[:rh_cloud_token] = 'MOCK_TOKEN'
+
+    setup_certs_expectation do
+      ForemanRhCloud::RemediationsRetriever.any_instance.stubs(:candlepin_id_cert)
+    end
   end
 
   test 'Generates a playbook for hit and remediation' do

data/test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb

@@ -2,8 +2,8 @@ require 'test_plugin_helper'
 
 class UrlRemediationsRetrieverTest < ActiveSupport::TestCase
   test 'Calls the given url' do
-    Setting[:rh_cloud_token] = 'TEST_TOKEN'
     retreiver = ForemanRhCloud::UrlRemediationsRetriever.new(
+      organization_id: FactoryBot.create(:organization).id,
       url: 'http://test.example.com',
       payload: 'TEST_PAYLOAD',
       headers: {
@@ -11,6 +11,8 @@ class UrlRemediationsRetrieverTest < ActiveSupport::TestCase
       }
     )
 
+    retreiver.stubs(:cert_auth_available?).returns(true)
+
     response = mock('response')
     response.stubs(:body).returns('TEST_RESPONSE')
     retreiver.expects(:execute_cloud_request).with do |params|

data/webpack/ForemanInventoryUpload/Components/InventorySettings/InventorySettingsSelectors.js

@@ -15,5 +15,3 @@ export const selectIpsObfuscationEnabled = state =>
 
 export const selectExcludePackages = state =>
   selectSettings(state).excludePackagesEnabled;
-
-export const selectCloudToken = state => selectSettings(state).cloudToken;

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js

@@ -21,18 +21,16 @@ import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
-import './index.scss';
 
 export const API_KEY = 'CLOUD_PING';
 
 const CloudPingModal = ({ title, isOpen, toggle }) => {
   const [rows, setRows] = useState([]);
-  const [tokenStatus, setTokenStatus] = useState({});
   const dispatch = useDispatch();
   const handleSuccess = useCallback(
     ({
       data: {
-        ping: { cert_auth = [], token_auth = {} },
+        ping: { cert_auth = [] },
       },
     }) => {
       cert_auth.length &&
@@ -53,7 +51,6 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
             ],
           }))
         );
-      setTokenStatus(token_auth);
     },
     [status]
   );
@@ -83,12 +80,6 @@ const CloudPingModal = ({ title, isOpen, toggle }) => {
         isOpen={isOpen}
         onClose={toggle}
       >
-        <Card className="token-status">
-          <CardTitle>
-            <StatusIcon isPending={isPending} authStatus={tokenStatus} />{' '}
-            {__('API token status')}
-          </CardTitle>
-        </Card>
         <Card className="certs-status">
           <CardTitle>{__('Organization status')}</CardTitle>
           <CardBody>

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButton.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Spinner, Button } from '@patternfly/react-core';
-import { ExclamationTriangleIcon, RedoIcon } from '@patternfly/react-icons';
+import { RedoIcon } from '@patternfly/react-icons';
 import { STATUS } from 'foremanReact/constants';
-import SyncModal from './components/Modal';
 import { SYNC_BUTTON_TEXT } from '../../../../ForemanInventoryConstants';
 
 class SyncButton extends React.Component {
@@ -16,12 +15,11 @@ class SyncButton extends React.Component {
   };
 
   render() {
-    const { cloudToken, handleSync, status } = this.props;
+    const { handleSync, status } = this.props;
 
-    const handleClick = !cloudToken ? this.toggleModal : handleSync;
+    const handleClick = handleSync;
     return (
       <React.Fragment>
-        <SyncModal show={this.state.showModal} toggleModal={this.toggleModal} />
         <Button
           className="sync_button"
           onClick={handleClick}
@@ -29,11 +27,6 @@ class SyncButton extends React.Component {
           isDisabled={status === STATUS.PENDING}
           variant="secondary"
         >
-          {!cloudToken && (
-            <span>
-              <ExclamationTriangleIcon />{' '}
-            </span>
-          )}
           {status === STATUS.PENDING ? <Spinner size="sm" /> : <RedoIcon />}
           {SYNC_BUTTON_TEXT}
         </Button>
@@ -43,13 +36,11 @@ class SyncButton extends React.Component {
 }
 
 SyncButton.propTypes = {
-  cloudToken: PropTypes.bool,
   handleSync: PropTypes.func.isRequired,
   status: PropTypes.string,
 };
 
 SyncButton.defaultProps = {
-  cloudToken: false,
   status: null,
 };
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButton.test.js

@@ -4,7 +4,7 @@ import { noop } from 'foremanReact/common/helpers';
 import SyncButton from '../SyncButton';
 
 const fixtures = {
-  'render with Props': { cloudToken: true, handleSync: noop },
+  'render with Props': { handleSync: noop },
 };
 
 describe('SyncButton', () => {

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButton.test.js.snap

@@ -2,10 +2,6 @@
 
 exports[`SyncButton rendering render with Props 1`] = `
 <Fragment>
-  <SyncModal
-    show={false}
-    toggleModal={[Function]}
-  />
   <Button
     className="sync_button"
     isDisabled={false}

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js

@@ -3,12 +3,10 @@ import { connect } from 'react-redux';
 
 import * as actions from './SyncButtonActions';
 import SyncButton from './SyncButton';
-import { selectCloudToken } from '../../../InventorySettings/InventorySettingsSelectors';
 import { selectTaskStatus } from './SyncButtonSelectors';
 
 // map state to props
 const mapStateToProps = state => ({
-  cloudToken: selectCloudToken(state),
   status: selectTaskStatus(state),
 });
 

data/webpack/InsightsCloudSync/Components/InsightsTable/InsightsTableSelectors.js

@@ -73,6 +73,3 @@ export const selectShowSelectAllAlert = state =>
 
 export const selectItemCount = state =>
   selectAPIResponse(state, INSIGHTS_HITS_API_KEY).itemCount || 0;
-
-export const selectHasToken = state =>
-  selectAPIResponse(state, INSIGHTS_HITS_API_KEY).hasToken;

data/webpack/InsightsCloudSync/Components/InsightsTable/Pagination.js

@@ -5,6 +5,7 @@ import {
   Pagination as PfPagination,
   PaginationVariant,
 } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { useForemanSettings } from 'foremanReact/Root/Context/ForemanContext';
 import { onTablePerPageSelect, onTableSetPage } from './InsightsTableActions';
 import { getPerPageOptions } from './InsightsTableHelpers';
@@ -14,6 +15,20 @@ import {
   selectPerPage,
 } from './InsightsTableSelectors';
 
+const paginationTitles = {
+  items: __('items'),
+  page: '', // doesn't work well with translations as it adds 's' for plural, see: https://github.com/patternfly/patternfly-react/issues/6707
+  itemsPerPage: __('Items per page'),
+  perPageSuffix: __('per page'),
+  toFirstPage: __('Go to first page'),
+  toPreviousPage: __('Go to previous page'),
+  toLastPage: __('Go to last page'),
+  toNextPage: __('Go to next page'),
+  optionsToggle: __('Items per page'),
+  currPage: __('Current page'),
+  paginationTitle: __('Pagination'),
+};
+
 const Pagination = ({ variant, ...props }) => {
   const dispatch = useDispatch();
   const onSetPage = (e, pageNumber) => dispatch(onTableSetPage(e, pageNumber));
@@ -35,6 +50,7 @@ const Pagination = ({ variant, ...props }) => {
       onSetPage={onSetPage}
       onPerPageSelect={onPerPageSelect}
       perPageOptions={getPerPageOptions(urlPerPage, appPerPage)}
+      titles={paginationTitles}
       {...props}
     />
   );

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/InsightsTableSelectors.test.js

@@ -3,7 +3,6 @@ import { insightsStateWrapper } from '../../../../ForemanRhCloudTestHelpers';
 import { routerState, APIState, APIErrorState } from './fixtures';
 import {
   selectError,
-  selectHasToken,
   selectHits,
   selectInsightsCloudTable,
   selectIsAllSelected,
@@ -46,7 +45,6 @@ const fixtures = {
   'should return API error': () => selectError({ ...state, ...APIErrorState }),
   'should return API hits': () => selectHits(state),
   'should return API item count': () => selectItemCount(state),
-  'should return API has token': () => selectHasToken(state),
   'should return insights table': () => selectInsightsCloudTable(state),
   'should return insights selectedIds': () => selectSelectedIds(state),
   'should return insights isAllSelected': () => selectIsAllSelected(state),

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/__snapshots__/InsightsTableSelectors.test.js.snap

@@ -2,8 +2,6 @@
 
 exports[`InsightsTable selectors should return API error 1`] = `"Request failed with status code 503"`;
 
-exports[`InsightsTable selectors should return API has token 1`] = `true`;
-
 exports[`InsightsTable selectors should return API hits 1`] = `
 Array [
   Object {

data/webpack/InsightsCloudSync/Components/InsightsTable/__tests__/fixtures.js

@@ -78,7 +78,6 @@ export const APIState = {
         url: '/insights_cloud/hits',
       },
       response: {
-        hasToken: true,
         hits,
         itemCount: 2,
       },

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
 import InsightsHeader from './Components/InsightsHeader';
-import { NoTokenEmptyState } from './Components/NoTokenEmptyState';
 import InsightsTable from './Components/InsightsTable';
 import RemediationModal from './Components/RemediationModal';
 import {
@@ -14,20 +13,7 @@ import Pagination from './Components/InsightsTable/Pagination';
 import ToolbarDropdown from './Components/ToolbarDropdown';
 import InsightsSettings from './Components/InsightsSettings';
 
-const InsightsCloudSync = ({
-  syncInsights,
-  query,
-  fetchInsights,
-  hasToken,
-}) => {
-  if (!hasToken) {
-    return (
-      <PageLayout header={INSIGHTS_SYNC_PAGE_TITLE} searchable={false}>
-        <NoTokenEmptyState />
-      </PageLayout>
-    );
-  }
-
+const InsightsCloudSync = ({ syncInsights, query, fetchInsights }) => {
   const onRecommendationSync = () => syncInsights(fetchInsights, query);
   const toolbarButtons = (
     <>
@@ -63,12 +49,10 @@ InsightsCloudSync.propTypes = {
   syncInsights: PropTypes.func.isRequired,
   fetchInsights: PropTypes.func.isRequired,
   query: PropTypes.string,
-  hasToken: PropTypes.bool,
 };
 
 InsightsCloudSync.defaultProps = {
   query: '',
-  hasToken: true,
 };
 
 export default InsightsCloudSync;

data/webpack/InsightsCloudSync/InsightsCloudSync.test.js

@@ -8,13 +8,6 @@ const fixtures = {
     syncInsights: noop,
     fetchInsights: noop,
     query: '',
-    hasToken: true,
-  },
-  'render no token': {
-    status: 'RESOLVED',
-    syncInsights: noop,
-    fetchInsights: noop,
-    hasToken: false,
   },
 };
 

data/webpack/InsightsCloudSync/InsightsCloudSyncConstants.js

@@ -10,10 +10,6 @@ export const INSIGHTS_SYNC_PAGE_TITLE = __('Red Hat Insights');
 
 export const INSIGHTS_PATH = foremanUrl('/foreman_rh_cloud/insights_cloud');
 
-export const INSIGHTS_SAVE_AND_SYNC_PATH = foremanUrl(
-  '/insights_cloud/save_token_and_sync'
-);
-
 export const INSIGHTS_SEARCH_PROPS = {
   ...getControllerSearchProps('/insights_cloud/hits'),
   controller: 'insights_hits',

data/webpack/InsightsCloudSync/InsightsCloudSyncHelpers.js

@@ -1,14 +1,7 @@
-import URI from 'urijs';
 import { foremanUrl } from '../ForemanRhCloudHelpers';
 
 export const insightsCloudUrl = path => foremanUrl(`/insights_cloud/${path}`);
 
-export const cloudTokenSettingUrl = () => {
-  const settingsUrl = new URI(foremanUrl('/settings'));
-  settingsUrl.setSearch({ search: 'name = rh_cloud_token' });
-  return settingsUrl.toString();
-};
-
 export const redHatConsole = path => `https://console.redhat.com/${path || ''}`;
 export const redHatInsights = path => redHatConsole(`insights/${path || ''}`);
 export const redHatInventory = path =>

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -52,12 +52,3 @@ exports[`InsightsCloudSync render 1`] = `
   </PageLayout>
 </div>
 `;
-
-exports[`InsightsCloudSync render no token 1`] = `
-<PageLayout
-  header="Red Hat Insights"
-  searchable={false}
->
-  <NoTokenEmptyState />
-</PageLayout>
-`;

data/webpack/InsightsCloudSync/index.js

@@ -5,14 +5,10 @@ import * as actions from './InsightsCloudSyncActions';
 import { fetchInsights } from './Components/InsightsTable/InsightsTableActions';
 import InsightsCloudSync from './InsightsCloudSync';
 import insightsCloudSyncReducers from './InsightsCloudSyncReducers';
-import {
-  selectSearch,
-  selectHasToken,
-} from './Components/InsightsTable/InsightsTableSelectors';
+import { selectSearch } from './Components/InsightsTable/InsightsTableSelectors';
 // map state to props
 const mapStateToProps = state => ({
   query: selectSearch(state),
-  hasToken: selectHasToken(state),
 });
 
 // map action dispatchers to props

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 5.0.34
+  version: 5.0.37
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -164,7 +164,7 @@ files:
 - app/overrides/hosts_list.rb
 - app/overrides/layouts/base/styles.html.erb.deface
 - app/services/foreman_rh_cloud/branch_info.rb
-- app/services/foreman_rh_cloud/cloud_auth.rb
+- app/services/foreman_rh_cloud/cert_auth.rb
 - app/services/foreman_rh_cloud/cloud_connector.rb
 - app/services/foreman_rh_cloud/cloud_ping_service.rb
 - app/services/foreman_rh_cloud/cloud_presence.rb
@@ -182,7 +182,6 @@ files:
 - app/views/layouts/foreman_rh_cloud/application.html.erb
 - config/Gemfile.lock.gh_test
 - config/database.yml.example
-- config/package-lock.json
 - config/package-lock.json.gh_test
 - config/package-lock.json.plugin
 - config/rh_cert-api_chain.pem
@@ -198,6 +197,7 @@ files:
 - db/migrate/20210404000001_change_resolutions.foreman_rh_cloud.rb
 - db/migrate/20210720000001_remove_old_insights_statuses.foreman_rh_cloud.rb
 - db/migrate/20211027000001_create_task_output.foreman_rh_cloud.rb
+- db/migrate/20220321000001_add_unique_to_insights_rules.foreman_rh_cloud.rb
 - db/seeds.d/179_ui_notifications.rb
 - db/seeds.d/50_job_templates.rb
 - lib/foreman_inventory_upload.rb
@@ -428,7 +428,6 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/__tests__/__snapshots__/CloudConnectorButton.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudConnectorButton/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/CloudPingModal/index.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/PageDescription.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/PageDescription.test.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/PageDescription/__tests__/__snapshots__/PageDescription.test.js.snap
@@ -448,9 +447,7 @@ files:
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/SyncButtonSelectors.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/__snapshots__/integrations.test.js.snap
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/integrations.test.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Modal.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Toast.js
-- webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/modal.scss
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/index.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/ToolbarButtons.js
 - webpack/ForemanInventoryUpload/Components/PageHeader/components/ToolbarButtons/__tests__/ToolbarButtons.test.js
@@ -576,7 +573,6 @@ files:
 - webpack/InsightsCloudSync/Components/InsightsTable/__tests__/fixtures.js
 - webpack/InsightsCloudSync/Components/InsightsTable/index.js
 - webpack/InsightsCloudSync/Components/InsightsTable/table.scss
-- webpack/InsightsCloudSync/Components/NoTokenEmptyState.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationActions.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js
 - webpack/InsightsCloudSync/Components/RemediationModal/RemediationModal.js
@@ -587,9 +583,7 @@ files:
 - webpack/InsightsCloudSync/Components/RemediationModal/index.js
 - webpack/InsightsCloudSync/Components/ToolbarDropdown.js
 - webpack/InsightsCloudSync/Components/__tests__/InsightsHeader.test.js
-- webpack/InsightsCloudSync/Components/__tests__/NoTokenEmptyState.test.js
 - webpack/InsightsCloudSync/Components/__tests__/__snapshots__/InsightsHeader.test.js.snap
-- webpack/InsightsCloudSync/Components/__tests__/__snapshots__/NoTokenEmptyState.test.js.snap
 - webpack/InsightsCloudSync/InsightsCloudSync.js
 - webpack/InsightsCloudSync/InsightsCloudSync.scss
 - webpack/InsightsCloudSync/InsightsCloudSync.test.js
@@ -678,7 +672,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
@@ -694,33 +688,33 @@ test_files:
 - test/controllers/uploads_settings_controller_test.rb
 - test/factories/insights_factories.rb
 - test/factories/inventory_upload_factories.rb
-- test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/insights_client_status_aging_test.rb
+- test/jobs/inventory_scheduled_sync_test.rb
+- test/jobs/upload_report_job_test.rb
+- test/jobs/connector_playbook_execution_reporter_task_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
 - test/jobs/insights_rules_sync_test.rb
 - test/jobs/inventory_full_sync_test.rb
 - test/jobs/inventory_hosts_sync_test.rb
-- test/jobs/inventory_scheduled_sync_test.rb
 - test/jobs/inventory_self_host_sync_test.rb
-- test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/fact_helpers_test.rb
-- test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
 - test/unit/metadata_generator_test.rb
-- test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/rh_cloud_permissions_test.rb
 - test/unit/services/foreman_rh_cloud/branch_info_test.rb
+- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb
 - test/unit/services/foreman_rh_cloud/cloud_status_service_test.rb
 - test/unit/services/foreman_rh_cloud/hit_remediations_retriever_test.rb
-- test/unit/services/foreman_rh_cloud/insights_status_cleaner_test.rb
 - test/unit/services/foreman_rh_cloud/template_renderer_helper_test.rb
 - test/unit/services/foreman_rh_cloud/url_remediations_retriever_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
 - test/unit/tags_generator_test.rb
+- test/unit/foreman_rh_cloud_self_host_test.rb
+- test/unit/playbook_progress_generator_test.rb

data/app/services/foreman_rh_cloud/cloud_auth.rb

@@ -1,44 +0,0 @@
-module ForemanRhCloud
-  module CloudAuth
-    extend ActiveSupport::Concern
-
-    include CloudRequest
-
-    def cloud_auth_available?
-      Setting[:rh_cloud_token].present?
-    end
-
-    def rh_credentials
-      @rh_credentials ||= query_refresh_token
-    end
-
-    def query_refresh_token
-      token_response = RestClient::Request.execute(
-        method: :post,
-        url: ForemanRhCloud.authentication_url,
-        verify_ssl: ForemanRhCloud.verify_ssl_method,
-        proxy: ForemanRhCloud.transformed_http_proxy_string(logger: logger),
-        payload: {
-          grant_type: 'refresh_token',
-          client_id: 'rhsm-api',
-          refresh_token: Setting[:rh_cloud_token],
-        }
-      )
-
-      JSON.parse(token_response)['access_token']
-    rescue RestClient::ExceptionWithResponse => e
-      Foreman::Logging.exception('Unable to authenticate using rh_cloud_token setting', e)
-      raise ::Foreman::WrappedException.new(e, N_('Unable to authenticate using rh_cloud_token setting'))
-    end
-
-    def execute_cloud_request(params)
-      final_params = {
-        headers: {
-          Authorization: "Bearer #{rh_credentials}",
-        },
-      }.deep_merge(params)
-
-      super(final_params)
-    end
-  end
-end