Merge pull request #728 from uw-it-aca/incident/access-renewal

renew delegate access

Author: mikeseibel

endorsement/dao/access.py

@@ -106,6 +106,26 @@ def store_access_record(
     return ar
 
 
+def renew_access(accessee, accessor, acted_as=None):
+    now = timezone.now()
+    ar = AccessRecord.objects.get(accessee=accessee, accessor=accessor)
+
+    ar.datetime_granted = now
+    ar.acted_as = acted_as
+    ar.datetime_emailed = None
+    ar.datetime_notice_1_emailed = None
+    ar.datetime_notice_2_emailed = None
+    ar.datetime_notice_3_emailed = None
+    ar.datetime_notice_4_emailed = None
+    ar.datetime_renewed = now if ar.is_deleted else None
+    ar.datetime_expired = None
+    is_reconcile = None
+    ar.is_deleted = None
+    ar.save()
+
+    return ar
+
+
 def revoke_access(accessee, accessor, right_id, acted_as=None):
     remove_delegate(accessee.netid, accessor.name, right_id)
     return _revoke_access_model(accessee, accessor, right_id, acted_as)

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

@@ -446,9 +446,7 @@ var ManageOfficeAccess = (function () {
             var context = {
                 action: "renew",
                 mailbox: $row.attr('data-mailbox'),
-                delegate: $row.attr('data-delegate'),
-                access_type: $('.access-type select option:selected', $row).val(),
-                access_type_name: $('.access-type select option:selected', $row).text()
+                delegate: $row.attr('data-delegate')
             };
 
             _displayModal("#confirm_renew_modal_content", context);
@@ -459,7 +457,7 @@ var ManageOfficeAccess = (function () {
 
                     Button.loading($button);
                     _modalDisable();
-                    _setAccessForDelegate(context);
+                    _updateAccessForDelegate(context);
                 });
             });
         },

endorsement/views/api/office/access.py

@@ -6,7 +6,8 @@
 from endorsement.dao.uwnetid_supported import get_supported_resources_for_netid
 from endorsement.dao.persistent_messages import get_persistent_messages
 from endorsement.dao.access import (
-    get_accessee_model, store_access, update_access, revoke_access)
+    get_accessee_model, store_access, update_access,
+    revoke_access, renew_access)
 from endorsement.dao.office import is_office_permitted, get_office_accessor
 from endorsement.views.rest_dispatch import (
     RESTDispatch, invalid_session, invalid_endorser, data_error)
@@ -99,6 +100,7 @@ def patch(self, request, *args, **kwargs):
         except InvalidNetID:
             return invalid_endorser(logger)
 
+        action = request.data.get('action', None)
         mailbox = request.data.get('mailbox', None)
         delegate = request.data.get('delegate', None)
         access_type = request.data.get('access_type', None)
@@ -111,9 +113,17 @@ def patch(self, request, *args, **kwargs):
         accessor = get_office_accessor(delegate)
 
         try:
-            access = update_access(
-                accessee, accessor, previous_access_type,
-                access_type, acted_as)
+            if action == 'renew':
+                access = renew_access(accessee, accessor, acted_as)
+                return self.json_response(access.json_data())
+            elif previous_access_type and access_type:
+                access = update_access(
+                    accessee, accessor, previous_access_type,
+                    access_type, acted_as)
+            else:
+                return self.error_response(404, message="Insufficient Data")
+        except AccessRecord.DoesNotExist:
+            return self.error_response(404, message="Unknown Access Record")
         except DataFailureException as ex:
             return self.error_response(ex.status, message=ex.msg)