Merge pull request #109 from stephschuster/master

send impersonator user id field to db

Author: davidyaha

packages/server/src/AccountsServer.js

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

packages/server/src/AccountsServer.spec.js

@@ -1429,6 +1429,7 @@ describe('Accounts', () => {
 
     it('returns correct response if authorized', async () => {
       const { accessToken } = Accounts.createTokens('555');
+      const createSession = jest.fn(() => Promise.resolve('001'));
       Accounts.config(
         {
           //eslint-disable-next-line
@@ -1439,7 +1440,7 @@ describe('Accounts', () => {
         {
           findUserById: () => Promise.resolve(user),
           findUserByUsername: () => Promise.resolve(impersonatedUser),
-          createSession: () => Promise.resolve('001'),
+          createSession,
         },
       );
 
@@ -1455,6 +1456,10 @@ describe('Accounts', () => {
         tokens: { sessionId: '001', isImpersonated: true },
         user: impersonatedUser,
       });
+      expect(createSession).toHaveBeenCalledWith(impersonatedUser.id,
+                                                 undefined,
+                                                 undefined,
+                                                 { impersonatorUserId: user.id });
     });
   });
 

packages/server/src/DBInterface.js

@@ -33,7 +33,7 @@ export interface DBInterface {
 
   // Session related operations
   findSessionById(sessionId: string) : Promise<?SessionType>,
-  createSession(userId: string, ip: ?string, userAgent: ?string) : Promise<string>,
+  createSession(userId: string, ip: ?string, userAgent: ?string, extraData: ?Object) : Promise<string>,
   updateSession(sessionId: string, ip: string, userAgent: string) : Promise<void>,
   invalidateSession(sessionId: string): Promise<void>,
   invalidateAllSessions(userId: string): Promise<void>