UX fixes as well as api session timeout handling fix

redhataccess · May 25, 2014 · 49b620e · 49b620e
1 parent ae5064b
commit 49b620e
Show file tree

Hide file tree

Showing 10 changed files with 889 additions and 705 deletions.
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
@@ -32,7 +32,22 @@ angular.module('RedhatAccess', [
 		$httpProvider.defaults.headers.common = {
 			'X-CSRF-TOKEN': $('meta[name=csrf-token]').attr('content')
 		};
-
+		var authInteceptor = ['$q',
+			function ($q) {
+				return {
+					'response': function (response) {
+						return response;
+					},
+					'responseError': function (rejection) {
+						if (rejection.status === 401) {
+							location.reload();
+						}
+						return $q.reject(rejection);
+					}
+				};
+			}
+		];
+		$httpProvider.interceptors.push(authInteceptor);
 	}
 ]).run(['TITLE_VIEW_CONFIG',
 	'$http', 'securityService', 'hideMachinesDropdown', 'NEW_DEFAULTS',
@@ -41,44 +56,43 @@ angular.module('RedhatAccess', [
 		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
-		$http({
-			method: 'GET',
-			url: 'configuration'
-		}).
-		success(function (data, status, headers, config) {
-			if (data) {
-				if (data.strataHostName) {
-					strata.setStrataHostname(data.strataHostName);
-				} else {
-					console.log("Invalid configuration object " + data);
-				}
-				if (data.strataClientId) {
-					strata.setRedhatClientID(data.strataClientId);
-				} else {
-					strata.setRedhatClientID("foreman-strata-client");
-					console.log("Invalid configuration object " + data);
-				}
-			}
-			securityService.validateLogin(false).then(
-				function (authedUser) {
-					console.log("logged in user is " + authedUser)
-				},
-				function (error) {
-					console.log("Unable to get user credentials");
-				});
-		}).
-		error(function (data, status, headers, config) {
-			console.log("Failed to read app configuration");
-			strata.setRedhatClientID("foreman-strata-client");
-			securityService.validateLogin(false).then(
-				function (authedUser) {
-					console.log("logged in user is " + authedUser)
-				},
-				function (error) {
-					console.log("Unable to get user credentials");
-				});
-		});
-
+		// $http({
+		// 	method: 'GET',
+		// 	url: 'configuration'
+		// }).
+		// success(function (data, status, headers, config) {
+		// 	if (data) {
+		// 		if (data.strataHostName) {
+		// 			strata.setStrataHostname(data.strataHostName);
+		// 		} else {
+		// 			console.log("Invalid configuration object " + data);
+		// 		}
+		// 		if (data.strataClientId) {
+		// 			strata.setRedhatClientID(data.strataClientId);
+		// 		} else {
+		// 			strata.setRedhatClientID("foreman-strata-client");
+		// 			console.log("Invalid configuration object " + data);
+		// 		}
+		// 	}
+		// 	securityService.validateLogin(false).then(
+		// 		function (authedUser) {
+		// 			console.log("logged in user is " + authedUser)
+		// 		},
+		// 		function (error) {
+		// 			console.log("Unable to get user credentials");
+		// 		});
+		// }).
+		// error(function (data, status, headers, config) {
+		// 	console.log("Failed to read app configuration");
+		// 	strata.setRedhatClientID("foreman-strata-client");
+		// 	securityService.validateLogin(false).then(
+		// 		function (authedUser) {
+		// 			console.log("logged in user is " + authedUser)
+		// 		},
+		// 		function (error) {
+		// 			console.log("Unable to get user credentials");
+		// 		});
+		// });
 	}
 ]);
 

diff --git a/redhat-access/app/controllers/redhat_access/attachments_controller.rb b/redhat-access/app/controllers/redhat_access/attachments_controller.rb
@@ -30,5 +30,9 @@ def create
           :status => 500
       end
     end
+
+    def api_request?
+      true
+    end
   end
 end
diff --git a/redhat-access/app/controllers/redhat_access/configuration_controller.rb b/redhat-access/app/controllers/redhat_access/configuration_controller.rb
@@ -12,5 +12,10 @@ def index
       render :json => { :strataHostName => strata_host,:strataClientId => client_id }.to_json,
         :layout => false
     end
+
+    def api_request?
+      true
+    end
+
   end
 end
diff --git a/redhat-access/app/controllers/redhat_access/logs_controller.rb b/redhat-access/app/controllers/redhat_access/logs_controller.rb
@@ -35,5 +35,9 @@ def get_available_logs
     def is_valid_file?  file
       @@log_files.include?(file) && File.exist?(file) && File.readable?(file) && File.size(file) > 0
     end
+
+    def api_request?
+      true
+    end
   end
 end
diff --git a/redhat-access/app/views/redhat_access/redhat_access/index.html.erb b/redhat-access/app/views/redhat_access/redhat_access/index.html.erb
@@ -3,3 +3,7 @@
 </div>
 <%= stylesheet_link_tag 'redhat_access/application'%>
 <%= javascript_include_tag 'redhat_access/application' %>
+<%= javascript_tag do %>
+  strata.setStrataHostname('<%=  REDHAT_ACCESS_CONFIG[:strata_host] %>');
+  strata.setRedhatClientID('<%=  "foreman_plugin_#{REDHAT_ACCESS_CONFIG[:deployment]}_#{RedhatAccess::VERSION}" %>');
+<% end %>
diff --git a/redhat-access/lib/redhat_access/version.rb b/redhat-access/lib/redhat_access/version.rb
@@ -1,3 +1,3 @@
 module RedhatAccess
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
diff --git a/redhat-access/redhat_access.gemspec b/redhat-access/redhat_access.gemspec
@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   # s.add_dependency "jquery-rails"
   #-------------s.add_dependency "angular-rails-templates", ">= 0.0.4"
   s.add_development_dependency "sqlite3"
+  #s.add_development_dependency "redhat_access_lib"
 end
diff --git a/redhat-access/rubygem-foreman-redhat_access.spec b/redhat-access/rubygem-foreman-redhat_access.spec
@@ -15,7 +15,7 @@
 %endif
 
 Name: %{?scl_prefix}rubygem-foreman-%{gem_name}
-Version: 0.0.3
+Version: 0.0.4
 Release: 1%{?dist}
 Summary: Foreman engine to access Red Hat knowledge base
 Group: Development/Languages
@@ -111,6 +111,10 @@ cp -pa .%{rubygem_redhat_access_dir}/config/config.yml.example %{buildroot}/etc/
 /usr/bin
 
 %changelog
+* Wed May 14 2014 Rex White <[email protected]> - 0.0.4-1
+- Resolves: bz1084590
+- Updated for UX comments
+
 * Wed May 14 2014 Rex White <[email protected]> - 0.0.3-1
 - Resolves: bz1084590