Applied PR #109

Author: davidyaha

packages/server/__tests__/accounts-server.ts

@@ -1643,6 +1643,7 @@ describe('Accounts', () => {
 
     it('returns correct response if authorized', async () => {
       const { accessToken } = Accounts.createTokens('555');
+      const createSession = jest.fn(() => Promise.resolve('001'));
       Accounts.config(
         {
           impersonationAuthorize: async (userObject, impersonateToUser) => {
@@ -1655,7 +1656,7 @@ describe('Accounts', () => {
         {
           findUserById: () => Promise.resolve(user),
           findUserByUsername: () => Promise.resolve(impersonatedUser),
-          createSession: () => Promise.resolve('001'),
+          createSession,
         }
       );
 
@@ -1675,6 +1676,11 @@ describe('Accounts', () => {
         tokens: { sessionId: '001', isImpersonated: true },
         user: impersonatedUser,
       });
+      expect(
+        createSession
+      ).toHaveBeenCalledWith(impersonatedUser.id, undefined, undefined, {
+        impersonatorUserId: user.id,
+      });
     });
   });
 

packages/server/src/accounts-server.ts

@@ -365,7 +365,8 @@ export class AccountsServer {
       const newSessionId = await this.db.createSession(
         impersonatedUser.id,
         ip,
-        userAgent
+        userAgent,
+        { impersonatorUserId: user.id }
       );
       const impersonationTokens = this.createTokens(newSessionId, true);
       const impersonationResult = {

packages/server/src/db-interface.ts

@@ -44,7 +44,8 @@ export interface DBInterface {
   createSession(
     userId: string,
     ip?: string,
-    userAgent?: string
+    userAgent?: string,
+    extraData?: object
   ): Promise<string>;
   updateSession(
     sessionId: string,