Skip to content

Intercept 401 errors, pop up a login window that closes when successful. #2851

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
mkimberlin merged 3 commits into from
Feb 5, 2025
Merged

Intercept 401 errors, pop up a login window that closes when successful. #2851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
035c25a
Intercept 401 errors, pop up a login window that closes when successful.
ocielliottc Jan 29, 2025
d2f7765
Move window.close() into a component to reduce the number of warnings.
ocielliottc Jan 29, 2025
8baffe9
Merge branch 'develop' into bugfix-2782/unauthorized-errors
mkimberlin Feb 5, 2025
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
23 changes: 23 additions & 0 deletions web-ui/src/api/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@ export const getMyFetch = async () => {
return myFetch;
};

function windowLogin() {
return new Promise((resolve, reject) => {
const authUrl = `${BASE_API_URL}/login?close=true`;
const loginWindow = window.open(authUrl, "Login", "width=500,height=600");

const interval = setInterval(() => {
try {
if (loginWindow.closed) {
clearInterval(interval);
resolve();
}
} catch (err) {
reject(err);
}
}, 1000);
});
}

Copy link
Copy Markdown
Member

@mkimberlin mkimberlin Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is only workable for localhost, isn't it?

Copy link
Copy Markdown
Collaborator Author

@ocielliottc ocielliottc Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it works elsewhere because the URL doesn't really matter (except for our route match to close the window). In production, it will see that the JWT has expired (or doesn't exist) and will make the user pick their google account to use.

export const resolve = async payload => {
let { url } = payload;
const { params = null, data = null, ...rest } = payload;
Expand All @@ -77,6 +95,11 @@ export const resolve = async payload => {

resolved.payload = await promise;

if (resolved.payload.status == 401) {
await windowLogin();
resolved.payload = await myFetch(url, rest);
}

if (!resolved.payload.ok) {
try {
resolved.error = await resolved.payload.json();
Expand Down
4 changes: 4 additions & 0 deletions web-ui/src/components/routes/Routes.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import KudosPage from '../../pages/KudosPage';
import ManageKudosPage from '../../pages/ManageKudosPage';
import SkillCategoriesPage from '../../pages/SkillCategoriesPage';
import SkillCategoryEditPage from '../../pages/SkillCategoryEditPage';
import CloseWindow from '../../pages/CloseWindow';

export default function Routes() {
const { state } = useContext(AppContext);
Expand Down Expand Up @@ -202,6 +203,9 @@ export default function Routes() {
<Header title="Manage Kudos"></Header>
<ManageKudosPage />
</Route>
<Route path="/login?close=true">
<CloseWindow />
</Route>
</Switch>
);
}
5 changes: 5 additions & 0 deletions web-ui/src/pages/CloseWindow.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
window.close();

export default function CloseWindow() {
return (<></>);
}