Skip to content

Commit

Permalink
feat login: project_role, created_org, project_id add to loginState
Browse files Browse the repository at this point in the history
  • Loading branch information
NSUWAL123 committed Mar 12, 2024
1 parent b43bfd7 commit 1aeb13e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/frontend/src/utilfunctions/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ export const createLoginWindow = (redirectTo) => {
picture: userRes.img_url,
redirect_to: redirectTo,
role: userRes.role,
project_role: userRes?.project_role,
created_org: userRes?.created_org,
project_id: userRes?.project_id,
}).toString();
const redirectUrl = `/osmauth?${params}`;
window.location.href = redirectUrl;
Expand Down
18 changes: 17 additions & 1 deletion src/frontend/src/views/Authorized.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,24 @@ function Authorized() {
const osm_oauth_token = params.get('osm_oauth_token');
const picture = params.get('picture');
const role = params.get('role');
const project_role = params.get('project_role');
const project_id = params.get('project_id');
const created_org = params.get('created_org');

dispatch(LoginActions.setAuthDetails(username, sessionToken, osm_oauth_token));
dispatch(LoginActions.SetLoginToken({ username, id, sessionToken, osm_oauth_token, picture, role }));
dispatch(
LoginActions.SetLoginToken({
username,
id,
sessionToken,
osm_oauth_token,
picture,
role,
project_id,
project_role,
created_org,
}),
);

const redirectUrl = params.get('redirect_to') || '/';
setIsReadyToRedirect(true);
Expand Down

0 comments on commit 1aeb13e

Please sign in to comment.