forked from enviPath/enviPy
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f885745127 | ||
|
|
48d2bce52a |
+1
-1
@@ -177,7 +177,7 @@ def create_pes_node(request, package_uuid, pathway_uuid):
|
|||||||
def get_application_token(prod: bool) -> str:
|
def get_application_token(prod: bool) -> str:
|
||||||
scope = f"{s.PROD_PES_SCOPE if prod else s.NON_PROD_PES_SCOPE}/.default"
|
scope = f"{s.PROD_PES_SCOPE if prod else s.NON_PROD_PES_SCOPE}/.default"
|
||||||
|
|
||||||
url = f"https://login.microsoftonline.com/{s.MS_TENANT_ID}/oauth2/v2.0/token"
|
url = f"https://login.microsoftonline.com/{s.MS_ENTRA_TENANT_ID}/oauth2/v2.0/token"
|
||||||
data = {
|
data = {
|
||||||
"grant_type": "client_credentials",
|
"grant_type": "client_credentials",
|
||||||
"client_id": s.MS_ENTRA_CLIENT_ID,
|
"client_id": s.MS_ENTRA_CLIENT_ID,
|
||||||
|
|||||||
@@ -445,6 +445,8 @@ if MS_ENTRA_ENABLED:
|
|||||||
MS_ENTRA_AUTHORITY = f"https://login.microsoftonline.com/{MS_ENTRA_TENANT_ID}"
|
MS_ENTRA_AUTHORITY = f"https://login.microsoftonline.com/{MS_ENTRA_TENANT_ID}"
|
||||||
MS_ENTRA_REDIRECT_URI = os.environ["MS_REDIRECT_URI"]
|
MS_ENTRA_REDIRECT_URI = os.environ["MS_REDIRECT_URI"]
|
||||||
MS_ENTRA_SCOPES = os.environ.get("MS_SCOPES", "").split(",")
|
MS_ENTRA_SCOPES = os.environ.get("MS_SCOPES", "").split(",")
|
||||||
|
NON_PROD_PES_SCOPE = os.environ.get("NON_PROD_PES_SCOPE")
|
||||||
|
PROD_PES_SCOPE = os.environ.get("PROD_PES_SCOPE")
|
||||||
|
|
||||||
# Site ID 10 -> beta.envipath.org
|
# Site ID 10 -> beta.envipath.org
|
||||||
MATOMO_SITE_ID = os.environ.get("MATOMO_SITE_ID", "10")
|
MATOMO_SITE_ID = os.environ.get("MATOMO_SITE_ID", "10")
|
||||||
|
|||||||
+1
-1
@@ -271,7 +271,7 @@ class PackageExportSchema(Schema):
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def resolve_classification_level(obj):
|
def resolve_classification_level(obj):
|
||||||
if isinstance(obj, dict):
|
if isinstance(obj, dict):
|
||||||
return obj["classification_level"]
|
return obj.get("classification_level", "Internal")
|
||||||
return obj.Classification(obj.classification_level).name
|
return obj.Classification(obj.classification_level).name
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user