Lots of smaller fixes:

- Add the rotation_duration to the keys API
- Have the key service UI use the new rotation_duration field
- Fix notification deletion lookup path
- Add proper support for the new notification in the UI
- Only delete expired keys after 7 days (configurable)
- Fix angular digest loop
- Fix unit tests
- Regenerate initdb

endpoints/api/superuser.py

@@ -484,6 +484,7 @@ def key_view(key):
     'metadata': key.metadata,
     'created_date': key.created_date,
     'expiration_date': key.expiration_date,
+    'rotation_duration': key.rotation_duration,
     'approval': approval_view(key.approval) if key.approval is not None else None,
   }
 
@@ -562,6 +563,9 @@ class SuperUserServiceKeyManagement(ApiResource):
         except ValueError:
           abort(400)
 
+        if expiration_date <= datetime.now():
+          abort(400)
+
       # Create the metadata for the key.
       user = get_authenticated_user()
       metadata = body.get('metadata', {})
@@ -572,8 +576,8 @@ class SuperUserServiceKeyManagement(ApiResource):
       })
 
       # Generate a key with a private key that we *never save*.
-      (private_key, key) = model.service_keys.generate_service_key(body['service'], metadata,
-                                                                   expiration_date,
+      (private_key, key) = model.service_keys.generate_service_key(body['service'], expiration_date,
+                                                                   metadata=metadata,
                                                                    name=body.get('name', ''))
       # Auto-approve the service key.
       model.service_keys.approve_service_key(key.kid, user, ServiceKeyApprovalType.SUPERUSER,
@@ -670,6 +674,9 @@ class SuperUserServiceKey(ApiResource):
           except ValueError:
             abort(400)
 
+          if expiration_date <= datetime.now():
+            abort(400)
+
         key_log_metadata.update({
           'old_expiration_date': key.expiration_date,
           'expiration_date': expiration_date,