chore: v2 managed user inform when access token expires (#15414)
This commit is contained in:
+1
@@ -91,6 +91,7 @@ export class OAuthClientUsersController {
|
||||
data: {
|
||||
user: this.getResponseUser(user),
|
||||
accessToken: tokens.accessToken,
|
||||
accessTokenExpiresAt: tokens.accessTokenExpiresAt.valueOf(),
|
||||
refreshToken: tokens.refreshToken,
|
||||
},
|
||||
};
|
||||
|
||||
+4
-1
@@ -1,7 +1,7 @@
|
||||
import { ManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/managed-user.output";
|
||||
import { ApiProperty } from "@nestjs/swagger";
|
||||
import { Type } from "class-transformer";
|
||||
import { IsEnum, IsString, ValidateNested } from "class-validator";
|
||||
import { IsEnum, IsNumber, IsString, ValidateNested } from "class-validator";
|
||||
|
||||
import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
|
||||
|
||||
@@ -18,6 +18,9 @@ class CreateManagedUserData {
|
||||
|
||||
@IsString()
|
||||
refreshToken!: string;
|
||||
|
||||
@IsNumber()
|
||||
accessTokenExpiresAt!: number;
|
||||
}
|
||||
|
||||
export class CreateManagedUserOutput {
|
||||
|
||||
@@ -62,7 +62,7 @@ export class OAuthClientUsersService {
|
||||
await this.userRepository.update(user.id, { name: body.name ?? user.username ?? undefined });
|
||||
}
|
||||
|
||||
const { accessToken, refreshToken } = await this.tokensRepository.createOAuthTokens(
|
||||
const { accessToken, refreshToken, accessTokenExpiresAt } = await this.tokensRepository.createOAuthTokens(
|
||||
oAuthClientId,
|
||||
user.id
|
||||
);
|
||||
@@ -78,6 +78,7 @@ export class OAuthClientUsersService {
|
||||
user,
|
||||
tokens: {
|
||||
accessToken,
|
||||
accessTokenExpiresAt,
|
||||
refreshToken,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -89,6 +89,7 @@ export class TokensRepository {
|
||||
|
||||
return {
|
||||
accessToken: accessToken.secret,
|
||||
accessTokenExpiresAt: accessToken.expiresAt,
|
||||
refreshToken: refreshToken.secret,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1833,12 +1833,16 @@
|
||||
},
|
||||
"refreshToken": {
|
||||
"type": "string"
|
||||
},
|
||||
"accessTokenExpiresAt": {
|
||||
"type": "number"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"user",
|
||||
"accessToken",
|
||||
"refreshToken"
|
||||
"refreshToken",
|
||||
"accessTokenExpiresAt"
|
||||
]
|
||||
},
|
||||
"CreateManagedUserOutput": {
|
||||
|
||||
Reference in New Issue
Block a user