Merge branch 'develop' into task/authoritative-msca-delegation

Author: mikeseibel

endorsement/static/endorsement/js/notify.js

@@ -66,7 +66,7 @@ var Notify = (function () {
         },
 
         error: function (msg) {
-            _notify(msg, 'alert-danger', 7000);
+            _notify(msg, 'alert-danger', 10000);
         },
 
         warning: function (msg) {

endorsement/static/endorsement/js/tab/office.js

@@ -65,12 +65,12 @@ var ManageOfficeAccess = (function () {
                 _confirmNetidRenewModal($row);
             }).on('click', 'input.access-conflict', function (e) {
                 var $this = $(this),
-                    $button = $this.closest('div.row').find('button#access_resolve');
+                    $button = $this.closest('td').find('button#access_resolve');
 
                 $button.prop('disabled', false);
             }).on('click', 'button#access_resolve', function (e) {
                 var $this = $(this),
-                    $checked = $this.closest('div.row').find('input.access-conflict:checked'),
+                    $checked = $this.closest('td').find('input.access-conflict:checked'),
                     mailbox = $this.attr('data-mailbox'),
                     delegate = $this.attr('data-delegate'),
                     right = $checked.val();
@@ -115,7 +115,7 @@ var ManageOfficeAccess = (function () {
             }).on('endorse:OfficeAccessResolveSuccess', function (e, data) {
                 _resolvedAccessModal(data);
             }).on('endorse:OfficeAccessResolveFailure', function (e, data) {
-                alert('Access Resolution failure: ' + data);
+                Notify.error('Access Resolve Error: ' + data);
             }).on('endorse:OfficeAccessTypesSuccess', function (e) {
                 _displayOfficeAccessTypes();
             }).on('endorse:OfficeAccessTypesFailure', function (e, data) {
@@ -252,7 +252,7 @@ var ManageOfficeAccess = (function () {
                     $panel.trigger('endorse:OfficeDelegatableSuccess', [results]);
                 },
                 error: function(xhr, status, error) {
-                    $panel.trigger('endorse:OfficeDelegatableFailure', [error]);
+                    $panel.trigger('endorse:OfficeDelegatableFailure', [_error_message(xhr)]);
                 }
             });
         },
@@ -286,7 +286,7 @@ var ManageOfficeAccess = (function () {
                     $panel.trigger('endorse:OfficeValidateNetIDsSuccess', [results]);
                 },
                 error: function(xhr, status, error) {
-                    $panel.trigger('endorse:OfficeValidateNetIDsFailure', [error]);
+                    $panel.trigger('endorse:OfficeValidateNetIDsFailure', [_error_message(xhr)]);
                 }
             });
         },
@@ -642,7 +642,7 @@ var ManageOfficeAccess = (function () {
                     $panel.trigger('endorse:OfficeDelegateAccessSuccess', [results]);
                 },
                 error: function(xhr, status, error) {
-                    $panel.trigger('endorse:OfficeDelegateAccessFailure', [context, error]);
+                    $panel.trigger('endorse:OfficeDelegateAccessFailure', [context, _error_message(xhr)]);
                 }
             });
         },
@@ -662,7 +662,7 @@ var ManageOfficeAccess = (function () {
                     $panel.trigger('endorse:OfficeDelegateRevokeSuccess', [results]);
                 },
                 error: function(xhr, status, error) {
-                    $panel.trigger('endorse:OfficeDelegateRevokeFailure', [context, error]);
+                    $panel.trigger('endorse:OfficeDelegateRevokeFailure', [context, _error_message(xhr)]);
                 }
             });
         },
@@ -733,7 +733,7 @@ var ManageOfficeAccess = (function () {
                     $event_panel.trigger('endorse:OfficeAccessTypesSuccess');
                 },
                 error: function(xhr, status, error) {
-                    $event_panel.trigger('endorse:OfficeAccessTypesFailure', [error]);
+                    $event_panel.trigger('endorse:OfficeAccessTypesFailure', [_error_message(xhr)]);
                 }
             });
         },
@@ -757,11 +757,32 @@ var ManageOfficeAccess = (function () {
                     $panel.trigger('endorse:OfficeAccessResolveSuccess', [results]);
                 },
                 error: function(xhr, status, error) {
-                    $panel.trigger('endorse:OfficeAccessResolveFailure', [error]);
+                    $panel.trigger('endorse:OfficeAccessResolveFailure', [_error_message(xhr)]);
                 }
             });
 
         },
+        _error_message = function (xhr) {
+            var xhr_content_type = xhr.getResponseHeader('content-type');
+
+            if (xhr_content_type === 'application/json') {
+                if (xhr.responseJSON.hasOwnProperty('error')) {
+                    var error = xhr.responseJSON.error;
+
+                    if (typeof(error) === 'string') {
+                        return error;
+                    } else if (typeof(error) === 'object') {
+                        if (error.hasOwnProperty('error')) {
+                            return error.error;
+                        } else if (error.hasOwnProperty('msg')) {
+                            return error.msg;
+                        }
+                    }
+                }
+            }
+
+            return xhr.statusText;
+        },
         _scrollNetIDIntoView = function (netid) {
             Scroll.scrollToNetid(netid, '.office-access-table');
         },

endorsement/views/api/office/access.py

@@ -16,6 +16,7 @@
 from endorsement.util.auth import is_support_user
 from uw_msca.access_rights import get_access_rights
 from restclients_core.exceptions import DataFailureException
+import json
 import logging
 
 
@@ -95,10 +96,7 @@ def post(self, request, *args, **kwargs):
             access = store_access(
                 accessee, accessor, access_type, acted_as)
         except DataFailureException as ex:
-            logger.error(
-                f"Access.post {ex.url} FAILURE data: {request.data} "
-                f"status: {ex.msg} ({ex.status})")
-            return self.error_response(ex.status, message=ex.msg)
+            return self._msca_dfe_response('Access.post', request.data, ex)
 
         return self.json_response(access.json_data())
 
@@ -138,15 +136,13 @@ def patch(self, request, *args, **kwargs):
             else:
                 logger.error(
                     f"Access.patch missing parameter: {request.data}")
-                return self.error_response(404, message="Insufficient Data")
+                return self.error_response(400, message="Insufficient Data")
         except AccessRecord.DoesNotExist:
             logger.error(
                 f"Access.patch missing access record: {request.data}")
-            return self.error_response(404, message="Unknown Access Record")
+            return self.error_response(400, message="Unknown Access Record")
         except DataFailureException as ex:
-            logger.error(
-                f"Access.patch request: '{ex.url}' ({ex.status}): {ex.msg}")
-            return self.error_response(ex.status, message=ex.msg)
+            return self._msca_dfe_response('Access.patch', request.data, ex)
 
         return self.json_response(access.json_data())
 
@@ -168,9 +164,7 @@ def delete(self, request, *args, **kwargs):
         try:
             access = revoke_access(accessee, accessor, access_type, acted_as)
         except DataFailureException as ex:
-            logger.error(
-                f"Access.delete request: {ex.url} ({ex.status}): {ex.msg}")
-            return self.error_response(ex.status, message=ex.msg)
+            return self._msca_dfe_response('Access.delete', request.data, ex)
 
         return self.json_response(access.json_data())
 
@@ -205,6 +199,21 @@ def _is_valid_accessor(self, supported):
             supported.is_shared_netid()
             or supported.netid_type in ['administrator', 'support']))
 
+    def _msca_dfe_response(self, method, request_data, ex):
+        logger.error(
+            f"{method} {ex.url} FAILURE data: {request_data} "
+            f"response: {ex.msg} ({ex.status})")
+
+        message = ex.msg
+        if type(message) == bytes:
+            try:
+                json_content = json.loads(message.decode('utf-8'))
+                message = json_content.get('msg', 'Server Error')
+            except Exception as e:
+                pass
+
+        return self.error_response(ex.status, message)
+
 
 class AccessRights(RESTDispatch):
     """