Граф коммитов

1700 Коммитов

Автор SHA1 Сообщение Дата
Conor Macpherson
9c71784d0d Code review comments. 2022-12-27 16:54:46 -05:00
Conor Macpherson
40c94892ee Merge branch 'master' of github.com:mattermost/mattermost-server into MM-47853-true-up-review-telemetry-off-non-air-gapped 2022-12-27 11:20:09 -05:00
Said Atrahouch
b9501bc535 Mm 47648 check license expandable (#21770)
* [MM-47648] Handler for check if a subscription is expandable

* Mock cloud regenerate

* PR Webapp test purpose only

* [MM-47648] Refactor and tests for expand stats for a subscription

* Fix typos

* style fix

* has to be revert

* CWS URL to Spinwick

* new spinwick url

* target portal test

* Generate token instead of send licenseId

* Rename

* Rename methods

* Revert public key and cws url

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-27 12:08:11 +01:00
Conor Macpherson
d5a5686986 Add admin and cloud checks back. 2022-12-23 16:48:19 -05:00
Conor Macpherson
64000da417 Convert due date string to millisecond format. 2022-12-23 15:37:31 -05:00
Conor Macpherson
ec5be3c940 Hopefully fix db tests. 2022-12-23 10:06:09 -05:00
Conor Macpherson
40fbb00acc Remove auto create if no records present, add new error message. 2022-12-23 09:18:14 -05:00
Conor Macpherson
299c079895 ensure true up review status is updated when a review is requested. 2022-12-22 16:06:00 -05:00
Conor Macpherson
cedfc46bd9 Add more tests, add mocks. 2022-12-22 15:40:26 -05:00
Conor Macpherson
88090ea40b Add true up review status history, add migration for persisting history, add store to create, get, and update true up review history entries, cleanup errors, etc. 2022-12-22 14:59:05 -05:00
Conor Macpherson
91bc4b3c80 Fix tests, flip login for cloud check. 2022-12-21 15:02:24 -05:00
Ibrahim Serdar Acikgoz
c252704140 Revert "[MM-48626] Move plugins environment out of Channels (#21730)" (#21934) 2022-12-21 22:10:26 +03:00
Conor Macpherson
518ba17920 Ensure telemetry data is sent as a flat map, rather than a structured one. 2022-12-21 12:21:35 -05:00
Conor Macpherson
f65aa61440 remove webhook queries in favor of using existing ones that ignore deleted webhooks, enforce not implemented for cloud users, get seats from license.features.users. 2022-12-21 12:09:33 -05:00
Conor Macpherson
77d3e3591a Add minor code review changes. 2022-12-21 11:54:45 -05:00
Ibrahim Serdar Acikgoz
dcf499b51d [MM-48626] Move plugins environment out of Channels (#21730) 2022-12-21 16:11:57 +03:00
Conor Macpherson
a64be851c0 Remove unneeded conversion. 2022-12-20 14:43:37 -05:00
Conor Macpherson
95594c0374 respond with review profile for use in bundle download. 2022-12-20 14:22:39 -05:00
Conor Macpherson
589ae56c29 Remove shadowing declaration of subscription. 2022-12-20 09:53:20 -05:00
Conor Macpherson
197262bc70 Move seats data extraction closer to subscription definition. 2022-12-20 09:43:07 -05:00
Conor Macpherson
6864717504 Add nil checks for cloud in case of air-gapped instances? 2022-12-20 09:42:01 -05:00
Conor Macpherson
9c4ce9016f Fix error check placement. 2022-12-20 09:18:20 -05:00
Conor Macpherson
e4593998bc Fix error checks in tests. 2022-12-19 17:40:37 -05:00
Conor Macpherson
eb0cc1c3a4 Add tests. 2022-12-19 17:28:26 -05:00
Conor Macpherson
2c092291f5 Reorder data extraction, define review profile in-place rather than sectioned for each data domain 2022-12-19 17:11:29 -05:00
Conor Macpherson
12328278f8 Merge branch 'master' of github.com:mattermost/mattermost-server into MM-47853-true-up-review-telemetry-off-non-air-gapped 2022-12-19 15:40:03 -05:00
Conor Macpherson
96ed60a472 Remove unused fields, update response. 2022-12-19 15:36:15 -05:00
Shivashis Padhi
79193240e9 [MM-44842] Add restore_group permission (#21806)
* Add restore_group permission

* Fix tests failing due to new permission in groups

* Add new migration to add custom_group_restore permission

* Add mock for new migration function

* Fix tests

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-19 12:01:59 -05:00
Daniel Schalla
529fdd2643 [MM-49170] Implement Auditable Interface for Patch Post Struct (#21898)
* Implement Auditable Function for Patch Post Endpoint

* Call auditable explicitly for patchPost patch parameter

* Delete audit-config.json

* Include HasReactions in Audit Log Entry for Patch
2022-12-16 16:50:06 +01:00
cyrilzhang-mm
33b59e0e96 Add parameter to return group members in order of display name (#21775) 2022-12-15 14:20:36 -05:00
Nathaniel Allred
a8fa3f29e9 Self-hosted in-product purchase (#21804)
* Self-hosted admins can purchase licenses in-app when `ServiceSettings,SelfHostedPurchase` is true (the default)
* Content Security Policy enables loading assets from `js.stripe.com/v3` when `ServiceSettings.SelfHostedPurchase` is true (the default).
* Add `hosted_customer` API subpath
* Add status of SelfHostedPurchase to telemetry config report.
* Support showing admins self-hosted invoices when `ServiceSettings.SelfHostedPurchase` is true (the default)

Co-authored-by: Conor Macpherson <116016004+ConorMacpherson@users.noreply.github.com>
2022-12-13 13:36:18 -06:00
Claudio Costa
6fd174a95f [MM-48946] Fix read after write issue when uploading data (#21868)
* Fix read after write issue when uploading data

* Prefer request.CTX interface
2022-12-13 11:47:05 -06:00
Conor Macpherson
cad414fd4d Use proper error handling, fix up data structure, attempt to send telemetry data. 2022-12-13 13:09:20 -04:00
emmyni
4cd205027c [MM-48091]: Remove is_paid_tier (#21850) 2022-12-13 08:57:46 -05:00
Shivashis Padhi
0193bfd7de [MM-47378] Respond with bad requests for wrong query parameters 'roles' in getUsers (#21569)
* Respond with bad requests for wrong query parameters in roles

* Revert "Respond with bad requests for wrong query parameters in roles"

This reverts commit d8374d94e0b1f61ad445127010f9780475c48d1a.

* Add GetUser client function to query with channel_id and roles

* Return bad parameters error on invalid roles

* Make client function generic, lint fixes

* i18n strings addition

* Validate 'role', add stricter check for comma separated roles
2022-12-09 11:43:13 +05:30
Conor Macpherson
c0735ae689 Add route with functionality for building out the true up review profile. 2022-12-08 16:11:43 -05:00
Mylon Suren
8c206c1fd4 [MM-48921] Don't return error when deleting Draft if Draft DNE (#21818)
* set global drafts feature flag to true

* Don't return error on deleteDraft when draft doesn't exist in server

* undo accidental feature flag change

* address comments

* change log level to debug

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-08 09:40:14 -05:00
Ibrahim Serdar Acikgoz
d8e2859b0b Minimize app dependency on platform service (#21548) 2022-12-07 20:31:03 +03:00
Conor Macpherson
cdc8476032 Merge branch 'master' of github.com:mattermost/mattermost-server into MM-48125-downgrade-to-starter-email-says-upgrade-with-billing-start-date 2022-12-07 10:21:55 -05:00
Nick Misasi
3872f24b0c [MM-47566] Add upcominginvoice field to Subscription type (#21717)
* Add upcominginvoice field to Subscription type

* Add support for fetching upcoming invoices

* Put back upcominginvoice

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-07 10:05:48 -05:00
Konstantinos Pittas
6e9dbbd237 [MM-46463] Return last_picture_update for new team members (#21758)
* return last picture update

* add API test

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-07 11:16:56 +02:00
Conor Macpherson
82d9f25807 Replase product skus with their full names. 2022-12-06 13:03:00 -05:00
Conor Macpherson
47b8125659 Fix check for starter sku. 2022-12-05 15:28:36 -05:00
Conor Macpherson
6c43daa218 Merge in master. 2022-12-05 15:07:03 -05:00
Conor Macpherson
352eedf7c1 Fix app error id. 2022-12-05 14:53:38 -05:00
Conor Macpherson
fc8268990e Add check for subscription change to product with sku cloud-starter. 2022-12-05 14:34:51 -05:00
Ibrahim Serdar Acikgoz
43e26ccda2 MPA: move product hooks out of plugins environment (#21772)
* product: add new hooks manager for porducts

* move product hooks out of plugins environment

* add hooks for plugin
2022-12-05 20:16:35 +01:00
emmyni
9e79ca7160 [MM-48472]: Update the Upgrade Confirmation Email for yearly subscriptions (#21766) 2022-12-05 12:10:00 -05:00
Konstantinos Pittas
3059abdd88 [MM-44765] Add API method for getting post's information from permalink (#21518)
* add api for getting post's information

* add information about current user state

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
2022-12-05 16:04:44 +02:00
Shivashis Padhi
b0804f26ef Adhere to convention while writing insights response (#21602) 2022-12-04 21:20:51 +05:30