fix qr auth
This commit is contained in:
@@ -51,8 +51,9 @@ export class AdvancedAuthController {
|
||||
@ApiOperation({ summary: 'Проверить QR-сессию', description: 'Возвращает текущий статус QR-сессии: PENDING/APPROVED/EXPIRED.' })
|
||||
@ApiParam({ name: 'sessionId', description: 'ID QR-сессии' })
|
||||
@ApiResponse({ status: 200, description: 'Статус QR-сессии получен' })
|
||||
pollQr(@Param('sessionId') sessionId: string) {
|
||||
return this.core.advancedAuth.PollQrSession({ sessionId });
|
||||
async pollQr(@Param('sessionId') sessionId: string) {
|
||||
const response = await firstValueFrom(this.core.advancedAuth.PollQrSession({ sessionId }));
|
||||
return this.normalizeQrResponse(response);
|
||||
}
|
||||
|
||||
@Post('qr/session/:sessionId/claim')
|
||||
@@ -86,6 +87,54 @@ export class AdvancedAuthController {
|
||||
@ApiResponse({ status: 201, description: 'QR-сессия подтверждена' })
|
||||
async approveQr(@Param('sessionId') sessionId: string, @Headers('authorization') authorization?: string) {
|
||||
const payload = await resolveAuthorizedPayload(this.jwt, this.core, authorization);
|
||||
return this.core.advancedAuth.ApproveQrSession({ sessionId, userId: payload.sub });
|
||||
const response = await firstValueFrom(this.core.advancedAuth.ApproveQrSession({ sessionId, userId: payload.sub }));
|
||||
return this.normalizeQrResponse(response);
|
||||
}
|
||||
|
||||
private normalizeQrResponse(response: unknown) {
|
||||
const value = response as {
|
||||
sessionId?: string;
|
||||
status?: string;
|
||||
expiresAt?: string;
|
||||
qrPayload?: string;
|
||||
claimed?: boolean;
|
||||
claimedDeviceName?: string;
|
||||
accessToken?: string;
|
||||
refreshToken?: string;
|
||||
authSessionId?: string;
|
||||
pinVerified?: boolean;
|
||||
auth?: {
|
||||
accessToken?: string;
|
||||
refreshToken?: string;
|
||||
sessionId?: string;
|
||||
pinVerified?: boolean;
|
||||
expiresAt?: string;
|
||||
user?: unknown;
|
||||
};
|
||||
};
|
||||
const auth = value.auth;
|
||||
|
||||
return {
|
||||
sessionId: value.sessionId,
|
||||
status: value.status,
|
||||
expiresAt: value.expiresAt,
|
||||
qrPayload: value.qrPayload,
|
||||
claimed: value.claimed,
|
||||
claimedDeviceName: value.claimedDeviceName,
|
||||
accessToken: value.accessToken ?? auth?.accessToken,
|
||||
refreshToken: value.refreshToken ?? auth?.refreshToken,
|
||||
authSessionId: value.authSessionId ?? auth?.sessionId,
|
||||
pinVerified: value.pinVerified ?? auth?.pinVerified,
|
||||
auth: auth
|
||||
? {
|
||||
accessToken: auth.accessToken,
|
||||
refreshToken: auth.refreshToken,
|
||||
sessionId: auth.sessionId,
|
||||
pinVerified: auth.pinVerified,
|
||||
expiresAt: auth.expiresAt,
|
||||
user: auth.user
|
||||
}
|
||||
: undefined
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user