Commit 684f1588 by Oleksandr Barabash

reverted back to 1.14 manifest version. Manifest app version is updated to 1.2.16

parent 996bb5f7
......@@ -14,7 +14,7 @@ CARDS_PATH = os.path.join(ASSETS_PATH, "cards")
STRINGS_PATH = os.path.join(ASSETS_PATH, "strings")
APP_VERSION = "1.2.15"
APP_VERSION = "1.2.16"
class Auth:
......
......@@ -11,7 +11,7 @@ from utils.json_func import json_loads
manifest = {
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.14/MicrosoftTeams.schema.json",
# "version": "1.0.0",
"manifestVersion": "1.16",
"manifestVersion": "1.14",
# "id": "THIS IS AN APP SERVICE ID",
# "packageName": "net.azurewebsites.bot-name",
# "name": {
......@@ -50,11 +50,11 @@ manifest = {
"validDomains": [],
# "webApplicationInfo": {"id": "THIS IS AN APP SERVICE ID",
# "resource": ""},
"authorization": {
"permissions": {
"resourceSpecific": []
}
}
# "authorization": {
# "permissions": {
# "resourceSpecific": []
# }
# }
}
......@@ -67,12 +67,13 @@ class TeamsAppGenerator:
valid_domains = []
domain_items = json_loads(TaskModuleConfig.VALID_DOMAINS, [])
for domain_item in domain_items:
valid_domain = domain_item.get("validDomain", "")
if valid_domain.find("://") < 0:
valid_domain = "{}{}".format("https://", valid_domain)
valid_domain = urlparse(valid_domain).hostname
if valid_domain:
valid_domains.append(valid_domain)
if isinstance(domain_item, dict):
valid_domain = domain_item.get("validDomain", "")
if valid_domain.find("://") < 0:
valid_domain = "{}{}".format("https://", valid_domain)
valid_domain = urlparse(valid_domain).hostname
if valid_domain:
valid_domains.append(valid_domain)
default_domain = urlparse(TaskModuleConfig.URL).hostname
if default_domain and default_domain not in valid_domains:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment