fix oauth
This commit is contained in:
@@ -5,7 +5,7 @@ import { firstValueFrom } from 'rxjs';
|
||||
import { CoreGrpcService } from '../core-grpc.service';
|
||||
import { OAuthAuthorizeIncomingDto, OAuthTokenIncomingDto } from '../dto/oauth.dto';
|
||||
import { extractBearerToken } from '../auth-token';
|
||||
import { appendQueryParams, mergeTokenCredentials, mapTokenResponseToStandard, normalizeAuthorizeQuery, normalizeTokenBody } from '../lib/oauth-params';
|
||||
import { appendQueryParams, mapUserInfoToOidc, mergeTokenCredentials, mapTokenResponseToStandard, normalizeAuthorizeQuery, normalizeTokenBody } from '../lib/oauth-params';
|
||||
import { resolveFrontendUrl } from '../lib/oauth-issuer';
|
||||
import { verifyAccessToken } from '../session-auth';
|
||||
|
||||
@@ -80,7 +80,8 @@ export class OAuthController {
|
||||
clientId: normalized.clientId,
|
||||
redirectUri: normalized.redirectUri,
|
||||
scope: normalized.scope,
|
||||
state: normalized.state
|
||||
state: normalized.state,
|
||||
nonce: normalized.nonce
|
||||
})
|
||||
)) as { redirectUrl?: string; code?: string; state?: string };
|
||||
|
||||
@@ -133,7 +134,20 @@ export class OAuthController {
|
||||
@ApiBearerAuth()
|
||||
@ApiOperation({ summary: 'OAuth userinfo', description: 'Возвращает профиль пользователя по OAuth access token.' })
|
||||
@ApiResponse({ status: 200, description: 'Профиль пользователя получен' })
|
||||
userInfo(@Headers('authorization') authorization?: string) {
|
||||
return this.core.oauth.UserInfo({ accessToken: extractBearerToken(authorization) });
|
||||
async userInfo(@Headers('authorization') authorization?: string) {
|
||||
const result = (await firstValueFrom(
|
||||
this.core.oauth.UserInfo({ accessToken: extractBearerToken(authorization) })
|
||||
)) as {
|
||||
sub?: string;
|
||||
email?: string;
|
||||
phone?: string;
|
||||
name?: string;
|
||||
picture?: string;
|
||||
emailVerified?: boolean;
|
||||
preferredUsername?: string;
|
||||
phoneNumber?: string;
|
||||
phoneNumberVerified?: boolean;
|
||||
};
|
||||
return mapUserInfoToOidc(result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user