enh: autocancel behavior for instance client mixin

This commit is contained in:
Ben Allfree 2023-06-18 06:24:23 -07:00
parent c6af57acf7
commit c0b50bef94

View File

@ -43,12 +43,16 @@ export const createInstanceMixin = (context: MixinContext) => {
(subdomain: string): Promise<[InstanceFields, UserFields] | []> => (subdomain: string): Promise<[InstanceFields, UserFields] | []> =>
client client
.collection(INSTANCE_COLLECTION) .collection(INSTANCE_COLLECTION)
.getFirstListItem<InstanceFields>(`subdomain = '${subdomain}'`) .getFirstListItem<InstanceFields>(`subdomain = '${subdomain}'`, {
$autoCancel: false,
})
.then((instance) => { .then((instance) => {
if (!instance) return [] if (!instance) return []
return client return client
.collection('users') .collection('users')
.getOne<UserFields>(instance.uid) .getOne<UserFields>(instance.uid, {
$autoCancel: false,
})
.then((user) => { .then((user) => {
return [instance, user] return [instance, user]
}) })
@ -63,12 +67,16 @@ export const createInstanceMixin = (context: MixinContext) => {
): Promise<[InstanceFields, UserFields] | []> => { ): Promise<[InstanceFields, UserFields] | []> => {
return client return client
.collection(INSTANCE_COLLECTION) .collection(INSTANCE_COLLECTION)
.getOne<InstanceFields>(instanceId) .getOne<InstanceFields>(instanceId, {
$autoCancel: false,
})
.then((instance) => { .then((instance) => {
if (!instance) return [] if (!instance) return []
return client return client
.collection('users') .collection('users')
.getOne<UserFields>(instance.uid) .getOne<UserFields>(instance.uid, {
$autoCancel: false,
})
.then((user) => { .then((user) => {
return [instance, user] return [instance, user]
}) })