trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: make generic template's base parameterised

This commit is contained in:
Jens Langhammer 2020-10-18 15:19:01 +02:00
parent 152b2d863d
commit 6a53069653
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/test_provider_proxy.py
View File

@ -52,7 +52,7 @@ class TestProviderProxy(SeleniumTestCase):
auto_remove=True, auto_remove=True,
environment={ environment={
"PASSBOOK_HOST": self.live_server_url, "PASSBOOK_HOST": self.live_server_url,
"PASSBOOK_TOKEN": outpost.token.token_uuid.hex, "PASSBOOK_TOKEN": outpost.token.key,
}, },
) )
return container return container

2
passbook/admin/templates/generic/form.html
View File

@ -1,4 +1,4 @@
{% extends "administration/base.html" %} {% extends container_template|default:"administration/base.html" %}
{% load i18n %} {% load i18n %}
{% load passbook_utils %} {% load passbook_utils %}

2
passbook/api/auth.py
View File

@ -28,7 +28,7 @@ def token_from_header(raw_header: bytes) -> Optional[Token]:
# TODO: Remove this workaround # TODO: Remove this workaround
# temporary fallback for 0.11 to 0.12 upgrade # temporary fallback for 0.11 to 0.12 upgrade
# 0.11 and below proxy sends authorization header not base64 encoded # 0.11 and below proxy sends authorization header not base64 encoded
auth_credentials = auth_credentials pass
# Accept credentials with username and without # Accept credentials with username and without
if ":" in auth_credentials: if ":" in auth_credentials:
_, password = auth_credentials.split(":") _, password = auth_credentials.split(":")

2
passbook/core/migrations/0014_auto_20201018_1158.py
View File

@ -34,7 +34,7 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name="token", model_name="token",
name="identifier", name="identifier",
field=models.CharField(max_length=255), field=models.SlugField(max_length=255),
), ),
migrations.AddIndex( migrations.AddIndex(
model_name="token", model_name="token",

2
passbook/core/models.py
View File

@ -309,7 +309,7 @@ class Token(ExpiringModel):
"""Token used to authenticate the User for API Access or confirm another Stage like Email.""" """Token used to authenticate the User for API Access or confirm another Stage like Email."""
token_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4) token_uuid = models.UUIDField(primary_key=True, editable=False, default=uuid4)
identifier = models.CharField(max_length=255) identifier = models.SlugField(max_length=255)
key = models.TextField(default=default_token_key) key = models.TextField(default=default_token_key)
intent = models.TextField( intent = models.TextField(
choices=TokenIntents.choices, default=TokenIntents.INTENT_VERIFICATION choices=TokenIntents.choices, default=TokenIntents.INTENT_VERIFICATION

2
passbook/core/templates/generic/delete.html
View File

@ -1,4 +1,4 @@
{% extends "administration/base.html" %} {% extends container_template|default:"administration/base.html" %}
{% load i18n %} {% load i18n %}
{% load passbook_utils %} {% load passbook_utils %}