Skip to content
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.

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

[fix] nginx continuously rewriting and reloading on index page of spaces app #2236

Merged
merged 6 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion nginx/nginx.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ http {

client_max_body_size ${FILE_SIZE_LIMIT};

add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "no-referrer-when-downgrade" always;
add_header Permissions-Policy "interest-cohort=()" always;
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;

location / {
proxy_pass http://web:3000/;
}
Expand All @@ -20,11 +25,12 @@ http {
}

location /spaces/ {
rewrite ^/spaces/?$ /spaces/login break;
proxy_pass http://space:3000/spaces/;
}

location /${BUCKET_NAME}/ {
proxy_pass http://plane-minio:9000/uploads/;
}
}
}
}
4 changes: 2 additions & 2 deletions space/components/accounts/sign-in.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ export const SignInView = observer(() => {
const onSignInSuccess = (response: any) => {
const isOnboarded = response?.user?.onboarding_step?.profile_complete || false;

const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/";
const nextPath = router.asPath.includes("next_path") ? router.asPath.split("/?next_path=")[1] : "/login";

userStore.setCurrentUser(response?.user);

if (!isOnboarded) {
router.push(`/onboarding?next_path=${nextPath}`);
return;
}
router.push((nextPath ?? "/").toString());
router.push((nextPath ?? "/login").toString());
};

const handleGoogleSignIn = async ({ clientId, credential }: any) => {
Expand Down
2 changes: 1 addition & 1 deletion space/components/views/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from "./home";
export * from "./login";
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useMobxStore } from "lib/mobx/store-provider";
// components
import { SignInView, UserLoggedIn } from "components/accounts";

export const HomeView = observer(() => {
export const LoginView = observer(() => {
const { user: userStore } = useMobxStore();

if (!userStore.currentUser) return <SignInView />;
Expand Down
8 changes: 0 additions & 8 deletions space/pages/index.tsx

This file was deleted.

8 changes: 8 additions & 0 deletions space/pages/login/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from "react";

// components
import { LoginView } from "components/views";

const LoginPage = () => <LoginView />;

export default LoginPage;
Loading