Merge remote-tracking branch 'origin/main' into misc/add-ttl-max-value-for-identities

This commit is contained in:
Sheen Capadngan
2024-07-11 19:17:25 +08:00
@@ -57,7 +57,7 @@ export const identityAccessTokenDALFactory = (db: TDbClient) => {
`${TableName.IdentityOidcAuth}.identityId` `${TableName.IdentityOidcAuth}.identityId`
); );
}) })
.leftJoin(TableName.IdentityOidcAuth, (qb) => { .leftJoin(TableName.IdentityTokenAuth, (qb) => {
qb.on(`${TableName.Identity}.authMethod`, db.raw("?", [IdentityAuthMethod.TOKEN_AUTH])).andOn( qb.on(`${TableName.Identity}.authMethod`, db.raw("?", [IdentityAuthMethod.TOKEN_AUTH])).andOn(
`${TableName.Identity}.id`, `${TableName.Identity}.id`,
`${TableName.IdentityTokenAuth}.identityId` `${TableName.IdentityTokenAuth}.identityId`