bastion 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d3d2dd8dba1c9d5e1e7ec97ea470cbbbf010b5
-  data.tar.gz: e1822a868e460069a8a2631f3a6987aaca73bd3c
+  metadata.gz: 934c64b4816522e752daec9c8b7c72ef01d45bd3
+  data.tar.gz: 04aaeabc596dcf24f88a387e93db7f7baf401236
 SHA512:
-  metadata.gz: b93d2e4416c5c77596546b67ecf596bd33c15aee450adc461fb1d274bde2ff747ffa73033281fe9cfa61b511888760ff2cf9a017a3921e9a73520a50b152ca94
-  data.tar.gz: 12d400337473db4c91e0e956974eacfbb5e3a6ccd873747323c5ff849a6df3416a05c3cd3a6603eb1d06893e7bb94c47fd6702fa835f4d02158084645d26cacd
+  metadata.gz: eff2f889f6f0c1fc3edcbcae5ef61c9742511d5e455eb67cd76c8452f0e36762392ab292d4a1a6cfc58ba3bda1d2bac481f0a514dc6dbd275f965ccb5d48c436
+  data.tar.gz: eddef0aa5ec9034aa877e933b15e44e4faba35dafc2baf2bc1b925e420ad6cfad71d2fc4e52b52ab28974f431d4cd4c4bdd7a60cd4c1f4d68b7fa0277dabdad8

data/app/assets/javascripts/bastion/auth/auth.module.js

@@ -5,7 +5,7 @@
  * @description
  *   Module for auth functionality.
  */
-angular.module('Bastion.auth', ['Bastion']);
+angular.module('Bastion.auth', []);
 
 /**
  * @ngdoc object

data/app/assets/javascripts/bastion/auth/authorization.service.js

@@ -32,4 +32,8 @@ angular.module('Bastion.auth').service('Authorization', ['CurrentUser', 'Permiss
     this.denied = function (permissionName, model) {
         return !this.permitted(permissionName, model);
     };
+
+    this.getCurrentUser = function () {
+        return CurrentUser;
+    };
 }]);

data/app/assets/javascripts/bastion/bastion-bootstrap.js

@@ -13,5 +13,6 @@ BASTION_MODULES = [
     'Bastion.auth',
     'Bastion.menu',
     'Bastion.i18n',
-    'Bastion.features'
+    'Bastion.features',
+    'Bastion.routing'
 ];

data/app/assets/javascripts/bastion/bastion.js

@@ -14,7 +14,7 @@
 //= require "angular-rails-templates"
 
 //= require "bastion/bastion.module"
-//= require "bastion/bastion-resource.factory"
+//= require "bastion/routing.module.js"
 
 //= require "bastion/i18n/i18n.module"
 //= require "bastion/i18n/translate.service.js"

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

@@ -6,20 +6,13 @@
  *   Base module that defines the Katello module namespace and includes any thirdparty
  *   modules used by the application.
  */
-angular.module('Bastion', [
-    'ui.router',
-    'ngResource',
-    'Bastion.i18n',
-    'Bastion.components'
-]);
+angular.module('Bastion', []);
 
 /**
  * @ngdoc config
  * @name  Bastion.config
  *
  * @requires $httpProvider
- * @requires $urlRouterProvider
- * @requires $locationProvider
  * @requires $provide
  * @requires BastionConfig
  *
@@ -28,57 +21,13 @@ angular.module('Bastion', [
  *   to every request and adding Xs to translated strings.
  */
 angular.module('Bastion').config(
-    ['$httpProvider', '$urlRouterProvider', '$locationProvider', '$provide', 'BastionConfig',
-    function ($httpProvider, $urlRouterProvider, $locationProvider, $provide, BastionConfig) {
-        var oldBrowserBastionPath = '/bastion#';
-
+    ['$httpProvider', '$provide', 'BastionConfig',
+    function ($httpProvider, $provide, BastionConfig) {
         $httpProvider.defaults.headers.common = {
             Accept: 'application/json, text/plain, version=2; */*',
             'X-CSRF-TOKEN': angular.element('meta[name=csrf-token]').attr('content')
         };
 
-        $urlRouterProvider.rule(function ($injector, $location) {
-            var $sniffer = $injector.get('$sniffer'),
-                $window = $injector.get('$window'),
-                path = $location.path();
-
-            if (!$sniffer.history) {
-                $window.location.href = oldBrowserBastionPath + $location.path();
-            }
-
-            if (/^\/katello($|\/)/.test(path)) {
-                $window.location.href = $location.url();
-                $window.location.reload();
-            }
-
-            // removing trailing slash to prevent endless redirect
-            if (path[path.length - 1] === '/') {
-                return path.slice(0, -1);
-            }
-        });
-
-        $urlRouterProvider.otherwise(function ($injector, $location) {
-            var $window = $injector.get('$window'),
-                $state = $injector.get('$state'),
-                parentState = $location.path().split('/')[1].replace('_', '-'),
-                url = $location.absUrl();
-
-            // ensure we don't double encode +s
-            url = url.replace(/%2B/g, "+");
-
-            // Remove the old browser path if present
-            url = url.replace(oldBrowserBastionPath, '');
-
-            if ($state.get(parentState)) {
-                $window.location.href = '/404';
-            } else {
-                $window.location.href = url;
-            }
-            return $location.path();
-        });
-
-        $locationProvider.html5Mode({enabled: true, requireBase: false});
-
         $provide.factory('PrefixInterceptor', ['$q', '$templateCache', function ($q, $templateCache) {
             return {
                 request: function (config) {

data/app/assets/javascripts/bastion/components/components.module.js

@@ -9,6 +9,6 @@
      *   Cross application re-usable components
      */
     angular
-        .module('Bastion.components', []);
+        .module('Bastion.components', ['ngResource', 'Bastion.utils']);
 
 })();

data/app/assets/javascripts/bastion/components/current-tasks.directive.js

@@ -3,7 +3,7 @@
  * @name Bastion.components.directive:currentTasks
  *
  * @requires $document
- * @requires CurrentUser
+ * @requires authorizationService
  * @requires Task
  *
  * @description
@@ -14,8 +14,8 @@
     <span current-tasks></span>
  */
 angular.module('Bastion.components').directive('currentTasks',
-    ['$document', 'CurrentUser', 'Task',
-    function ($document, CurrentUser, Task) {
+    ['$document', 'authorizationService', 'Task',
+    function ($document, authorizationService, Task) {
 
         return {
             restrict: 'A',
@@ -26,7 +26,7 @@ angular.module('Bastion.components').directive('currentTasks',
                 // Hide the current tasks list if the user clicks outside of it
                 var currentTasksMenu = angular.element('#currentTasks');
                 $scope.visible = false;
-                $scope.currentUser = CurrentUser;
+                $scope.currentUser = authorizationService.getCurrentUser();
                 $scope.count = 0;
 
                 $scope.toggleVisibility = function () {
@@ -48,7 +48,8 @@ angular.module('Bastion.components').directive('currentTasks',
                 });
             }],
             link: function (scope) {
-                Task.registerSearch({ 'active_only': true, 'type': 'user', 'user_id': CurrentUser.id}, scope.updateTasks);
+                var searchParams = {'active_only': true, 'type': 'user', 'user_id': authorizationService.getCurrentUser().id};
+                Task.registerSearch(searchParams, scope.updateTasks);
             }
         };
     }]);

data/app/assets/javascripts/bastion/i18n/i18n.module.js

@@ -6,6 +6,5 @@
  *   Module for internationalization.
  */
 angular.module('Bastion.i18n', [
-    'gettext',
-    'Bastion'
+    'gettext'
 ]);

data/app/assets/javascripts/bastion/menu/menu.module.js

@@ -6,6 +6,5 @@
  *   Module for menu related functionality.
  */
 angular.module('Bastion.menu', [
-    'Bastion',
     'Bastion.components'
 ]);

data/app/assets/javascripts/bastion/routing.module.js

@@ -0,0 +1,81 @@
+angular.module('Bastion.routing', ['ui.router']);
+
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc config
+     * @name  Bastion.routing.config
+     *
+     * @requires $urlRouterProvider
+     * @requires $locationProvider
+     *
+     * @description
+     *   Routing configuration for Bastion.
+     */
+    function bastionRouting($urlRouterProvider, $locationProvider) {
+        var oldBrowserBastionPath = '/bastion#', getRootPath;
+
+        getRootPath = function (path) {
+            var rootPath = null;
+
+            if (path && angular.isString(path)) {
+                rootPath = path.replace('_', '-').split('/')[1];
+            }
+            return rootPath;
+        };
+
+        $urlRouterProvider.rule(function ($injector, $location) {
+            var $sniffer = $injector.get('$sniffer'),
+                $window = $injector.get('$window'),
+                path = $location.path();
+
+            if (!$sniffer.history) {
+                $window.location.href = oldBrowserBastionPath + $location.path();
+            }
+
+            // removing trailing slash to prevent endless redirect
+            if (path[path.length - 1] === '/') {
+                return path.slice(0, -1);
+            }
+        });
+
+        $urlRouterProvider.otherwise(function ($injector, $location) {
+            var $window = $injector.get('$window'),
+                $state = $injector.get('$state'),
+                rootPath = getRootPath($location.path()),
+                url = $location.absUrl(),
+                foundParentState;
+
+            // ensure we don't double encode +s
+            url = url.replace(/%2B/g, "+");
+
+            // Remove the old browser path if present
+            url = url.replace(oldBrowserBastionPath, '');
+
+            if (rootPath) {
+                foundParentState = _.find($state.get(), function (state) {
+                    var found = false;
+                    if (state.url) {
+                        found = getRootPath(state.url) === rootPath;
+                    }
+
+                    return found;
+                });
+            }
+
+            if (foundParentState) {
+                $window.location.href = '/404';
+            } else {
+                $window.location.href = url;
+            }
+            return $location.path();
+        });
+
+        $locationProvider.html5Mode(true);
+
+    }
+
+    angular.module('Bastion.routing').config(bastionRouting);
+    bastionRouting.$inject = ['$urlRouterProvider', '$locationProvider'];
+})();

data/app/assets/javascripts/bastion/{bastion-resource.factory.js → utils/bastion-resource.factory.js}

@@ -1,18 +1,17 @@
 /**
  * @ngdoc factory
- * @name  Bastion.factory:BastionResource
+ * @name  Bastion.utils.factory:BastionResource
  *
- * @requires BastionResource
+ * @requires $resource
  *
  * @description
  *   Base module that defines the Katello module namespace and includes any thirdparty
  *   modules used by the application.
  */
-angular.module('Bastion').factory('BastionResource', ['$resource', function ($resource) {
+angular.module('Bastion.utils').factory('BastionResource', ['$resource', function ($resource) {
 
     return function (url, paramDefaults, actions) {
         var defaultActions;
-
         defaultActions = {
             queryPaged: {method: 'GET', isArray: false},
             queryUnpaged: {method: 'GET', isArray: false, params: {'full_result': true}}

data/app/assets/javascripts/bastion/utils/utils.module.js

@@ -5,4 +5,4 @@
  * @description
  *   Module for common utilities.
  */
-angular.module('Bastion.utils', ['Bastion', 'uuid4']);
+angular.module('Bastion.utils', ['uuid4', 'ngResource']);

data/app/views/bastion/layouts/application.html.erb

@@ -1,3 +1,7 @@
+<% content_for(:head) do %>
+    <base href="/bastion"/>
+<% end %>
+
 <% content_for(:content) do %>
   <div class="article maincontent bastion" data-no-turbolink="true">
     <section class="container-fluid">

data/app/views/bastion/layouts/assets.html.erb

@@ -16,13 +16,13 @@
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
-    angular.module('Bastion').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
-    angular.module('Bastion').value('CurrentUser', {
-      id: <%= User.current.id %>,
-      admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
-    });
     angular.module('Bastion').value('markActiveMenu', mark_active_menu);
     angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
+    angular.module('Bastion.auth').value('CurrentUser', {
+        id: <%= User.current.id %>,
+        admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
+    });
+    angular.module('Bastion.auth').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
   </script>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= javascript_include_tag(plugin[:javascript]) %>

data/grunt/karma.js

@@ -33,7 +33,7 @@ module.exports = {
 
             basePath + 'app/assets/javascripts/bastion/bastion-bootstrap.js',
             basePath + 'app/assets/javascripts/bastion/bastion.module.js',
-            basePath + 'app/assets/javascripts/bastion/bastion-resource.factory.js',
+            basePath + 'app/assets/javascripts/bastion/routing.module.js',
             basePath + 'app/assets/javascripts/bastion/i18n/i18n.module.js',
             basePath + 'app/assets/javascripts/bastion/i18n/*.js',
             basePath + 'app/assets/javascripts/bastion/auth/auth.module.js',

data/lib/bastion/version.rb

@@ -1,3 +1,3 @@
 module Bastion
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 end

data/test/auth/authorization.service.test.js

@@ -47,4 +47,8 @@ describe('Service:Authorization', function() {
             });
         });
     });
+
+    it("returns the current user", function () {
+        expect(Authorization.getCurrentUser()).toBe(CurrentUser);
+    });
 });

data/test/bastion/test-constants.js

@@ -1,13 +1,13 @@
 angular.module('Bastion').value('currentLocale', 'Here');
 angular.module('Bastion').value('CurrentOrganization', "ACME");
-angular.module('Bastion').value('CurrentUser', {id: "User"});
-angular.module('Bastion').value('Permissions', []);
 angular.module('Bastion').value('Authorization', {});
 angular.module('Bastion').value('markActiveMenu', function () {});
 angular.module('Bastion').constant('BastionConfig', {
     consumerCertRPM: "consumer_cert_rpm",
     markTranslated: false
 });
+angular.module('Bastion.auth').value('CurrentUser', {id: "User"});
+angular.module('Bastion.auth').value('Permissions', []);
 
 angular.module('templates', []);
 

data/test/components/bst-bookmark.factory.test.js

@@ -3,7 +3,7 @@ describe('Factory: BstBookmark', function() {
         bookmarks,
         BstBookmark;
 
-    beforeEach(module('Bastion', 'Bastion.components'));
+    beforeEach(module('Bastion.components'));
 
     beforeEach(module(function() {
         bookmarks = {

data/test/routing.module.test.js

@@ -0,0 +1,70 @@
+describe('config: Bastion.routing', function () {
+    var $rootScope, $location, $sniffer, $window, $state;
+
+    function goTo(url) {
+        $location.url(url);
+        $rootScope.$digest();
+    }
+
+    beforeEach(module('Bastion.routing'));
+
+    beforeEach(module(function ($provide) {
+        $sniffer = {
+            history: true
+        };
+
+        $window = {
+            location: {
+                href: '',
+                reload: function () {}
+            }
+        };
+
+        $provide.value('$sniffer', $sniffer);
+        $provide.value('$window', $window);
+    }));
+
+    beforeEach(inject(function (_$rootScope_, _$state_, _$location_) {
+        $rootScope = _$rootScope_;
+        $state = _$state_;
+        $location = _$location_;
+    }));
+
+    describe("provides a rule that", function () {
+        it("removes any trailing slashes from the url", function () {
+            goTo('/state///');
+            expect($window.location.href).toBe('http://server/state');
+        });
+    });
+
+    describe("provides an otherwise method that", function () {
+        it('replaces encoded + characters with their decoded counterpart', function () {
+            goTo('/some-state%2B%2B');
+            expect($window.location.href).toBe('http://server/some-state++');
+        });
+
+        it('removes the old browser compatibility path', function () {
+            spyOn($location, 'absUrl').and.returnValue('http://server/bastion#/some-state');
+            goTo('/some-state');
+            expect($window.location.href).toBe('http://server/some-state');
+        });
+
+        describe("handles undefined states by", function () {
+            beforeEach(function () {
+
+            });
+
+            it("redirecting to a 404 page if the parent state is found", function () {
+                spyOn($state, 'get').and.returnValue([{url: '/found-state'}]);
+                goTo('/found_state/does_not_exist');
+                expect($window.location.href).toBe('/404');
+            });
+
+            it("redirecting to the url if no parent state is found", function () {
+                goTo('/non-parent');
+                expect($window.location.href).toBe('http://server/non-parent');
+            });
+
+        });
+    });
+});

data/test/{bastion → utils}/bastion-resource.factory.test.js

@@ -1,7 +1,7 @@
 describe('Factory: BastionResource', function() {
     var resource;
 
-    beforeEach(module('Bastion'));
+    beforeEach(module('Bastion.utils'));
 
     beforeEach(inject(function($injector) {
         resource = $injector.get('BastionResource');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -57,7 +57,6 @@ files:
 - app/assets/javascripts/bastion/auth/auth.module.js
 - app/assets/javascripts/bastion/auth/authorization.service.js
 - app/assets/javascripts/bastion/bastion-bootstrap.js
-- app/assets/javascripts/bastion/bastion-resource.factory.js
 - app/assets/javascripts/bastion/bastion.js
 - app/assets/javascripts/bastion/bastion.module.js
 - app/assets/javascripts/bastion/components/bst-alert.directive.js
@@ -144,6 +143,8 @@ files:
 - app/assets/javascripts/bastion/layouts/select-all-results.html
 - app/assets/javascripts/bastion/menu/menu-expander.service.js
 - app/assets/javascripts/bastion/menu/menu.module.js
+- app/assets/javascripts/bastion/routing.module.js
+- app/assets/javascripts/bastion/utils/bastion-resource.factory.js
 - app/assets/javascripts/bastion/utils/form-utils.service.js
 - app/assets/javascripts/bastion/utils/urlencode.filter.js
 - app/assets/javascripts/bastion/utils/utils.module.js
@@ -178,7 +179,6 @@ files:
 - lib/bastion/version.rb
 - package.json
 - test/auth/authorization.service.test.js
-- test/bastion/bastion-resource.factory.test.js
 - test/bastion/test-constants.js
 - test/components/bst-alert.directive.test.js
 - test/components/bst-alerts.directive.test.js
@@ -210,7 +210,9 @@ files:
 - test/features/feature-flag.service.test.js
 - test/i18n/translate.service.test.js
 - test/menu/menu-expander.service.test.js
+- test/routing.module.test.js
 - test/test-mocks.module.js
+- test/utils/bastion-resource.factory.test.js
 - test/utils/form-utils.service.test.js
 - test/utils/urlencode.filter.test.js
 - vendor/assets/javascripts/bastion/angular-animate/angular-animate.js
@@ -1031,11 +1033,12 @@ test_files:
 - test/components/global-notification.service.test.js
 - test/components/bst-edit.directive.test.js
 - test/components/bst-modal.directive.test.js
+- test/routing.module.test.js
 - test/test-mocks.module.js
 - test/menu/menu-expander.service.test.js
 - test/i18n/translate.service.test.js
 - test/bastion/test-constants.js
-- test/bastion/bastion-resource.factory.test.js
 - test/utils/form-utils.service.test.js
+- test/utils/bastion-resource.factory.test.js
 - test/utils/urlencode.filter.test.js
 has_rdoc: