Drop session everywhere possible

Author: CarsonF

src/components/authentication/authentication.service.ts

@@ -69,7 +69,7 @@ export class AuthenticationService {
       const users = this.moduleRef.get(userMod.UserService, { strict: false });
       userId = await this.gel.usingOptions(
         disableAccessPolicies,
-        async () => await users.create(input, session),
+        async () => await users.create(input),
       );
     } catch (e) {
       // remap field prop as `email` field is at a different location in register() than createPerson()
@@ -85,7 +85,7 @@ export class AuthenticationService {
     return userId;
   }
 
-  async login(input: LoginInput, session: Session): Promise<ID> {
+  async login(input: LoginInput): Promise<ID> {
     const hash = await this.repo.getPasswordHash(input);
 
     if (!(await this.crypto.verify(hash, input.password))) {
@@ -259,7 +259,6 @@ export class AuthenticationService {
   async changePassword(
     oldPassword: string,
     newPassword: string,
-    session: Session,
   ): Promise<void> {
     if (!oldPassword)
       throw new InputException('Old Password Required', 'oldPassword');
@@ -291,10 +290,7 @@ export class AuthenticationService {
     });
   }
 
-  async resetPassword(
-    { token, password }: ResetPasswordInput,
-    session: Session,
-  ): Promise<void> {
+  async resetPassword({ token, password }: ResetPasswordInput): Promise<void> {
     const emailToken = await this.repo.findEmailToken(token);
     if (!emailToken) {
       throw new InputException('Token is invalid', 'TokenInvalid');

src/components/authentication/login.resolver.ts

@@ -30,11 +30,8 @@ export class LoginResolver {
     `,
   })
   @Anonymous()
-  async login(
-    @Args('input') input: LoginInput,
-    @AnonSession() session: Session,
-  ): Promise<LoginOutput> {
-    const user = await this.authentication.login(input, session);
+  async login(@Args('input') input: LoginInput): Promise<LoginOutput> {
+    const user = await this.authentication.login(input);
     await this.authentication.refreshCurrentSession();
     return { user };
   }

src/components/authentication/password.resolver.ts

@@ -1,6 +1,5 @@
 import { Args, Mutation, Resolver } from '@nestjs/graphql';
 import { stripIndent } from 'common-tags';
-import { AnonSession, LoggedInSession, type Session } from '~/common';
 import { Anonymous } from './anonymous.decorator';
 import { AuthenticationService } from './authentication.service';
 import {
@@ -24,9 +23,8 @@ export class PasswordResolver {
   })
   async changePassword(
     @Args() { oldPassword, newPassword }: ChangePasswordArgs,
-    @LoggedInSession() session: Session,
   ): Promise<ChangePasswordOutput> {
-    await this.authentication.changePassword(oldPassword, newPassword, session);
+    await this.authentication.changePassword(oldPassword, newPassword);
     return { success: true };
   }
 
@@ -49,9 +47,8 @@ export class PasswordResolver {
   @Anonymous()
   async resetPassword(
     @Args('input') input: ResetPasswordInput,
-    @AnonSession() session: Session,
   ): Promise<ResetPasswordOutput> {
-    await this.authentication.resetPassword(input, session);
+    await this.authentication.resetPassword(input);
     return { success: true };
   }
 }

src/components/authentication/register.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';
@@ -30,12 +29,9 @@ export class RegisterResolver {
     `,
   })
   @Anonymous()
-  async register(
-    @Args('input') input: RegisterInput,
-    @AnonSession() session: Session,
-  ): Promise<RegisterOutput> {
-    const user = await this.authentication.register(input, session);
-    await this.authentication.login(input, session);
+  async register(@Args('input') input: RegisterInput): Promise<RegisterOutput> {
+    const user = await this.authentication.register(input);
+    await this.authentication.login(input);
     await this.authentication.refreshCurrentSession();
     return { user };
   }

src/components/authentication/session.resolver.ts

@@ -123,8 +123,8 @@ export class SessionResolver {
     // They should still be able to see their own props from this field.
     // Otherwise, it could be that the impersonatee can't see the impersonator's roles,
     // and now the UI can't stop impersonating because it doesn't know the impersonator's roles.
-    return await this.authentication.asUser(impersonator, (_) =>
-      this.users.readOne(impersonator.userId, _),
+    return await this.authentication.asUser(impersonator, () =>
+      this.users.readOne(impersonator.userId),
     );
   }
 

src/components/authorization/policy/executor/edge-privileges.ts

@@ -30,11 +30,6 @@ export class EdgePrivileges<
     this.resource = EnhancedResource.of(resource);
   }
 
-  /** @deprecated */
-  get session() {
-    return this.policyExecutor.sessionHost.current;
-  }
-
   get context() {
     return this.object;
   }

src/components/budget/budget-record.loader.ts

@@ -16,7 +16,7 @@ export class BudgetRecordLoader extends ObjectViewAwareLoader<BudgetRecord> {
   }
 
   async loadOne(id: ID, view?: ObjectView): Promise<BudgetRecord> {
-    return await this.budgets.readOneRecord(id, this.session, view);
+    return await this.budgets.readOneRecord(id, view);
   }
 
   // Below is the same logic as SingleItemLoader

src/components/budget/budget-record.repository.ts

@@ -7,7 +7,6 @@ import {
   labelForView,
   NotFoundException,
   type ObjectView,
-  type Session,
   type UnsecuredDto,
 } from '~/common';
 import { DtoRepository } from '~/core/database';
@@ -35,7 +34,6 @@ interface BudgetRecordHydrateArgs {
   recordVar?: string;
   projectVar?: string;
   outputVar?: string;
-  session: Session;
   view?: ObjectView;
 }
 
@@ -127,11 +125,7 @@ export class BudgetRecordRepository extends DtoRepository<
     return result.dto;
   }
 
-  async list(
-    input: BudgetRecordListInput,
-    session: Session,
-    view?: ObjectView,
-  ) {
+  async list(input: BudgetRecordListInput, view?: ObjectView) {
     const { budgetId } = input.filter ?? {};
     const result = await this.db
       .query()
@@ -151,7 +145,6 @@ export class BudgetRecordRepository extends DtoRepository<
     recordVar = 'node',
     projectVar = 'project',
     outputVar = 'dto',
-    session,
     view,
   }: BudgetRecordHydrateArgs) {
     return (query: Query) =>

src/components/budget/budget-record.resolver.ts

@@ -5,7 +5,7 @@ import {
   ResolveField,
   Resolver,
 } from '@nestjs/graphql';
-import { LoggedInSession, mapSecuredValue, type Session } from '~/common';
+import { mapSecuredValue } from '~/common';
 import { Loader, type LoaderOf } from '~/core';
 import { OrganizationLoader } from '../organization';
 import { SecuredOrganization } from '../organization/dto';
@@ -34,14 +34,9 @@ export class BudgetRecordResolver {
     description: 'Update a budgetRecord',
   })
   async updateBudgetRecord(
-    @LoggedInSession() session: Session,
     @Args('input') { budgetRecord: input, changeset }: UpdateBudgetRecordInput,
   ): Promise<UpdateBudgetRecordOutput> {
-    const budgetRecord = await this.service.updateRecord(
-      input,
-      session,
-      changeset,
-    );
+    const budgetRecord = await this.service.updateRecord(input, changeset);
     return { budgetRecord };
   }
 }

src/components/budget/budget.loader.ts

@@ -10,6 +10,6 @@ export class BudgetLoader extends ObjectViewAwareLoader<Budget> {
   }
 
   async loadManyByView(ids: readonly ID[], view?: ObjectView) {
-    return await this.budgets.readMany(ids, this.session, view);
+    return await this.budgets.readMany(ids, view);
   }
 }