simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2025-11-11 10:20:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

add more fields into /api/custom_domains

Browse source
This commit is contained in:
Son NK 2021-03-06 20:43:50 +01:00
parent c4c29dfa1d
commit 39c92110cb
3 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/api/views/custom_domain.py
View file

@ -8,9 +8,14 @@ from app.models import CustomDomain, DomainDeletedAlias
def custom_domain_to_dict(custom_domain: CustomDomain): def custom_domain_to_dict(custom_domain: CustomDomain):
return { return {
"id": custom_domain.id, "id": custom_domain.id,
"domain": custom_domain.domain, "domain_name": custom_domain.domain,
"verified": custom_domain.verified, "is_verified": custom_domain.verified,
"nb_alias": custom_domain.nb_alias(), "nb_alias": custom_domain.nb_alias(),
"creation_date": custom_domain.created_at.format(),
"creation_timestamp": custom_domain.created_at.timestamp,
"catch_all": custom_domain.catch_all,
"name": custom_domain.name,
"random_prefix_generation": custom_domain.random_prefix_generation,
} }

18
docs/api.md
View file

@ -633,16 +633,26 @@ List of custom domains.
{ {
"custom_domains": [ "custom_domains": [
{ {
"domain": "test1.org", "catch_all": false,
"creation_date": "2021-03-06 19:42:33+00:00",
"creation_timestamp": 1615059753,
"domain_name": "test1.org",
"id": 1, "id": 1,
"is_verified": true,
"name": null,
"nb_alias": 0, "nb_alias": 0,
"verified": true "random_prefix_generation": false
}, },
{ {
"domain": "test2.org", "catch_all": false,
"creation_date": "2021-03-06 19:42:33+00:00",
"creation_timestamp": 1615059753,
"domain_name": "test2.org",
"id": 2, "id": 2,
"is_verified": false,
"name": null,
"nb_alias": 0, "nb_alias": 0,
"verified": false "random_prefix_generation": false
} }
] ]
} }

18
tests/api/test_custom_domain.py
View file

@ -16,12 +16,18 @@ def test_get_custom_domains(flask_client):
) )
assert r.status_code == 200 assert r.status_code == 200
assert r.json == { assert len(r.json["custom_domains"]) == 2
"custom_domains": [ for domain in r.json["custom_domains"]:
{"domain": "test1.org", "id": 1, "nb_alias": 0, "verified": True}, assert domain["domain_name"]
{"domain": "test2.org", "id": 2, "nb_alias": 0, "verified": False}, assert domain["id"]
] assert domain["nb_alias"] == 0
} assert "is_verified" in domain
assert "catch_all" in domain
assert "name" in domain
assert "random_prefix_generation" in domain
assert domain["creation_date"]
assert domain["creation_timestamp"]
def test_get_custom_domain_trash(flask_client): def test_get_custom_domain_trash(flask_client):