[server] don't match by email addresses

Author: AlexTugarev

components/server/src/auth/generic-auth-provider.ts

@@ -434,7 +434,7 @@ export class GenericAuthProvider implements AuthProvider {
                 }
             } else {
                 // no user session present, let's initiate a login
-                currentGitpodUser = await this.userService.findUserForLogin({ candidate, primaryEmail });
+                currentGitpodUser = await this.userService.findUserForLogin({ candidate });
             }
 
             const token = this.createToken(this.tokenUsername, accessToken, refreshToken, currentScopes, tokenResponse.expires_in);

components/server/src/user/user-service.ts

@@ -211,21 +211,8 @@ export class UserService {
         return false;
     }
 
-    /**
-     * Try to find the Gitpod user ...
-     *  1. by identity
-     *  2. by email
-     */
-    async findUserForLogin(params: { candidate: Identity, primaryEmail?: string }) {
+    async findUserForLogin(params: { candidate: Identity }) {
         let user = await this.userDb.findUserByIdentity(params.candidate);
-        if (!user && params.primaryEmail) {
-            // - findUsersByEmail is supposed to return users ordered descending by last login time
-            // - we pick the most recently used one and let the old onces "dry out"
-            const usersWithPrimaryEmail = await this.userDb.findUsersByEmail(params.primaryEmail);
-            if (usersWithPrimaryEmail.length > 0) {
-                user = usersWithPrimaryEmail[0];
-            }
-        }
         return user;
     }