Fix e2e tests

Signed-off-by: Émile Ré <emile@getprobo.com>

pkg/iam/iam_actions.go

@@ -52,11 +52,13 @@ const (
 	ActionMembershipRoleSetOwner = "iam:membership-role:set-owner"
 
 	// Membership Profile actions
-	ActionMembershipProfileGet    = "iam:membership-profile:get"
-	ActionMembershipProfileList   = "iam:membership-profile:list"
-	ActionMembershipProfileCreate = "iam:membership-profile:create"
-	ActionMembershipProfileUpdate = "iam:membership-profile:update"
-	ActionMembershipProfileDelete = "iam:membership-profile:delete"
+	ActionMembershipProfileGet        = "iam:membership-profile:get"
+	ActionMembershipProfileList       = "iam:membership-profile:list"
+	ActionMembershipProfileCreate     = "iam:membership-profile:create"
+	ActionMembershipProfileUpdate     = "iam:membership-profile:update"
+	ActionMembershipProfileDelete     = "iam:membership-profile:delete"
+	ActionMembershipProfileActivate   = "iam:membership-profile:activate"
+	ActionMembershipProfileDeactivate = "iam:membership-profile:deactivate"
 
 	// Personal API Key actions
 	ActionPersonalAPIKeyCreate = "iam:personal-api-key:create"

pkg/iam/iam_policies.go

@@ -167,6 +167,8 @@ var IAMOwnerPolicy = policy.NewPolicy(
 		ActionMembershipProfileCreate,
 		ActionMembershipProfileUpdate,
 		ActionMembershipProfileDelete,
+		ActionMembershipProfileActivate,
+		ActionMembershipProfileDeactivate,
 	).
 		WithSID("full-membership-profile-access").
 		When(policy.Equals("principal.organization_id", "resource.organization_id")),
@@ -248,6 +250,8 @@ var IAMAdminPolicy = policy.NewPolicy(
 		ActionMembershipProfileCreate,
 		ActionMembershipProfileUpdate,
 		ActionMembershipProfileDelete,
+		ActionMembershipProfileActivate,
+		ActionMembershipProfileDeactivate,
 	).
 		WithSID("membership-profile-admin-access").
 		When(policy.Equals("principal.organization_id", "resource.organization_id")),

pkg/iam/organization_service.go

@@ -427,7 +427,7 @@ func (s *OrganizationService) CreateOrganization(
 	ctx context.Context,
 	identityID gid.GID,
 	req *CreateOrganizationRequest,
-) (*coredata.Organization, *coredata.Membership, error) {
+) (*coredata.Organization, *coredata.MembershipProfile, error) {
 	if err := req.Validate(); err != nil {
 		return nil, nil, fmt.Errorf("invalid request: %w", err)
 	}
@@ -639,7 +639,7 @@ func (s *OrganizationService) CreateOrganization(
 		return nil, nil, fmt.Errorf("cannot insert organization: %w", err)
 	}
 
-	return organization, membership, nil
+	return organization, profile, nil
 }
 
 func (s *OrganizationService) UpdateOrganization(ctx context.Context, organizationID gid.GID, req *UpdateOrganizationRequest) (*coredata.Organization, error) {
@@ -973,6 +973,41 @@ func (s *OrganizationService) UpdateUser(ctx context.Context, req *UpdateUserReq
 	return profile, nil
 }
 
+func (s *OrganizationService) UpdateUserState(
+	ctx context.Context,
+	userID gid.GID,
+	state coredata.ProfileState,
+) (*coredata.MembershipProfile, error) {
+	var (
+		scope   = coredata.NewScopeFromObjectID(userID)
+		profile = &coredata.MembershipProfile{}
+	)
+
+	err := s.pg.WithConn(
+		ctx,
+		func(conn pg.Conn) error {
+			if err := profile.LoadByID(ctx, conn, scope, userID); err != nil {
+				return fmt.Errorf("cannot load profile: %w", err)
+			}
+
+			profile.State = state
+			profile.UpdatedAt = time.Now()
+
+			if err := profile.Update(ctx, conn, scope); err != nil {
+				return fmt.Errorf("cannot update profile: %w", err)
+			}
+
+			return nil
+		},
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return profile, nil
+}
+
 func (s *OrganizationService) GetProfile(ctx context.Context, profileID gid.GID) (*coredata.MembershipProfile, error) {
 	profile := &coredata.MembershipProfile{}