Migrate remaining session decorations to ALS service

Author: CarsonF

src/components/authentication/extra-info.resolver.ts

@@ -1,11 +1,6 @@
 import { ResolveField, Resolver } from '@nestjs/graphql';
 import { mapValues } from '@seedcompany/common';
-import {
-  type AbstractClassType,
-  AnonSession,
-  EnhancedResource,
-  type Session,
-} from '~/common';
+import { type AbstractClassType, EnhancedResource } from '~/common';
 import { Privileges } from '../authorization';
 import { BetaFeatures } from '../authorization/dto/beta-features.dto';
 import { LoginOutput, RegisterOutput, SessionOutput } from './dto';
@@ -16,7 +11,7 @@ function AuthExtraInfoResolver(concreteClass: AbstractClassType<any>) {
     constructor(private readonly privileges: Privileges) {}
 
     @ResolveField(() => BetaFeatures)
-    betaFeatures(@AnonSession() session: Session): BetaFeatures {
+    betaFeatures(): BetaFeatures {
       const privileges = this.privileges.for(BetaFeatures);
       const { props } = EnhancedResource.of(BetaFeatures);
       return mapValues.fromList([...props], (prop) =>

src/components/authentication/login.resolver.ts

@@ -6,7 +6,6 @@ import {
   Resolver,
 } from '@nestjs/graphql';
 import { stripIndent } from 'common-tags';
-import { AnonSession, type Session } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
 import { Privileges } from '../authorization';
 import { Power } from '../authorization/dto';
@@ -15,11 +14,13 @@ import { User } from '../user/dto';
 import { Anonymous } from './anonymous.decorator';
 import { AuthenticationService } from './authentication.service';
 import { LoginInput, LoginOutput, LogoutOutput } from './dto';
+import { SessionHost } from './session.host';
 
 @Resolver(LoginOutput)
 export class LoginResolver {
   constructor(
     private readonly authentication: AuthenticationService,
+    private readonly sessionHost: SessionHost,
     private readonly privileges: Privileges,
   ) {}
 
@@ -43,7 +44,8 @@ export class LoginResolver {
     `,
   })
   @Anonymous()
-  async logout(@AnonSession() session: Session): Promise<LogoutOutput> {
+  async logout(): Promise<LogoutOutput> {
+    const session = this.sessionHost.current;
     await this.authentication.logout(session.token);
     await this.authentication.refreshCurrentSession(); // ensure session data is fresh
     return { success: true };

src/components/changeset/changeset-aware.resolver.ts

@@ -1,20 +1,16 @@
 import { Info, Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { stripIndent } from 'common-tags';
-import {
-  AnonSession,
-  Fields,
-  IsOnlyId,
-  Resource,
-  type Session,
-} from '~/common';
+import { Fields, IsOnlyId, Resource } from '~/common';
 import { ResourceLoader, ResourceResolver } from '~/core';
+import { Identity } from '~/core/authentication';
 import { ChangesetResolver } from './changeset.resolver';
 import { Changeset, ChangesetAware, ChangesetDiff } from './dto';
 
 @Resolver(ChangesetAware)
 export class ChangesetAwareResolver {
   constructor(
     private readonly resources: ResourceLoader,
+    private readonly identity: Identity,
     private readonly resourceResolver: ResourceResolver,
     private readonly changesetResolver: ChangesetResolver,
   ) {}
@@ -55,22 +51,17 @@ export class ChangesetAwareResolver {
   })
   async changesetDiff(
     @Parent() object: ChangesetAware,
-    @AnonSession() session: Session,
   ): Promise<ChangesetDiff | null> {
     // TODO move to auth policy
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return null;
     }
 
     const changeset = await this.changeset(object);
     if (!changeset) {
       return null;
     }
-    const diff = await this.changesetResolver.difference(
-      changeset,
-      session,
-      object.id,
-    );
+    const diff = await this.changesetResolver.difference(changeset, object.id);
     return diff;
   }
 }

src/components/changeset/changeset.resolver.ts

@@ -1,12 +1,7 @@
 import { Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';
-import {
-  AnonSession,
-  type ID,
-  IdArg,
-  type ObjectView,
-  type Session,
-} from '~/common';
+import { type ID, IdArg, type ObjectView } from '~/common';
 import { ResourceLoader } from '~/core';
+import { Identity } from '~/core/authentication';
 import { type BaseNode } from '~/core/database/results';
 import { ChangesetRepository } from './changeset.repository';
 import { Changeset, ChangesetDiff, type ResourceChange } from './dto';
@@ -16,6 +11,7 @@ export class ChangesetResolver {
   constructor(
     private readonly repo: ChangesetRepository,
     private readonly resources: ResourceLoader,
+    private readonly identity: Identity,
   ) {}
 
   @Query(() => Changeset)
@@ -28,7 +24,6 @@ export class ChangesetResolver {
   })
   async difference(
     @Parent() changeset: Changeset,
-    @AnonSession() session: Session,
     @IdArg({
       name: 'resource',
       nullable: true,
@@ -38,7 +33,7 @@ export class ChangesetResolver {
     parent?: ID,
   ): Promise<ChangesetDiff> {
     // TODO move to auth policy
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return { added: [], removed: [], changed: [] };
     }
 

src/components/comments/commentable.resolver.ts

@@ -1,23 +1,25 @@
 import { Info, Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';
 import {
-  AnonSession,
   Fields,
   type ID,
   IdArg,
   IsOnly,
   ListArg,
   type Resource,
   SecuredList,
-  type Session,
 } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
+import { Identity } from '~/core/authentication';
 import { CommentThreadLoader } from './comment-thread.loader';
 import { CommentService } from './comment.service';
 import { Commentable, CommentThreadList, CommentThreadListInput } from './dto';
 
 @Resolver(Commentable)
 export class CommentableResolver {
-  constructor(private readonly service: CommentService) {}
+  constructor(
+    private readonly service: CommentService,
+    private readonly identity: Identity,
+  ) {}
 
   @Query(() => Commentable, {
     description: 'Load a commentable resource by ID',
@@ -32,12 +34,11 @@ export class CommentableResolver {
   async commentThreads(
     @Parent() parent: Commentable & Resource,
     @ListArg(CommentThreadListInput) input: CommentThreadListInput,
-    @AnonSession() session: Session,
     @Loader(CommentThreadLoader) commentThreads: LoaderOf<CommentThreadLoader>,
     @Info(Fields, IsOnly(['total'])) onlyTotal: boolean,
   ) {
     // TODO move to auth policy
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return { parent, ...SecuredList.Redacted };
     }
     if (onlyTotal) {

src/components/file/file-node.resolver.ts

@@ -1,6 +1,5 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 import { stripIndent } from 'common-tags';
-import { AnonSession, type Session } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
 import { UserLoader } from '../user';
 import { User } from '../user/dto';
@@ -33,10 +32,7 @@ export class FileNodeResolver {
         without having to fetch each parent serially.
       `,
   })
-  async parents(
-    @Parent() node: FileNode,
-    @AnonSession() _session: Session,
-  ): Promise<readonly FileNode[]> {
+  async parents(@Parent() node: FileNode): Promise<readonly FileNode[]> {
     return await this.service.getParents(node.id);
   }
 

src/components/notifications/notification.resolver.ts

@@ -1,5 +1,6 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import { AnonSession, ListArg, type Session } from '~/common';
+import { ListArg } from '~/common';
+import { Identity } from '~/core/authentication';
 import {
   MarkNotificationReadArgs,
   Notification,
@@ -10,15 +11,17 @@ import { NotificationServiceImpl } from './notification.service';
 
 @Resolver()
 export class NotificationResolver {
-  constructor(private readonly service: NotificationServiceImpl) {}
+  constructor(
+    private readonly service: NotificationServiceImpl,
+    private readonly identity: Identity,
+  ) {}
 
   @Query(() => NotificationList)
   async notifications(
-    @AnonSession() session: Session,
     @ListArg(NotificationListInput) input: NotificationListInput,
   ): Promise<NotificationList> {
     // TODO move to DB layer?
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return { items: [], total: 0, totalUnread: 0, hasMore: false };
     }
     return await this.service.list(input);

src/components/pin/pin.resolver.ts

@@ -1,32 +1,28 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import {
-  AnonSession,
-  type ID,
-  IdArg,
-  ListArg,
-  NotImplementedException,
-  type Session,
-} from '~/common';
+import { type ID, IdArg, ListArg, NotImplementedException } from '~/common';
+import { Identity } from '~/core/authentication';
 import { PinnedListInput, type PinnedListOutput } from './dto';
 import { PinService } from './pin.service';
 
 @Resolver()
 export class PinResolver {
-  constructor(readonly pins: PinService) {}
+  constructor(
+    private readonly pins: PinService,
+    private readonly identity: Identity,
+  ) {}
 
   @Query(() => Boolean, {
     description:
       'Returns whether or not the requesting user has pinned the resource ID',
   })
   async isPinned(
-    @AnonSession() session: Session,
     @IdArg({
       description: 'A resource ID',
     })
     id: ID,
   ): Promise<boolean> {
     // TODO move to DB layer?
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return false;
     }
     return await this.pins.isPinned(id);

src/components/product-progress/create-product-connection.resolver.ts

@@ -1,21 +1,24 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
-import { AnonSession, type Session, Variant } from '~/common';
+import { Variant } from '~/common';
+import { Identity } from '~/core/authentication';
 import { CreateProductOutput } from '../product/dto';
 import { ProductProgressService } from './product-progress.service';
 
 @Resolver(() => CreateProductOutput)
 export class ProgressReportCreateProductConnectionResolver {
-  constructor(private readonly service: ProductProgressService) {}
+  constructor(
+    private readonly service: ProductProgressService,
+    private readonly identity: Identity,
+  ) {}
 
   @ResolveField(() => [Variant], {
     description: 'All available progress variants for this product',
   })
   async availableVariants(
     @Parent() { product }: CreateProductOutput,
-    @AnonSession() session: Session,
   ): Promise<readonly Variant[]> {
     // TODO move to auth policy
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return [];
     }
     return await this.service.getAvailableVariantsForProduct(product);

src/components/project/financial-approver/financial-approver.resolver.ts

@@ -6,8 +6,8 @@ import {
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
-import { AnonSession, type Session } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
+import { Identity } from '~/core/authentication';
 import { Privileges } from '../../authorization';
 import { UserLoader } from '../../user';
 import { User } from '../../user/dto';
@@ -20,6 +20,7 @@ export class FinancialApproverResolver {
   constructor(
     private readonly repo: FinancialApproverRepository,
     private readonly privileges: Privileges,
+    private readonly identity: Identity,
   ) {}
 
   @Query(() => [FinancialApprover])
@@ -30,10 +31,9 @@ export class FinancialApproverResolver {
       nullable: true,
     })
     types: readonly ProjectType[] | undefined,
-    @AnonSession() session: Session,
   ): Promise<readonly FinancialApprover[]> {
     // TODO move to auth policy
-    if (session.anonymous) {
+    if (this.identity.isAnonymous) {
       return [];
     }
     return await this.repo.read(types);