Skip to content
Snippets Groups Projects
Unverified Commit b4c6df72 authored by David Acevedo's avatar David Acevedo
Browse files

rever(cross): #1635 allow local async test

This reverts commit ab2316ef.
parent ab2316ef
No related branches found
No related tags found
No related merge requests found
......@@ -104,8 +104,7 @@ def app(request):
key=settings.JWT_COOKIE_NAME,
value=token,
secure=True,
# Temporary while ariadne migration is finished
httponly=not settings.DEBUG,
httponly=True,
max_age=settings.SESSION_COOKIE_AGE
)
except KeyError:
......
......@@ -51,11 +51,7 @@ function cli {
env_prepare_dynamodb_local
env_prepare_nodejs_modules
env_prepare_ruby_modules
if [ "${function_to_call}" == 'serve_back_async_dev' ]; then
env_prepare_python_async_packages
else
env_prepare_python_packages
fi
env_prepare_python_packages
;;
esac
......
......@@ -401,27 +401,6 @@ function job_serve_redis {
&& redis-server --port "${port}"
}
function job_serve_back_async_dev {
local app='fluidintegrates.asgi:application'
local host='0.0.0.0'
local port='9090'
local root_path='/integrates'
local workers='4'
helper_set_dev_secrets \
&& echo "[INFO] Serving back on port ${port}" \
&& uvicorn \
--host="${host}" \
--port="${port}" \
--root-path="${root_path}" \
--ssl-certfile="${srcDerivationsCerts}/fluidla.crt" \
--ssl-keyfile="${srcDerivationsCerts}/fluidla.key" \
--header="Access-Control-Allow-Origin:*" \
--header="Access-Control-Allow-Headers:*" \
--workers="${workers}" \
"${app}"
}
function job_serve_back_dev {
local app='fluidintegrates.asgi:application'
local host='0.0.0.0'
......@@ -441,8 +420,6 @@ function job_serve_back_dev {
"${app}"
}
function job_lint_back {
prospector -F -s high -u django -i node_modules app \
&& prospector -F -s high -u django -i node_modules django-apps/integrates-back-async/backend/ \
......
......@@ -352,10 +352,6 @@ SESSION_COOKIE_SAMESITE_KEYS = {SESSION_COOKIE_NAME, JWT_COOKIE_NAME}
SESSION_COOKIE_SECURE = True
SESSION_COOKIE_AGE = 40 * 60
CSRF_COOKIE_SECURE = True
# Temporary while ariadne migration is finished
if DEBUG:
SESSION_COOKIE_SAMESITE_KEYS = {SESSION_COOKIE_NAME}
CLUSTER_SESSION = True
if FI_ENVIRONMENT == 'development':
......
......@@ -27,32 +27,20 @@ const getCookie: (name: string) => string = (name: string): string => {
return cookieValue;
};
let urlHostApiV1: string;
let urlHostApiV2: string;
if (window.location.hostname === "localhost") {
urlHostApiV1 = `${window.location.protocol}//${window.location.hostname}:8080/api`;
urlHostApiV2 = `${window.location.protocol}//${window.location.hostname}:9090/api`;
} else {
urlHostApiV1 = `${window.location.origin}/integrates/api`;
urlHostApiV2 = `${window.location.origin}/integrates/v2/api`;
}
const apiLinkV1: ApolloLink = createUploadLink({
credentials: "same-origin",
headers: {
"X-CSRFToken": getCookie("csrftoken"),
},
uri: urlHostApiV1,
uri: `${window.location.origin}/integrates/api`,
});
const apiLinkV2: ApolloLink = createUploadLink({
credentials: "same-origin",
headers: {
"Authorization": getEnvironment() === "production" ? undefined : `Bearer ${getCookie("integrates_session")}` ,
"X-CSRFToken": getCookie("csrftoken"),
},
uri: urlHostApiV2,
uri: `${window.location.origin}/integrates/v2/api`,
});
export const client: ApolloClient<NormalizedCacheObject> = new ApolloClient({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment