conjur-asset-ui 1.3.2 → 1.4.2

data/public/js/models/hostRecord.js

@@ -1,3 +1,5 @@
+/* global conjur, async */
+
 (function(conjur, async, errback) {
     'use strict';
 
@@ -18,29 +20,32 @@
     Host.prototype = Object.create(Generic.prototype);
     Host.prototype.constructor = Host;
 
-    Host.prototype.fetch = function(callback, custom_errback) {
-        var self = this,
-            id = this.id;
+    Host.prototype.fetch = function(callback, customErrback) {
+        var self = this;
 
-        if (typeof(custom_errback) === 'undefined') {
-            custom_errback = errback; // reset to default
+        if (typeof(customErrback) === 'undefined') {
+            customErrback = errback; // reset to default
         }
 
         async.parallel([
             this.attributes.bind(this),
             this.ownedResources.bind(this),
             this.allRoles.bind(this),
-            this.resource.bind(this)
+            this.resource.bind(this),
+            this.auditRole.bind(this),
+            this.auditResource.bind(this)
         ], function(err, results) {
             if (err) {
-                return custom_errback(err.status);
+                return customErrback(err.status);
             }
 
             callback({
                 host: results[0],
                 owned: results[1],
                 roles: results[2],
-                annotations: results[3].annotations
+                annotations: results[3].annotations,
+                owner: results[3].owner,
+                audit: self.mergeAudit(results[4], results[5])
             });
 
             return undefined;

data/public/js/models/layerRecord.js

@@ -1,3 +1,5 @@
+/* global conjur, jQuery, _, async */
+
 (function(conjur, $, _, async, errback) {
     'use strict';
 
@@ -18,22 +20,21 @@
     Layer.prototype = Object.create(Generic.prototype);
     Layer.prototype.constructor = Layer;
 
-    Layer.prototype.fetch = function(callback, custom_errback) {
-        var self = this,
-            id = this.id;
+    Layer.prototype.fetch = function(callback, customErrback) {
+        var id = this.id;
 
-        if (typeof(custom_errback) === 'undefined') {
-            custom_errback = errback; // reset to default
+        if (typeof(customErrback) === 'undefined') {
+            customErrback = errback; // reset to default
         }
 
         function members(role) {
             return function(cb) {
                 $.ajax({
-                    url: '/api/authz/'
-                        + conjur.app.configuration.account
-                        + '/roles/'
-                        + role
-                        + '?members',
+                    url: '/api/authz/' +
+                        conjur.app.configuration.account +
+                        '/roles/' +
+                        role +
+                        '?members',
                     success: function(result) {
                         cb(null, result);
                     },
@@ -51,7 +52,7 @@
             this.resource.bind(this)
         ], function(err, results) {
             if (err) {
-                return custom_errback(err.status);
+                return customErrback(err.status);
             }
 
             callback({
@@ -60,7 +61,8 @@
                 users: _.pluck(results[2], 'member'),
                 admins: _.pluck(results[3], 'member'),
                 roles: results[4],
-                annotations: results[5].annotations
+                annotations: results[5].annotations,
+                owner: results[5].owner
             });
 
             return undefined;

data/public/js/models/namespace.js

@@ -1,3 +1,5 @@
+/* global conjur */
+
 (function(conjur) {
     'use strict';
 

data/public/js/models/policyList.js

@@ -1,9 +1,11 @@
+/* global conjur */
+
 (function(conjur) {
     'use strict';
 
     conjur.models.PolicyList = function() {
         var options = {
-            namespaceSelector: function(member) {
+            namespaceSelector: function() {
                 return null;
             }
         };

data/public/js/models/policyRecord.js

@@ -1,3 +1,5 @@
+/* global conjur, async */
+
 (function(conjur, async, errback) {
     'use strict';
 
@@ -18,12 +20,9 @@
     Policy.prototype = Object.create(Generic.prototype);
     Policy.prototype.constructor = Policy;
 
-    Policy.prototype.fetch = function(callback, custom_errback) {
-        var self = this,
-            id = this.id;
-
-        if (typeof(custom_errback) == 'undefined') {
-            custom_errback = errback; // reset to default
+    Policy.prototype.fetch = function(callback, customErrback) {
+        if (typeof(customErrback) === 'undefined') {
+            customErrback = errback; // reset to default
         }
 
         async.parallel([
@@ -32,14 +31,15 @@
             this.allRoles.bind(this)
         ], function(err, results) {
             if (err) {
-                return custom_errback(err.status);
+                return customErrback(err.status);
             }
 
             callback({
                 policy: results[0],
                 owned: results[1],
                 roles: results[2],
-                annotations: results[0].annotations
+                annotations: results[0].annotations,
+                owner: results[0].owner
             });
 
             return undefined;

data/public/js/models/record.js

@@ -1,4 +1,6 @@
-(function(conjur, $, errback) {
+/* global conjur, jQuery, _ */
+
+(function(conjur, $, errback, _) {
     'use strict';
 
     var Generic = this.Generic = function(kind, id) {
@@ -6,49 +8,78 @@
         this.id = id;
     };
 
-    function ajax(url, callback) {
+    function ajax(url, callback, err) {
         $.ajax({
             url: url,
             success: function(data) {
                 callback(null, data);
             },
-            error: callback
+            error: err || callback
         });
     }
 
     Generic.prototype.attributes = function(callback) {
         var id = this.id;
 
-        ajax('/api/'
-             + conjur.utils.pluralize(this.kind)
-             + '/'
-             + window.encodeURIComponent(id),
+        ajax('/api/'+
+             conjur.utils.pluralize(this.kind) +
+             '/' +
+             window.encodeURIComponent(id),
              callback);
     };
 
+    Generic.prototype.auditRole = function(callback) {
+        var id = this.id;
+
+        ajax('/api/audit/roles/' +
+             window.encodeURIComponent(conjur.app.configuration.account +
+                                       ':' + this.kind + ':' + id),
+             callback,
+             function() {
+                 return callback(null, []);
+             });
+    };
+
+    Generic.prototype.auditResource = function(callback) {
+        var id = this.id;
+
+        ajax('/api/audit/resources/' +
+             window.encodeURIComponent(conjur.app.configuration.account +
+                                       ':' + this.kind + ':' + id),
+             callback,
+             function() {
+                 return callback(null, []);
+             });
+    };
+
+    Generic.prototype.mergeAudit = function(d1, d2) {
+        return _.uniq(d1.concat(d2), function(item, key, a) {
+            return item.id;
+        });
+    };
+
     Generic.prototype.resource = function(callback) {
-        ajax('/api/authz/'
-             + conjur.app.configuration.account
-             + '/resources/'
-             + this.kind
-             + '/'
-             + window.encodeURIComponent(this.id),
+        ajax('/api/authz/' +
+             conjur.app.configuration.account +
+             '/resources/' +
+             this.kind +
+             '/' +
+             window.encodeURIComponent(this.id),
              callback);
     };
 
     Generic.prototype.ownedResources = function(callback) {
-        var id = this.id;
         var roleid = [this.kind, this.id].join(':');
 
-        ajax('/api/authz/'
-             + conjur.app.configuration.account
-             + '/resources?owner='
-             + roleid,
+        ajax('/api/authz/' +
+             conjur.app.configuration.account +
+             '/resources?owner=' +
+             roleid,
              function(err, result) {
                  if (typeof result.filter === 'function') {
                      result = result.filter(function(item) {
                          // assets of 'secret' kind are internal
-                         return item.id.split(':')[1] != 'secret';
+                         return item.id.split(':')[1] !== 'secret';
                      });
                  }
 
@@ -57,13 +88,13 @@
     };
 
     Generic.prototype.allRoles = function(callback) {
-        ajax('/api/authz/'
-             + conjur.app.configuration.account
-             + '/roles/'
-             + window.encodeURIComponent(this.kind)
-             + '/'
-             + window.encodeURIComponent(this.id)
-             + '?all',
+        ajax('/api/authz/' +
+             conjur.app.configuration.account +
+             '/roles/' +
+             window.encodeURIComponent(this.kind) +
+             '/' +
+             window.encodeURIComponent(this.id) +
+             '?all',
              callback);
     };
 
@@ -81,5 +112,6 @@
 (
     conjur,
     jQuery,
-    conjur.utils.errback
+    conjur.utils.errback,
+    _
 );

data/public/js/models/resourceList.js

@@ -1,20 +1,23 @@
+/* global conjur, jQuery, _ */
+
 (function(conjur, $, _) {
     'use strict';
 
-    conjur.models.ResourceList = function(kind, options) {
+    this.ResourceList = function(kind, options) {
         var List = function() {
             this._members = null;
             this.namespaces = null;
             this.options = options || {};
 
-            if ( !this.options.idSelector ) {
+            if (!this.options.idSelector) {
                 this.options.idSelector = function(member) {
                     var idTokens = member.id.split(':');
+
                     return idTokens[idTokens.length-1];
                 };
             }
 
-            if ( !this.options.namespaceSelector ) {
+            if (!this.options.namespaceSelector) {
                 this.options.namespaceSelector = function(member) {
                     return member.identifier.split('/')[0];
                 };
@@ -24,7 +27,7 @@
         List.prototype.members = function(namespace) {
             var result;
 
-            if ( namespace === "" ) {
+            if (namespace === '') {
                 result = _.clone(this._members);
             } else {
                 result = this._members.filter(function(o) {
@@ -38,32 +41,47 @@
         };
 
         List.prototype.fetch = function(callback) {
-            if ( this._members )
+            if (this._members) {
                 return callback(this);
+            }
 
             var self = this;
 
             $.ajax({
-                url: "/api/authz/" + encodeURIComponent(conjur.app.configuration.account) + "/resources/" + encodeURIComponent(kind),
+                url: '/api/authz/' +
+                    window.encodeURIComponent(conjur.app.configuration.account) +
+                    '/resources/' +
+                    window.encodeURIComponent(kind),
                 success: function(data) {
-                    var filter, idSelector;
+                    var filter = this.options.filter;
 
-                    if ( filter = this.options.filter ) {
+                    if (filter) {
                         data = _.filter(data, filter);
                     }
 
                     self._members = data;
+
                     self._members.forEach(function(member) {
                         member.identifier = this.options.idSelector(member);
                     }.bind(this));
-                    self.namespaces = _.unique(self._members.map(this.options.namespaceSelector)).sort();
+
+                    self.namespaces = _.unique(
+                        self._members.map(this.options.namespaceSelector)
+                    ).sort();
+
                     callback(self);
                 }.bind(this)
             });
 
+            return undefined;
         };
 
         return new List();
     };
 
-})(conjur, jQuery, _);
+}).bind(conjur.models)
+(
+    conjur,
+    jQuery,
+    _
+);

data/public/js/models/userList.js

@@ -1,7 +1,9 @@
+/* global conjur */
+
 (function(conjur) {
     'use strict';
 
-    conjur.models.UserList = function() {
+    this.UserList = function() {
         var options = {
             namespaceSelector: function(member) {
                 var idTokens = member.id.split('@');
@@ -17,4 +19,7 @@
         return conjur.models.ResourceList('user', options);
     };
 
-})(conjur);
+}).bind(conjur.models)
+(
+    conjur
+);

data/public/js/models/userRecord.js

@@ -1,3 +1,5 @@
+/* global conjur, jQuery, async */
+
 (function(conjur, $, async, errback) {
     'use strict';
 
@@ -18,7 +20,7 @@
     User.prototype = Object.create(Generic.prototype);
     User.prototype.constructor = User;
 
-    User.prototype.publicKeys = function(callback, custom_errback) {
+    User.prototype.publicKeys = function(callback) {
         $.ajax({
             url: '/api/pubkeys/' + window.encodeURIComponent(this.id),
             success: function(data) {
@@ -30,12 +32,11 @@
         });
     };
 
-    User.prototype.fetch = function(callback, custom_errback) {
-        var self = this,
-            id = this.id;
+    User.prototype.fetch = function(callback, customErrback) {
+        var self = this;
 
-        if (typeof(custom_errback) === 'undefined') {
-            custom_errback = errback; // reset to default
+        if (typeof(customErrback) === 'undefined') {
+            customErrback = errback; // reset to default
         }
 
         async.parallel([
@@ -43,18 +44,22 @@
             this.ownedResources.bind(this),
             this.allRoles.bind(this),
             this.resource.bind(this),
-            this.publicKeys.bind(this)
+            this.publicKeys.bind(this),
+            this.auditRole.bind(this),
+            this.auditResource.bind(this)
         ], function(err, results) {
             if (err) {
-                return custom_errback(err.status);
+                return customErrback(err.status);
             }
 
             callback({
                 user: results[0],
                 owned: results[1],
                 roles: results[2],
+                owner: results[3].owner,
                 annotations: results[3].annotations,
-                pubkeys: results[4]
+                pubkeys: results[4],
+                audit: self.mergeAudit(results[5], results[6])
             });
 
             return undefined;