Update protobuf import paths for organization onboarding settings and…

… add iam session unit test assertions

- Refactor import types to use the updated OrganizationSettings_OnboardingSettings_WelcomeMessage
- Adjust type references in OrgMemberAvatarInput, WelcomeMessageConfigurationField, and WelcomeMessageEditor
- Add newUser flag checks in IAM session app spec
- Remove unused import in organization service

Tool: gitpod/catfood.gitpod.cloud

components/dashboard/src/teams/onboarding/OrgMemberAvatarInput.tsx

@@ -7,12 +7,12 @@
 import { useState } from "react";
 import { useListOrganizationMembers } from "../../data/organizations/members-query";
 
-import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import type { OrganizationSettings_OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { Button } from "@podkit/buttons/Button";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@podkit/dropdown/DropDown";
 
 type Props = {
-    settings: OnboardingSettings_WelcomeMessage | undefined;
+    settings: OrganizationSettings_OnboardingSettings_WelcomeMessage | undefined;
     setFeaturedMemberId: (featuredMemberId: string | undefined) => void;
 };
 export const OrgMemberAvatarInput = ({ settings, setFeaturedMemberId }: Props) => {

components/dashboard/src/teams/onboarding/WelcomeMessageConfigurationField.tsx

@@ -5,7 +5,7 @@
  */
 
 import { PlainMessage } from "@bufbuild/protobuf";
-import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import type { OrganizationSettings_OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { SwitchInputField } from "@podkit/switch/Switch";
 import { Heading3, Subheading } from "@podkit/typography/Headings";
 import { useCallback, useState } from "react";
@@ -40,7 +40,10 @@ export const WelcomeMessageConfigurationField = ({ handleUpdateTeamSettings }: P
     const [welcomeMessageEditorOpen, setWelcomeMessageEditorOpen] = useState(false);
 
     const handleUpdateWelcomeMessage = useCallback(
-        async (newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>, options?: UpdateTeamSettingsOptions) => {
+        async (
+            newSettings: PlainMessage<OrganizationSettings_OnboardingSettings_WelcomeMessage>,
+            options?: UpdateTeamSettingsOptions,
+        ) => {
             await handleUpdateTeamSettings(
                 {
                     onboardingSettings: {

components/dashboard/src/teams/onboarding/WelcomeMessageEditor.tsx

@@ -5,7 +5,7 @@
  */
 
 import { PlainMessage } from "@bufbuild/protobuf";
-import type { OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
+import type { OrganizationSettings_OnboardingSettings_WelcomeMessage } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 import { Button } from "@podkit/buttons/Button";
 import { LoadingButton } from "@podkit/buttons/LoadingButton";
 import { Textarea } from "@podkit/forms/TextArea";
@@ -19,12 +19,12 @@ import { OrgMemberAvatarInput } from "./OrgMemberAvatarInput";
 import { gitpodWelcomeSubheading } from "./WelcomeMessageConfigurationField";
 
 type Props = {
-    settings: OnboardingSettings_WelcomeMessage | undefined;
+    settings: OrganizationSettings_OnboardingSettings_WelcomeMessage | undefined;
     isLoading: boolean;
     isOwner: boolean;
     isOpen: boolean;
     handleUpdateWelcomeMessage: (
-        newSettings: PlainMessage<OnboardingSettings_WelcomeMessage>,
+        newSettings: PlainMessage<OrganizationSettings_OnboardingSettings_WelcomeMessage>,
         options?: UpdateTeamSettingsOptions,
     ) => Promise<void>;
     setIsOpen: (isOpen: boolean) => void;

components/server/src/iam/iam-session-app.spec.ts

@@ -139,6 +139,7 @@ class TestIamSessionApp {
 
         expect(result.statusCode, JSON.stringify(result.body)).to.equal(200);
         expect(result.body?.userId).to.equal("id-new-user");
+        expect(result.body?.newUser).to.be.true;
         expect(JSON.stringify(result.get("Set-Cookie"))).to.contain(this.cookieName);
     }
 
@@ -152,6 +153,7 @@ class TestIamSessionApp {
 
         expect(result.statusCode, JSON.stringify(result.body)).to.equal(200);
         expect(result.body?.userId).to.equal("id-known-user");
+        expect(result.body?.newUser).to.be.false;
         expect(JSON.stringify(result.get("Set-Cookie"))).to.contain(this.cookieName);
     }
 

components/server/src/orgs/organization-service.ts

@@ -37,7 +37,6 @@ import { CostCenter_BillingStrategy } from "@gitpod/gitpod-protocol/lib/usage";
 import { CreateUserParams, UserAuthentication } from "../user/user-authentication";
 import isURL from "validator/lib/isURL";
 import { DBTeamMembership } from "@gitpod/gitpod-db/lib/typeorm/entity/db-team-membership";
-import { TrustedValue } from "@gitpod/gitpod-protocol/lib/util/scrubbing";
 
 @injectable()
 export class OrganizationService {