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.

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

Main branch update from Dev branch #579

Merged
merged 3 commits into from
Feb 22, 2025
Merged

Main branch update from Dev branch #579

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed88e86
Add: logging for login deny
kmc7468 Feb 22, 2025
6457b3c
Add: logging ku_std_no and employeeType
kmc7468 Feb 22, 2025
f2e47ea
Merge pull request #578 from sparcs-kaist/577-logging-login-deny-reason
kmc7468 Feb 22, 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
13 changes: 10 additions & 3 deletions src/services/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ const transUserData = (userData) => {
const kaistInfo = userData.kaist_info ? JSON.parse(userData.kaist_info) : {};

// info.ku_std_no: 학번
// info.isEligible: 카이스트 구성원인지 여부. DB에 저장하지 않음.
// info.isEligible: 카이스트 구성원인지 여부
const info = {
id: userData.uid,
sid: userData.sid,
name: getFullUsername(userData.first_name, userData.last_name),
facebook: userData.facebook_id || "",
twitter: userData.twitter_id || "",
kaist: kaistInfo?.ku_std_no || "",
kaistType: kaistInfo?.employeeType || "", // DB에 저장하지 않음
sparcs: userData.sparcs_id || "",
email: kaistInfo?.mail || userData.email,
isEligible: userPattern.allowedEmployeeTypes.test(kaistInfo?.employeeType),
isEligible: userPattern.allowedEmployeeTypes.test(kaistInfo?.employeeType), // DB에 저장하지 않음
};
return info;
};
Expand Down Expand Up @@ -164,6 +165,8 @@ const sparcsssoCallbackHandler = (req, res) => {
}

if (state !== stateForCmp) {
logger.info("Login denied: state mismatch");

const redirectUrl = new URL("/login/fail", redirectOrigin).href;
return res.redirect(redirectUrl);
}
Expand All @@ -175,7 +178,11 @@ const sparcsssoCallbackHandler = (req, res) => {
tryLogin(req, res, userData, redirectOrigin, redirectPath);
} else {
// 카이스트 구성원이 아닌 경우, SSO 로그아웃 이후, 로그인 실패 URI 로 이동합니다
const { sid } = userData;
const { id, sid, kaist, kaistType } = userData;
logger.info(
`Login denied: not a KAIST member (uid: ${id}, sid: ${sid}, kaist: ${kaist}, kaistType: ${kaistType})`
);

const redirectUrl = new URL("/login/fail", redirectOrigin).href;
const ssoLogoutUrl = ssoClient.getLogoutUrl(sid, redirectUrl);
res.redirect(ssoLogoutUrl);
Expand Down
Loading