Fix merge conflicts
This commit is contained in:
parent
0d383e84e7
commit
df3e8fa430
|
@ -30,13 +30,13 @@ function toFetchOAuth2ConfigsResponse(
|
||||||
export async function fetch(ctx: Ctx<void, FetchOAuth2ConfigsResponse>) {
|
export async function fetch(ctx: Ctx<void, FetchOAuth2ConfigsResponse>) {
|
||||||
const configs = await sdk.oauth2.fetch()
|
const configs = await sdk.oauth2.fetch()
|
||||||
|
|
||||||
const timestamps = await sdk.oauth2.getLastUsages(configs.map(c => c.id))
|
const timestamps = await sdk.oauth2.getLastUsages(configs.map(c => c._id))
|
||||||
|
|
||||||
const response: FetchOAuth2ConfigsResponse = {
|
const response: FetchOAuth2ConfigsResponse = {
|
||||||
configs: (configs || []).map(c => ({
|
configs: (configs || []).map(c => ({
|
||||||
...toFetchOAuth2ConfigsResponse(c),
|
...toFetchOAuth2ConfigsResponse(c),
|
||||||
lastUsage: timestamps[c.id]
|
lastUsage: timestamps[c._id]
|
||||||
? new Date(timestamps[c.id]).toISOString()
|
? new Date(timestamps[c._id]).toISOString()
|
||||||
: undefined,
|
: undefined,
|
||||||
})),
|
})),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue