entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 33 Releases Activity

api: drop legacy OU api filter (#63368)

This commit is contained in:
Valentin Deniaud 2023-02-21 15:32:38 +01:00
parent 2b3cd08e42
commit 104b33fb88
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/authentic2/api_views.py
View File

@ -1598,7 +1598,6 @@ class StatisticsSerializer(serializers.Serializer):
service = ServiceOUField(child=serializers.SlugField(max_length=256), required=False)
services_ou = serializers.SlugField(required=False, allow_blank=False, max_length=256)
users_ou = serializers.SlugField(required=False, allow_blank=False, max_length=256)
ou = serializers.SlugField(required=False, allow_blank=False, max_length=256) # legacy
start = serializers.DateTimeField(required=False, input_formats=['iso-8601', '%Y-%m-%d'])
end = serializers.DateTimeField(required=False, input_formats=['iso-8601', '%Y-%m-%d'])
@ -1706,7 +1705,7 @@ class StatisticsAPI(ViewSet):
allowed_filters = getattr(self, self.action).filters
service = data.get('service')
services_ou = data.get('services_ou') or data.get('ou') # legacy 'ou' filter
services_ou = data.get('services_ou')
users_ou = data.get('users_ou')
if service and 'service' in allowed_filters:

5
tests/api/test_all.py
View File

@ -2730,11 +2730,6 @@ def test_api_statistics(app, admin, freezer, event_type_name, event_name):
assert resp.json['data']['x_labels'] == ['2020-02', '2020-03']
assert resp.json['data']['series'] == [{'label': 'password', 'data': [1, 1]}]
# legacy way to filter by service OU
services_ou_data = resp.json['data']
resp = app.get('/api/statistics/%s/?time_interval=month&ou=default' % event_name, headers=headers)
assert services_ou_data == resp.json['data']
resp = app.get(
'/api/statistics/%s/?time_interval=month&users_ou=default&service=agendas default' % event_name,
headers=headers,