-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #859 from UW-GAC/deploy/stage
Deploy to prod
- Loading branch information
Showing
11 changed files
with
32 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -310,6 +310,7 @@ | |
"cdsa:records:user_access", | ||
"dbgap:records:index", | ||
"dbgap:records:applications", | ||
"favicon", | ||
] | ||
|
||
# django-dbbackup | ||
|
@@ -394,12 +395,6 @@ | |
ANVIL_ACCOUNT_ADAPTER = "primed.primed_anvil.adapters.AccountAdapter" | ||
ANVIL_MANAGED_GROUP_ADAPTER = "primed.primed_anvil.adapters.ManagedGroupAdapter" | ||
|
||
# Specify the URL name that AccountLink and AccountLinkVerify redirect to. | ||
ANVIL_ACCOUNT_LINK_REDIRECT = "users:redirect" | ||
# Specify the subject for AnVIL account verification emails. | ||
ANVIL_ACCOUNT_LINK_EMAIL_SUBJECT = "Verify your AnVIL account email" | ||
ANVIL_ACCOUNT_VERIFY_NOTIFICATION_EMAIL = "[email protected]" | ||
|
||
DRUPAL_API_CLIENT_ID = env("DRUPAL_API_CLIENT_ID", default="") | ||
DRUPAL_API_CLIENT_SECRET = env("DRUPAL_API_CLIENT_SECRET", default="") | ||
DRUPAL_API_REL_PATH = env("DRUPAL_API_REL_PATH", default="mockapi") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -130,7 +130,7 @@ def get_mocked_response(self): | |
"name": "testmaster", | ||
"email": "[email protected]", | ||
"email_verified": "True", | ||
"sub": 20122 | ||
"sub": "20122" | ||
}""", | ||
), | ||
] | ||
|
@@ -198,7 +198,7 @@ def get_id_token(self): | |
"iat": self.setup_time, | ||
"aud": allowed_audience, | ||
"scope": ["authenticated", "oauth_client_user"], | ||
"sub": 20122, | ||
"sub": "20122", | ||
} | ||
) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,6 +18,9 @@ class AccountAdapter(BaseAccountAdapter): | |
|
||
list_table_class = AccountTable | ||
list_filterset_class = AccountListFilter | ||
account_link_verify_redirect = "users:redirect" | ||
account_link_email_subject = "Verify your AnVIL account email" | ||
account_verify_notification_email = "[email protected]" | ||
|
||
def get_autocomplete_queryset(self, queryset, q): | ||
"""Filter to Accounts where the email or the associated user name matches the query `q`.""" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{% extends "admin/base_site.html" %} | ||
{% load static %} | ||
{% block extrahead %} | ||
|
||
<link rel="shortcut icon" href="{% static 'images/favicons/primed-favicon.png' %}"> | ||
|
||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters