diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/_components/BannerSettingsForm.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/_components/BannerSettingsForm.tsx index 5a42182bd..36cb07b04 100644 --- a/apps/console/src/pages/organizations/cookie-banners/configuration/_components/BannerSettingsForm.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/configuration/_components/BannerSettingsForm.tsx @@ -40,7 +40,6 @@ const updateBannerMutation = graphql` cookieBanner { id name - origin privacyPolicyUrl consentExpiryDays consentMode @@ -68,7 +67,6 @@ export function BannerSettingsForm({ cookieBannerKey }: BannerSettingsFormProps) const [updateBanner, isUpdating] = useMutation(updateBannerMutation); const [name, setName] = useState(banner.name); - const [origin, setOrigin] = useState(banner.origin); const [privacyPolicyUrl, setPrivacyPolicyUrl] = useState(banner.privacyPolicyUrl); const [consentExpiryDays, setConsentExpiryDays] = useState(String(banner.consentExpiryDays)); const [consentMode, setConsentMode] = useState(banner.consentMode); @@ -82,7 +80,6 @@ export function BannerSettingsForm({ cookieBannerKey }: BannerSettingsFormProps) input: { cookieBannerId: banner.id, name, - origin, privacyPolicyUrl, consentExpiryDays: parseInt(consentExpiryDays, 10), consentMode: consentMode, @@ -108,7 +105,7 @@ export function BannerSettingsForm({ cookieBannerKey }: BannerSettingsFormProps) - setOrigin(e.target.value)} required /> + diff --git a/pkg/cookiebanner/service.go b/pkg/cookiebanner/service.go index 200da9f22..43ec74385 100644 --- a/pkg/cookiebanner/service.go +++ b/pkg/cookiebanner/service.go @@ -61,7 +61,6 @@ type ( UpdateCookieBannerRequest struct { CookieBannerID gid.GID Name *string - Origin *string PrivacyPolicyURL *string ConsentExpiryDays *int ConsentMode *coredata.CookieConsentMode @@ -175,7 +174,6 @@ func (r *UpdateCookieBannerRequest) Validate() error { v.Check(r.CookieBannerID, "cookie_banner_id", validator.Required(), validator.GID(coredata.CookieBannerEntityType)) v.Check(r.Name, "name", validator.SafeTextNoNewLine(255)) - v.Check(r.Origin, "origin", validator.Origin()) v.Check(r.PrivacyPolicyURL, "privacy_policy_url", validator.URL()) v.Check(r.ConsentExpiryDays, "consent_expiry_days", validator.Min(1)) v.Check(r.ConsentMode, "consent_mode", validator.OneOfSlice(coredata.CookieConsentModes())) @@ -775,9 +773,6 @@ func (s *Service) UpdateCookieBanner( if req.Name != nil { banner.Name = *req.Name } - if req.Origin != nil { - banner.Origin = CanonicalizeOrigin(*req.Origin) - } if req.PrivacyPolicyURL != nil { banner.PrivacyPolicyURL = *req.PrivacyPolicyURL } diff --git a/pkg/coredata/cookie_banner.go b/pkg/coredata/cookie_banner.go index 0d74b3a52..980c78804 100644 --- a/pkg/coredata/cookie_banner.go +++ b/pkg/coredata/cookie_banner.go @@ -392,7 +392,6 @@ func (b *CookieBanner) Update( UPDATE cookie_banners SET name = @name, - origin = @origin, state = @state, privacy_policy_url = @privacy_policy_url, consent_expiry_days = @consent_expiry_days, @@ -410,7 +409,6 @@ WHERE args := pgx.StrictNamedArgs{ "id": b.ID, "name": b.Name, - "origin": b.Origin, "state": b.State, "privacy_policy_url": b.PrivacyPolicyURL, "consent_expiry_days": b.ConsentExpiryDays, diff --git a/pkg/server/api/console/v1/cookie_banner_resolvers.go b/pkg/server/api/console/v1/cookie_banner_resolvers.go index 5f638d510..28f2be6f6 100644 --- a/pkg/server/api/console/v1/cookie_banner_resolvers.go +++ b/pkg/server/api/console/v1/cookie_banner_resolvers.go @@ -269,7 +269,6 @@ func (r *mutationResolver) UpdateCookieBanner(ctx context.Context, input types.U cookiebanner.UpdateCookieBannerRequest{ CookieBannerID: input.CookieBannerID, Name: input.Name, - Origin: input.Origin, PrivacyPolicyURL: input.PrivacyPolicyURL, ConsentExpiryDays: input.ConsentExpiryDays, ConsentMode: input.ConsentMode, @@ -280,9 +279,6 @@ func (r *mutationResolver) UpdateCookieBanner(ctx context.Context, input types.U if errors.Is(err, cookiebanner.ErrBannerNotFound) { return nil, gqlutils.NotFound(ctx, err) } - if errors.Is(err, cookiebanner.ErrOriginAlreadyInUse) { - return nil, gqlutils.Conflict(ctx, err) - } if validationErrors, ok := errors.AsType[validator.ValidationErrors](err); ok { return nil, gqlutils.InvalidValidationErrors(ctx, validationErrors) } diff --git a/pkg/server/api/console/v1/graphql/cookie_banner.graphql b/pkg/server/api/console/v1/graphql/cookie_banner.graphql index 29955cb84..663f5324a 100644 --- a/pkg/server/api/console/v1/graphql/cookie_banner.graphql +++ b/pkg/server/api/console/v1/graphql/cookie_banner.graphql @@ -274,7 +274,6 @@ input CreateCookieBannerInput { input UpdateCookieBannerInput { cookieBannerId: ID! name: String - origin: String privacyPolicyUrl: String consentExpiryDays: Int consentMode: CookieConsentMode