Skip to content

Fix #33 send country_code to subscribie deployer during new site build #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisjsimpson merged 2 commits into from
May 27, 2022
Merged

Fix #33 send country_code to subscribie deployer during new site build #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7b9c8d
Fix #33 send country_code to subscribie deployer during new site build
chrisjsimpson May 26, 2022
c0db859
Fix #33 pass session as dict to submit_new_site_build (which may cont…
chrisjsimpson May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions __init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def start_building():


def submit_new_site_build(
form, domain, subdomain, login_token, app_config=None
form, domain, subdomain, login_token, app_config=None, session=None
): # noqa: E501
"""Submit a new site build
Take form submission and build new site from it
Expand All @@ -51,6 +51,7 @@ def submit_new_site_build(
:param subdomain: The subdomain for new shop e.g. abc. Which
:param app_config: The flask app config type casted to a dict
when combined with domain, becomes abc.example.com
:param session: The serialized flask session data
"""
payload = {}
payload["version"] = 1
Expand All @@ -59,6 +60,9 @@ def submit_new_site_build(
payload["login_token"] = login_token
company_name = form.company_name.data
payload["company"] = {"name": company_name, "logo": "", "start_image": ""}
# If possible, get country code and send to subscribie deployer
# Ref: https://github.com/Subscribie/module-builder/issues/33
payload["country_code"] = session.get("country_code", "GB")
payload["theme"] = {"name": "jesmond", "static_folder": "./static/"}

# Custom styles prepare as empty
Expand Down Expand Up @@ -140,18 +144,24 @@ def save_plans():

login_token = generate_login_token()

session[
"site-url"
] = f'https://{subdomain}.{app.config.get("SUBSCRIBIE_DOMAIN", ".subscriby.shop")}' # noqa: E501

# Start new site build in background thread
app_config = dict(app.config)
session_dict = dict(session)
task_queue.put(
lambda: submit_new_site_build(
form, domain, subdomain, login_token, app_config
) # noqa: E501
form,
domain,
subdomain,
login_token,
app_config,
session=session_dict, # noqa: E501
)
) # noqa: E501

session[
"site-url"
] = f'https://{subdomain}.{app.config.get("SUBSCRIBIE_DOMAIN", ".subscriby.shop")}' # noqa: E501

# Redirect to their site, auto login using login_token
auto_login_url = f'{session["site-url"]}/auth/login/{login_token}'
session["login-url"] = auto_login_url
Expand Down