Skip to content

fix(UI): New user can join mega org without apply #1067

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
benjamin-747 merged 1 commit into from
May 26, 2025
Merged

fix(UI): New user can join mega org without apply #1067

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 2 additions & 30 deletions moon/apps/web/pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ export const getServerSideProps: GetServerSideProps = async ({ req, query }) =>
try {
const { device } = userAgentFromString(req.headers['user-agent'])
const headers = apiCookieHeaders(req.cookies)
//todo: Encrypted storage or server-side retrieval
const admin_headers = {
Cookie: '_campsite_api_session=sHKWgLii9No0CuFrr4q29G3iGisYILKp1776kwY%2Fb5xK24RFioyvcA9yPZDlK9ZavemJLQtjvSpuwwYE8LTyc6KF0wtaJFFYBqhx9YVRBfOXSFSRQeTi8A2X2GXe6SrEvYSTWDdPVI0et2mpvt2RwR6ajbolpRw57D9XBdLrGaQnIZ6YnUbXOmbPSDY34lyH4X%2FhX6oS1ms%2FPMtqbZh%2BAZiaXE0l2pjl9iWsvGHN1YpUv8kwcD5KcqtvBpJwaSChG7lXDkVy4SP2k9PzKmL8Zui79sDGZEJ5D8oRKo6a9uVy%2FeROaD1ewlHXylU%2FdWHcR%2Ft6Z1TrjxPWIDs6VB5nDudxFgap5XNjOvH4%2FG9t7pi%2FGfvteu%2B1yJ8%2Fkiz1jlg%2B7onVGNKJT2mmsHaJ6JF1QMAj0UgakG0a7hc8ui77v0VxE5avGc9I0i1z8mo4hX0k8yOVOPZkp5GwQHsBJK0%2BKmg%2Fsw%2BG5Fc%3D--qs0r30iu9tg2D6wn--EZ%2FzQJVCBVvWjVKG13PnLw%3D%3D',
'x-campsite-ssr-secret': ''
}

const organizations = await apiClient.organizationMemberships
.getOrganizationMemberships()
Expand Down Expand Up @@ -56,31 +51,8 @@ export const getServerSideProps: GetServerSideProps = async ({ req, query }) =>
}
}
} else {
const userData = await apiClient.users
.getMe()
.request({ headers })
.then((res) => res)

await apiClient.organizations.postInvitations().request(
'mega',
{
invitations: [
{
email: userData.email,
role: 'member'
}
]
},
{ headers: admin_headers }
)

const invitations = await apiClient.users.getMeOrganizationInvitations().request({ headers })

for (let i of invitations) {
if (i.organization?.slug === 'mega') {
await apiClient.invitationsByToken.postInvitationsByTokenAccept().request(i.token!!, { headers })
}
}
await apiClient.organizations.postJoinByToken()
.request("mega", "s3AX1iyAx3sgGNygiM67", { headers })

if (device.type === 'mobile') {
return {
Expand Down