Skip to content

[KW-662] fix: QR 출입 검증 로직 수정 #32

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
judymoody59 merged 2 commits into from
Jun 12, 2025
Merged

[KW-662] fix: QR 출입 검증 로직 수정 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff73d0
KW-662/feat: handleScan에서 BUILDING인 경우 direction 값을 payload에 포함
judymoody59 Jun 12, 2025
f87d5fd
KW-662/fix: QR 화면에 건물 출입 방향 정보 표시 추가
judymoody59 Jun 12, 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
7 changes: 1 addition & 6 deletions src/apis/qrApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import axiosWithAuthorization from "../contexts/axiosWithAuthorization";

// 출입 검증
export const verifyQR = async (allowedAreas: string[], deviceAreaCode: string) => {
export const verifyQR = async (payload: any) => {
try {
const payload = {
deviceAreaCode,
allowedAreas,
};

console.log("전송할 payload:", payload);
const res = await axiosWithAuthorization.post(`/entrances/verify`, payload);
console.log("출입 검증:", res.data);
Expand Down
48 changes: 33 additions & 15 deletions src/pages/QRCodeScanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ const QRCodeScanner = () => {

const buildingName = localStorage.getItem("buildingName") || "";
const zoneName = localStorage.getItem("zoneName") || "";
const direction = localStorage.getItem("direction") || "";
const isZoneMode = !!zoneName;
const isScanningRef = useRef(false);

Expand All @@ -64,21 +65,36 @@ const QRCodeScanner = () => {
);

const handleScan = async (parsed: any) => {
const allowedAreas = parsed?.vp?.verifiableCredential?.credentialSubject?.allowedAreas;
const deviceAreaCode = localStorage.getItem("deviceAreaCode") || "";

if (Array.isArray(allowedAreas) && deviceAreaCode) {
try {
const result = await verifyQR(allowedAreas, deviceAreaCode);
showMessage(result ? STATUS_MESSAGES.ACCESS_GRANTED : STATUS_MESSAGES.ACCESS_DENIED);
} catch (err: unknown) {
console.error("출입 데이터 전송 실패", err);
showMessage(STATUS_MESSAGES.VERIFY_FAILED);
const deviceAreaCode = localStorage.getItem("deviceAreaCode") || "";
const deviceAreaId = localStorage.getItem("deviceAreaId");
const deviceLocationType = localStorage.getItem("deviceLocationType") || "";

if (Array.isArray(parsed?.accessAreaCodes) && deviceAreaCode) {
try {
const payload: any = {
...parsed,
deviceAreaCode,
deviceAreaId: deviceAreaId ? Number(deviceAreaId) : undefined,
deviceLocationType,
};

// BUILDING인 경우에만 direction 추가
if (direction) {
payload.direction = direction;
}
} else {
showMessage(STATUS_MESSAGES.INVALID_QR);

console.log("출입 verify 요청 payload:", payload);

const result = await verifyQR(payload);
showMessage(result ? STATUS_MESSAGES.ACCESS_GRANTED : STATUS_MESSAGES.ACCESS_DENIED);
} catch (err: unknown) {
console.error("출입 데이터 전송 실패", err);
showMessage(STATUS_MESSAGES.VERIFY_FAILED);
}
};
} else {
showMessage(STATUS_MESSAGES.INVALID_QR);
}
};

scannerRef.current = scanner;
(window as any).scannerRef = scannerRef;
Expand Down Expand Up @@ -112,7 +128,7 @@ const QRCodeScanner = () => {
}

setError(null);
if (typeof parsed === "object" && parsed?.vp?.verifiableCredential?.credentialSubject) {
if (typeof parsed === "object" && parsed?.passId && parsed?.accessAreaCodes) {
handleScan(parsed);
} else {
showMessage(STATUS_MESSAGES.INVALID_QR);
Expand Down Expand Up @@ -169,7 +185,9 @@ const QRCodeScanner = () => {
<img src={logo} alt="KEYWE Logo" className="qr-logo" />
<h2 className="qr-header-text">QR 스캔 후 출입이 가능합니다!</h2>
<div className="qr-header-location">
{isZoneMode ? `${buildingName} / ${zoneName}` : buildingName}
{isZoneMode
? `${buildingName} / ${zoneName}`
: `${buildingName} / ${direction}`}
</div>
</div>

Expand Down