Sat 6.1 candidate upstream

redhataccess · Dec 10, 2014 · 4e68993 · 4e68993
1 parent d9e6ef6
commit 4e68993
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/redhat-access/README.rdoc b/redhat-access/README.rdoc
@@ -4,4 +4,4 @@ This plugin extends the Foreman UI ( https://github.com/theforeman/foreman ) wit
 This includes ability to search the Red Hat Knowledge Base, Support Case Management 
 and Log Diagnostics.
 
-This plugin depends on the Red Hat Access Angular library https://github.com/redhataccess/redhat_access_angular_ui/releases/tag/v0.0.1
+This plugin depends on the Red Hat Access Angular library https://github.com/redhataccess/redhat_access_angular_ui/ version 0.9.56
diff --git a/redhat-access/Rakefile b/redhat-access/Rakefile
@@ -37,6 +37,12 @@ Rake::TestTask.new(:test) do |t|
 end
 
 desc 'Compile stand alone engine assets'
+
+task 'a:c' do
+  #Alias for commandline execution
+  Rake::Task['assets:precompile:engine'].invoke
+end
+
 task 'assets:precompile:engine' do
   require 'sprockets'
   require 'sprockets/railtie'

diff --git a/redhat-access/app/assets/javascripts/redhat_access/redhat_access.module.js b/redhat-access/app/assets/javascripts/redhat_access/redhat_access.module.js
@@ -55,9 +55,9 @@ angular.module('RedhatAccess', [
 		TITLE_VIEW_CONFIG.show = true;
 		hideMachinesDropdown.value = true;
 		NEW_DEFAULTS.product = "Red Hat Satellite or Proxy"; //TODO read from server config
-		NEW_DEFAULTS.version = "6.0 Beta"; //TODO read from server config
+		NEW_DEFAULTS.version = "6.0"; //TODO read from server config
 		gettextCatalog.currentLanguage = currentLocale;
-		console.log('Setting language to ' + currentLocale);
+		//console.log('Setting language to ' + currentLocale);
 		// $http({
 		// 	method: 'GET',
 		// 	url: 'configuration'

diff --git a/redhat-access/app/controllers/redhat_access/telemetry_api_controller.rb b/redhat-access/app/controllers/redhat_access/telemetry_api_controller.rb
@@ -9,7 +9,6 @@ class TelemetryApiController < ApplicationController
     skip_before_filter :authorize, :require_login, :session_expiry, :verify_authenticity_token
     before_filter :telemetry_auth
 
-    # TODO change this to be set from config
     STRATA_URL="https://#{REDHAT_ACCESS_CONFIG[:strata_host]}"
 
     YAML_URL="#{STRATA_URL}/rs/telemetry/api/static/uploader.yaml"
@@ -20,7 +19,7 @@ def get_creds
     end
 
     def telemetry_auth
-      authorize_client
+      authenticate_client
       unless  User.current.is_a? RedhatAccess::Authentication::CertUser
         authorize
       end

diff --git a/redhat-access/app/services/redhat_access/authentication/client_authentication.rb b/redhat-access/app/services/redhat_access/authentication/client_authentication.rb
@@ -8,18 +8,13 @@
 module RedhatAccess
   module Authentication
     module ClientAuthentication
+
       def authenticate_client
         set_client_user
-        User.current.present?
-      end
-
-      def authorize_client
-        authenticate_client
         require_login unless User.current
+        User.current.present?
       end
 
-
-
       def deny_access
         render json: { :message => "Permission Denied." }, :status => 403
       end

diff --git a/redhat-access/rubygem-foreman-redhat_access.spec b/redhat-access/rubygem-foreman-redhat_access.spec
@@ -116,6 +116,9 @@ cp -pa .%{rubygem_redhat_access_dir}/config/config.yml.example %{buildroot}/etc/
 %changelog
 * Mon Dec 12 2014 Lindani Phiri <[email protected]> - 0.0.7-1
 - Add proactive support
+- Resolves: bz1131538
+- Resolves: bz1145742
+
 * Wed May 14 2014 Rex White <[email protected]> - 0.0.4-1
 - Resolves: bz1084590
 - Updated for UX comments