fix getPrimaryEmail

components/public-api/typescript-common/src/user-utils.spec.ts

@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2023 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { Timestamp } from "@bufbuild/protobuf";
+import { Identity, User, User_ProfileDetails } from "@gitpod/public-api/lib/gitpod/v1/user_pb";
+import * as chai from "chai";
+import { getPrimaryEmail } from "./user-utils";
+
+const expect = chai.expect;
+
+describe("getPrimaryEmail", function () {
+    const user = new User({
+        organizationId: undefined,
+        profile: new User_ProfileDetails({
+            emailAddress: "[email protected]",
+        }),
+        identities: [
+            new Identity({
+                primaryEmail: "[email protected]",
+            }),
+        ],
+    });
+    it(`should return email from profile exists`, () => {
+        const email = getPrimaryEmail(user);
+        expect(email).to.equal(user.profile!.emailAddress);
+    });
+    it(`should return email from SSO provider for org-owned accounts`, () => {
+        const ssoEmail = "[email protected]";
+        user.identities.unshift(
+            new Identity({
+                primaryEmail: ssoEmail,
+                // SSO identities have `lastSigninTime` set
+                lastSigninTime: Timestamp.fromDate(new Date()),
+            }),
+        );
+        user.organizationId = "any";
+        const email = getPrimaryEmail(user);
+        expect(email).to.equal(ssoEmail);
+    });
+});

components/public-api/typescript-common/src/user-utils.ts

@@ -36,9 +36,10 @@ export function getPrimaryEmail(user: User | UserProtocol): string | undefined {
 
     // In case of a personal account, check for the email stored by the user.
     if (!isOrganizationOwned(user)) {
-        const emailAddress = UserProtocol.is(user)
-            ? user.additionalData?.profile?.emailAddress
-            : user.profile?.emailAddress;
+        const emailAddress =
+            user instanceof User //
+                ? user.profile?.emailAddress
+                : user.additionalData?.profile?.emailAddress;
         if (emailAddress) {
             return emailAddress;
         }
@@ -56,7 +57,7 @@ export function getPrimaryEmail(user: User | UserProtocol): string | undefined {
 }
 
 export function getName(user: User | UserProtocol): string | undefined {
-    const name = /* user.fullName ||*/ user.name;
+    const name = user.name;
     if (name) {
         return name;
     }