[server] clean up org-only migration code (#17939)

Author: svenefftinge

components/dashboard/src/components/UsageBasedBillingConfig.tsx

@@ -197,8 +197,6 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
     const showBalance = !showSpinner;
     const showUpgradeTeam =
         !showSpinner && AttributionId.parse(attributionId)?.kind === "team" && !stripeSubscriptionId;
-    const showUpgradeUser =
-        !showSpinner && AttributionId.parse(attributionId)?.kind === "user" && !stripeSubscriptionId;
     const showManageBilling = !showSpinner && !!stripeSubscriptionId;
 
     const updateUsageLimit = useCallback(
@@ -231,13 +229,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
 
     return (
         <div className="mb-16">
-            {!hideSubheading && (
-                <Subheading>
-                    {attributionId && AttributionId.parse(attributionId)?.kind === "user"
-                        ? "Manage billing for your personal account."
-                        : "Manage billing for your organization."}
-                </Subheading>
-            )}
+            {!hideSubheading && <Subheading>Manage billing for your organization.</Subheading>}
             <div className="max-w-xl flex flex-col">
                 {errorMessage && (
                     <Alert className="max-w-xl mt-2" closable={false} showIcon={true} type="error">
@@ -305,7 +297,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
                         </div>
                     </div>
                 )}
-                {(showUpgradeTeam || showUpgradeUser) && (
+                {showUpgradeTeam && (
                     <>
                         <div className="flex flex-col mt-4 p-4 rounded-t-xl bg-gray-50 dark:bg-gray-800">
                             <div className="uppercase text-sm text-gray-400 dark:text-gray-500">Current Plan</div>
@@ -391,11 +383,7 @@ export default function UsageBasedBillingConfig({ hideSubheading = false }: Prop
             )}
             {showUpdateLimitModal && (
                 <UpdateLimitModal
-                    minValue={
-                        AttributionId.parse(attributionId || "")?.kind === "user"
-                            ? BASE_USAGE_LIMIT_FOR_STRIPE_USERS
-                            : 0
-                    }
+                    minValue={0}
                     currentValue={usageLimit}
                     onClose={() => setShowUpdateLimitModal(false)}
                     onUpdate={async (newLimit) => await updateUsageLimit(newLimit)}

components/dashboard/src/workspaces/CreateWorkspacePage.tsx

@@ -181,7 +181,7 @@ export function CreateWorkspacePage() {
     const [selectAccountError, setSelectAccountError] = useState<SelectAccountPayload | undefined>(undefined);
 
     const createWorkspace = useCallback(
-        async (options?: Omit<GitpodServer.CreateWorkspaceOptions, "contextUrl">) => {
+        async (options?: Omit<GitpodServer.CreateWorkspaceOptions, "contextUrl" | "organizationId">) => {
             // add options from search params
             const opts = options || {};
 

components/gitpod-db/src/project-db.spec.db.ts

@@ -51,6 +51,7 @@ class ProjectDBSpec {
             slug: "some-project",
             cloneUrl: "some-random-clone-url",
             userId: user.id,
+            teamId: "team-1",
             appInstallationId: "app-1",
         });
         const searchTerm = "rand";

components/gitpod-db/src/typeorm/entity/db-project.ts

@@ -30,7 +30,7 @@ export class DBProject {
         transformer: Transformer.MAP_EMPTY_STR_TO_UNDEFINED,
     })
     @Index("ind_teamId")
-    teamId?: string;
+    teamId: string;
 
     @Column({
         default: "",

components/gitpod-db/src/typeorm/entity/db-workspace.ts

@@ -36,7 +36,7 @@ export class DBWorkspace implements Workspace {
         transformer: Transformer.MAP_NULL_TO_UNDEFINED,
     })
     @Index()
-    organizationId?: string;
+    organizationId: string;
 
     @Column(TypeORM.UUID_COLUMN_TYPE)
     @Index()

components/gitpod-db/src/user-db.spec.db.ts

@@ -287,6 +287,7 @@ namespace TestData {
         deleted: false,
         readonly: false,
     };
+    export const organizationId: string = "org1";
     export const ID1: Identity = { ...DEFAULT, authId: "2345" };
     export const ID2: Identity = { ...DEFAULT, authId: "3456", authProviderId: "Public-GitLab" };
     export const ID3: Identity = { ...DEFAULT, authId: "4567", authProviderId: "ACME" };
@@ -301,6 +302,7 @@ namespace TestData {
             image: "",
             tasks: [],
         },
+        organizationId,
         context: { title: "example" },
         contextURL: "example.org",
         description: "blabla",

components/gitpod-db/src/workspace-db.spec.db.ts

@@ -8,7 +8,6 @@ import * as chai from "chai";
 const expect = chai.expect;
 import { suite, test, timeout } from "mocha-typescript";
 import { fail } from "assert";
-import { v4 as uuidv4 } from "uuid";
 
 import { WorkspaceInstance, Workspace, PrebuiltWorkspace, CommitContext } from "@gitpod/gitpod-protocol";
 import { testContainer } from "./test-container";
@@ -192,27 +191,6 @@ class WorkspaceDBSpec {
         await mnr.getRepository(DBPrebuiltWorkspace).delete({});
     }
 
-    @test(timeout(10000))
-    public async testStoreUndefinedOrganizationId() {
-        const workspace: Workspace = {
-            ...this.ws,
-            organizationId: undefined,
-        };
-        const instance = {
-            ...this.wsi1,
-        };
-
-        await this.db.store(workspace);
-        await this.db.storeInstance(instance);
-        let fetchedWs = await this.db.findWorkspaceAndInstance(workspace.id);
-        expect(fetchedWs).to.not.be.undefined;
-        expect(fetchedWs!.organizationId).to.be.undefined;
-        workspace.organizationId = uuidv4();
-        await this.db.store(workspace);
-        fetchedWs = await this.db.findWorkspaceAndInstance(workspace.id);
-        expect(fetchedWs?.organizationId).to.eq(workspace.organizationId);
-    }
-
     @test(timeout(10000))
     public async testFindInstancesLast() {
         try {
@@ -273,6 +251,7 @@ class WorkspaceDBSpec {
             description: "something",
             contextURL: "https://github.com/foo/bar",
             ownerId: "1221423",
+            organizationId: "org123",
             context: {
                 title: "my title",
             },
@@ -297,6 +276,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "https://github.com/foo/bar",
                 ownerId: "1221423",
+                organizationId: "org123",
                 context: {
                     title: "my title",
                 },
@@ -592,6 +572,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/inactive",
                 ownerId: "1221423",
+                organizationId: "org123",
                 context: <CommitContext>{
                     title: "my title",
                     repository: {
@@ -607,6 +588,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/active",
                 ownerId: "1221423",
+                organizationId: "org123",
                 context: <CommitContext>{
                     title: "my title",
                     repository: {
@@ -692,6 +674,7 @@ class WorkspaceDBSpec {
     public async findWorkspacesForPurging() {
         const creationTime = "2018-01-01T00:00:00.000Z";
         const ownerId = "1221423";
+        const organizationId = "org123";
         const purgeDate = new Date("2019-02-01T00:00:00.000Z");
         const d20180202 = "2018-02-02T00:00:00.000Z";
         const d20180201 = "2018-02-01T00:00:00.000Z";
@@ -703,6 +686,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/inactive",
                 ownerId,
+                organizationId,
                 context: {
                     title: "my title",
                 },
@@ -716,6 +700,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/active",
                 ownerId,
+                organizationId,
                 context: {
                     title: "my title",
                 },
@@ -729,6 +714,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/active",
                 ownerId,
+                organizationId,
                 context: {
                     title: "my title",
                 },
@@ -742,6 +728,7 @@ class WorkspaceDBSpec {
                 description: "something",
                 contextURL: "http://github.com/myorg/active",
                 ownerId,
+                organizationId,
                 context: {
                     title: "my title",
                 },

components/gitpod-protocol/src/attribution.ts

@@ -4,16 +4,11 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { User } from "./protocol";
-import { Team } from "./teams-projects-protocol";
+import { Organization } from "./teams-projects-protocol";
 
-export type AttributionId = UserAttributionId | TeamAttributionId;
+export type AttributionId = TeamAttributionId;
 export type AttributionTarget = "user" | "team";
 
-export interface UserAttributionId {
-    kind: "user";
-    userId: string;
-}
 export interface TeamAttributionId {
     kind: "team";
     teamId: string;
@@ -22,19 +17,15 @@ export interface TeamAttributionId {
 export namespace AttributionId {
     const SEPARATOR = ":";
 
-    export function createFromOrganizationId(organizationId?: string): AttributionId | undefined {
-        return organizationId ? { kind: "team", teamId: organizationId } : undefined;
+    export function createFromOrganizationId(organizationId: string): AttributionId {
+        return { kind: "team", teamId: organizationId };
     }
 
-    export function create(userOrTeam: User | Team): AttributionId {
-        if (User.is(userOrTeam)) {
-            return { kind: "user", userId: userOrTeam.id };
-        } else {
-            return { kind: "team", teamId: userOrTeam.id };
-        }
+    export function create(organization: Organization): AttributionId {
+        return createFromOrganizationId(organization.id);
     }
 
-    export function parse(s: string): UserAttributionId | TeamAttributionId | undefined {
+    export function parse(s: string): AttributionId | undefined {
         if (!s) {
             return undefined;
         }
@@ -43,22 +34,19 @@ export namespace AttributionId {
             return undefined;
         }
         switch (parts[0]) {
-            case "user":
-                return { kind: "user", userId: parts[1] };
             case "team":
                 return { kind: "team", teamId: parts[1] };
-            default:
-                return undefined;
         }
+        return undefined;
     }
 
     export function render(id: AttributionId): string {
         switch (id.kind) {
-            case "user":
-                return `user${SEPARATOR}${id.userId}`;
             case "team":
                 return `team${SEPARATOR}${id.teamId}`;
         }
+        // allthough grayed as unreachable it is reachable at runtime
+        throw new Error("invalid attributionId kind : " + id.kind);
     }
 
     export function equals(a: AttributionId, b: AttributionId): boolean {

components/gitpod-protocol/src/gitpod-service.ts

@@ -237,9 +237,6 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 
     listUsage(req: ListUsageRequest): Promise<ListUsageResponse>;
 
-    setUsageAttribution(usageAttribution: string): Promise<void>;
-    listAvailableUsageAttributionIds(): Promise<string[]>;
-
     getBillingModeForUser(): Promise<BillingMode>;
     getBillingModeForTeam(teamId: string): Promise<BillingMode>;
 
@@ -398,7 +395,7 @@ export namespace GitpodServer {
     }
     export interface CreateWorkspaceOptions extends StartWorkspaceOptions {
         contextUrl: string;
-        organizationId?: string;
+        organizationId: string;
 
         // whether running workspaces on the same context should be ignored. If false (default) users will be asked.
         //TODO(se) remove this option and let clients do that check if they like. The new create workspace page does it already

components/gitpod-protocol/src/protocol.ts

@@ -8,7 +8,6 @@ import { WorkspaceInstance, PortVisibility, PortProtocol } from "./workspace-ins
 import { RoleOrPermission } from "./permission";
 import { Project } from "./teams-projects-protocol";
 import { createHash } from "crypto";
-import { AttributionId } from "./attribution";
 import { WorkspaceRegion } from "./workspace-cluster";
 
 export interface UserInfo {
@@ -209,17 +208,6 @@ export namespace User {
         return user;
     }
 
-    export function getDefaultAttributionId(user: User): AttributionId {
-        if (user.usageAttributionId) {
-            const result = AttributionId.parse(user.usageAttributionId);
-            if (!result) {
-                throw new Error("Invalid attribution ID: " + user.usageAttributionId);
-            }
-            return result;
-        }
-        return AttributionId.create(user);
-    }
-
     // TODO: refactor where this is referenced so it's more clearly tied to just analytics-tracking
     // Let other places rely on the ProfileDetails type since that's what we store
     // This is the profile data we send to our Segment analytics tracking pipeline
@@ -279,8 +267,6 @@ export interface AdditionalUserData extends Partial<WorkspaceTimeoutSetting> {
     workspaceClasses?: WorkspaceClasses;
     // additional user profile data
     profile?: ProfileDetails;
-    // whether the user has been migrated to team attribution.
-    isMigratedToTeamOnlyAttribution?: boolean;
     shouldSeeMigrationMessage?: boolean;
 
     // remembered workspace auto start options
@@ -806,10 +792,7 @@ export type SnapshotState = "pending" | "available" | "error";
 export interface Workspace {
     id: string;
     creationTime: string;
-    /**
-     * undefined means it is owned by the user (legacy mode, soon to be removed)
-     */
-    organizationId?: string;
+    organizationId: string;
     contextURL: string;
     description: string;
     ownerId: string;