Tim Otten [Wed, 28 Oct 2020 09:28:24 +0000 (02:28 -0700)]
dev/core#2141 - APIv4 - Add `OAuthClient.authorizationCode` authentication
Tim Otten [Thu, 29 Oct 2020 00:08:29 +0000 (17:08 -0700)]
dev/core#2141 - Update 'oauth2.league' to respect setting 'oauthClientRedirectUrl'
Tim Otten [Tue, 27 Oct 2020 13:15:43 +0000 (06:15 -0700)]
dev/core#2141 - Add services 'oauth2.league' and 'oauth2.token'
Tim Otten [Tue, 27 Oct 2020 12:20:38 +0000 (05:20 -0700)]
dev/core#2141 - APIv4 - Expands tests for OAuthSysToken
Tim Otten [Tue, 27 Oct 2020 11:16:10 +0000 (04:16 -0700)]
dev/core#2141 - APIv4 - Validate OAuthClient.provider property
Tim Otten [Tue, 27 Oct 2020 00:34:12 +0000 (17:34 -0700)]
dev/core#2141 - APIv4 - Add OAuthClient & OAuthSysToken with unit-test
Tim Otten [Fri, 23 Oct 2020 05:46:03 +0000 (22:46 -0700)]
dev/core#2141 - Schema - Add OAuthClient and OAuthSysToken
Depends on OAuthProvider and permissions ('manage OAuth client' and 'manage OAuth client secrets')
Tim Otten [Fri, 30 Oct 2020 09:04:37 +0000 (02:04 -0700)]
dev/core#2141 - Split OAuthProvider files into subdirs. Use long cache.
Tim Otten [Tue, 27 Oct 2020 10:02:28 +0000 (03:02 -0700)]
dev/core#2141 - APIv4 - Add OAuthProvider.get w/test. Split dist/local/test lists.
Tim Otten [Mon, 26 Oct 2020 23:28:36 +0000 (16:28 -0700)]
dev/core#2141 - Permissions - Define 'manage OAuth client' and 'manage OAuth client secrets'
Tim Otten [Fri, 30 Oct 2020 00:41:48 +0000 (17:41 -0700)]
dev/core#2141 - Add upgrader to skeletal ext/oauth-client
Tim Otten [Sat, 24 Oct 2020 00:15:25 +0000 (17:15 -0700)]
dev/core#2141 - Generate skeletal ext/oauth-client
Seamus Lee [Tue, 3 Nov 2020 01:09:06 +0000 (12:09 +1100)]
Merge pull request #18908 from totten/master-composer-oauth
dev/core#2141 - composer.json - Require league/oauth2-{client,google}
Tim Otten [Wed, 21 Oct 2020 22:15:43 +0000 (15:15 -0700)]
composer.lock - Require league/oauth2-{client,google}
Tim Otten [Wed, 21 Oct 2020 22:13:31 +0000 (15:13 -0700)]
composer.json - Require league/oauth2-{client,google}
Note: This oauth2-client matches the constraint that's declared in civixero, which (in my
local copy of `universe`) is the only published extension that uses the same library.
The oauth2-google is included because has special requirements around
'prompt' which conflict with `GenericProvider`. We could potentially resolve that other
ways (eg rework `CiviGenericProvider`), but this seems easier right now.
Seamus Lee [Mon, 2 Nov 2020 20:03:49 +0000 (07:03 +1100)]
Merge pull request #18904 from civicrm/5.31
5.31
Matthew Wire [Mon, 2 Nov 2020 11:02:46 +0000 (11:02 +0000)]
Merge pull request #18802 from eileenmcnaughton/refs
dev/core#2043 Remove instance of pass-by-ref
Matthew Wire [Mon, 2 Nov 2020 11:01:55 +0000 (11:01 +0000)]
Merge pull request #18894 from eileenmcnaughton/cancel
Move call to update related pledges on contribution cancel to extension
Matthew Wire [Mon, 2 Nov 2020 11:00:40 +0000 (11:00 +0000)]
Merge pull request #18895 from eileenmcnaughton/ipn
Remove IPN reference to _relatedObjects, deprecate property
Matthew Wire [Mon, 2 Nov 2020 11:00:07 +0000 (11:00 +0000)]
Merge pull request #18896 from eileenmcnaughton/ipn2
[Ref] Simplify params
Matthew Wire [Mon, 2 Nov 2020 10:59:39 +0000 (10:59 +0000)]
Merge pull request #18900 from eileenmcnaughton/entry
[REF] Simplify use of shared code.
Matthew Wire [Mon, 2 Nov 2020 10:58:10 +0000 (10:58 +0000)]
Merge pull request #18903 from eileenmcnaughton/aip2
Remove deprecated code
Matthew Wire [Mon, 2 Nov 2020 10:55:38 +0000 (10:55 +0000)]
Merge pull request #18807 from jvos/postProcess-MessageTemplates
Add postProcess hook to MessageTemplates
Seamus Lee [Mon, 2 Nov 2020 08:41:37 +0000 (19:41 +1100)]
Merge pull request #18899 from seamuslee001/composer_2x
Update composer-download-plugin to v3.0.0 to support usage of compose…
Seamus Lee [Mon, 2 Nov 2020 07:20:35 +0000 (18:20 +1100)]
Merge pull request #18901 from alifrumin/5.31rn
[NFC] 5.31 Release Notes - First Pass
Seamus Lee [Mon, 2 Nov 2020 06:50:56 +0000 (17:50 +1100)]
Merge pull request #18897 from eileenmcnaughton/ip3
[REF] Remove silly if
Seamus Lee [Mon, 2 Nov 2020 06:50:10 +0000 (17:50 +1100)]
Merge pull request #18902 from totten/master-altermailstore
dev/core#2141 - Add hook_civicrm_alterMailStore
Seamus Lee [Mon, 2 Nov 2020 05:40:22 +0000 (16:40 +1100)]
Merge pull request #18898 from seamuslee001/dev_core_2147
dev/core#2147 Switch the groups search field on Simple search back fr…
Seamus Lee [Mon, 2 Nov 2020 02:07:15 +0000 (13:07 +1100)]
Update composer-download-plugin to v3.0.0 to support usage of composer 2.x
eileen [Mon, 2 Nov 2020 04:18:54 +0000 (17:18 +1300)]
Remove deprecated code
These few lines have had any meaning removed already....
Seamus Lee [Mon, 2 Nov 2020 04:08:25 +0000 (15:08 +1100)]
Merge pull request #18852 from eileenmcnaughton/aip
[Ref] Move sending the email back out of the recur function
Tim Otten [Fri, 30 Oct 2020 23:01:42 +0000 (16:01 -0700)]
dev/core#2141 - Add hook_civicrm_alterMailStore
Overview
--------
The CiviCRM "MailStore" layer is used for importing email messages from
various sources (IMAP, POP3, Maildir, etc). There is a built-in list with a
handful of drivers (`CRM_Mailing_MailStore_Imap`, etc).
This patch adds a hook for manipulating those drivers.
Before
------
It's not possible for an extension to add a driver, modify a driver, etc.
After
-----
It is now possible to add/modify/replace drivers. Here are two examples.
(1) To supplement the IMAP authentication with a dynamic token for XOAuth2:
```php
function hook_civicrm_alterMailStore(&$mailSettings) {
if (...$mailSettings requires oauth...) {
$mailSettings['auth'] = 'XOAuth2';
$mailSettings['password'] = $myOauthSystem->getToken(...);
}
}
```
(2) To add a new protocol `FIZZBUZZ`, you would:
1. Register a value in the OptionGroup `mail_protocol`.
2. Create a driver class (eg `CRM_Mailing_MailStore_FizzBuzz` extends `CRM_Mailing_MailStore`)
3. Use the hook to activate the class:
```php
function hook_civicrm_alterMailStore(&$mailSettings) {
if ($mailSettings['protocol'] === 'FIZZBUZZ') {
$mailSettings['factory'] = function ($mailSettings) {
return new CRM_Mailing_MailStore_FizzBuzz(...);
};
}
}
```
Technical Details
-----------------
This adds a unit-test with examples of basic/non-hook behavior and hooked behavior.
In reading the diff for `getStore()`, note that it previously had a long
'switch()' to handle instantiation. I tried to make the change in a way that
you could see some continuity - e.g. it's still the same basic `switch()`.
The change is to basically wrap the bits inside a function:
* Before: `case 'FOO': return new Foo(...)`
* After: `case 'FOO': return ['factory' => function(...) { return new Foo(...); }]`
Alice Frumin [Fri, 23 Oct 2020 01:04:04 +0000 (20:04 -0500)]
5.31 release notes first pass
eileen [Mon, 2 Nov 2020 02:24:27 +0000 (15:24 +1300)]
[REF] Simplify use of shared code.
This function has been sharing 'transitionComponentWithStatusMessage' but in
fact it throws away the status message and the preliminary checks are silly.
This simplifies it so it calls the part of the function it actually does share
eileen [Sun, 1 Nov 2020 23:16:31 +0000 (12:16 +1300)]
Move call to update related pledges on contribution cancel to extension
This moves the functionality over & switches Order api to be entirely relying on the
hook rather than a call to the deprecated transitionComponents function.
eileen [Mon, 2 Nov 2020 00:03:28 +0000 (13:03 +1300)]
[REF] Remove silly if
Checking component AND contributionRecur is silly - the latter will only
be set if relevant so remove the extra if
Seamus Lee [Mon, 2 Nov 2020 01:31:09 +0000 (12:31 +1100)]
dev/core#2147 Switch the groups search field on Simple search back from select2 to normal select
eileen [Sun, 1 Nov 2020 23:45:36 +0000 (12:45 +1300)]
[Ref] Simplify params
As with
https://github.com/civicrm/civicrm-core/commit/
0d74d91cd340b9f1ea2224119c748e372dffe245
pass the retrieved parameters to the single function rather than the id of the
object retrieved based on them
eileen [Sun, 1 Nov 2020 23:36:10 +0000 (12:36 +1300)]
Remove IPN reference to _relatedObjects, deprecate property
Eileen McNaughton [Sun, 1 Nov 2020 20:51:57 +0000 (09:51 +1300)]
Merge pull request #18893 from civicrm/5.31
5.31 to master
Eileen McNaughton [Sun, 1 Nov 2020 20:51:02 +0000 (09:51 +1300)]
Merge pull request #18877 from seamuslee001/dev_core_2149
dev/core#2149 Ensure that if a chained select field is required and t…
Matthew Wire [Sun, 1 Nov 2020 18:25:18 +0000 (18:25 +0000)]
Merge pull request #18881 from eileenmcnaughton/cancelb
dev/core#927 Move handling of participant.cancel from BaseIPN to contributioncancelactions
Matthew Wire [Sun, 1 Nov 2020 18:22:12 +0000 (18:22 +0000)]
Merge pull request #18882 from eileenmcnaughton/pps
[Ref] Use direct version of participant id
colemanw [Sat, 31 Oct 2020 13:44:15 +0000 (09:44 -0400)]
Merge pull request #18892 from eileenmcnaughton/uf
Hack away at false negative test fails
Seamus Lee [Sat, 31 Oct 2020 03:02:07 +0000 (14:02 +1100)]
Merge pull request #18891 from civicrm/5.31
5.31
Seamus Lee [Sat, 31 Oct 2020 00:53:04 +0000 (11:53 +1100)]
Merge pull request #18890 from seamuslee001/dev_core_2154
dev/core#2154 Fix the output of the full text custom search form
Eileen McNaughton [Fri, 30 Oct 2020 23:48:37 +0000 (12:48 +1300)]
Merge pull request #18887 from colemanw/entityPaths
Add entity paths to schema & APIv4
eileen [Fri, 30 Oct 2020 23:23:00 +0000 (12:23 +1300)]
Hack away at false negative test fails
colemanw [Fri, 30 Oct 2020 23:10:09 +0000 (19:10 -0400)]
Merge pull request #18889 from demeritcowboy/fulltext-attributes
dev/core#2154 - Pass correct parameters to CRM_Core_Form::add() in fulltext custom search
Seamus Lee [Fri, 30 Oct 2020 22:58:09 +0000 (09:58 +1100)]
Merge pull request #18876 from colemanw/searchDisplay
Lotsa new features for the Search Kit extension
Seamus Lee [Fri, 30 Oct 2020 22:44:19 +0000 (09:44 +1100)]
dev/core#2154 Fix the output of the full text custom search form
Eileen McNaughton [Fri, 30 Oct 2020 22:25:30 +0000 (11:25 +1300)]
Merge pull request #18888 from colemanw/deprecateCrudLink
Deprecate hook_civicrm_crudLink
Eileen McNaughton [Fri, 30 Oct 2020 22:18:34 +0000 (11:18 +1300)]
Merge pull request #18885 from totten/master-add-mail
dev/core#2141 - "Add Mail Account" - Allow hookable listing of setup links
demeritcowboy [Fri, 30 Oct 2020 21:33:03 +0000 (17:33 -0400)]
pass correct parameters
eileen [Fri, 30 Oct 2020 05:54:01 +0000 (18:54 +1300)]
Move handling of participant.cancel to contributioncancelactions extension
Coleman Watts [Fri, 30 Oct 2020 19:55:28 +0000 (15:55 -0400)]
Deprecate hook_civicrm_crudLink
The hook is not used anywhere in civicrm_universe, and the function calling it is only used in 1 place,
full-text search for generating links to file entities.
Seamus Lee [Fri, 30 Oct 2020 19:53:13 +0000 (06:53 +1100)]
Merge pull request #18886 from mlutfy/moneyTypo
(NFC) Fix typo in Money valueFormat depretation warning
Coleman Watts [Fri, 30 Oct 2020 19:38:10 +0000 (15:38 -0400)]
Mark version beta2 & add upgrade script
Coleman Watts [Fri, 30 Oct 2020 18:32:03 +0000 (14:32 -0400)]
Add entity paths to schema & APIv4
Entity paths can be used to construct a url to create/view/edit/update a given entity.
The paths are local and contain tokens which would need to be replace, e.g. [id] or [contact_id].
The token name corresponds to the field name whos value is requred.
colemanw [Fri, 30 Oct 2020 14:46:41 +0000 (10:46 -0400)]
Merge pull request #18884 from jaapjansma/dev_2152_master_2
/dev/core#2152: Merge contacts keep case roles
colemanw [Fri, 30 Oct 2020 13:23:24 +0000 (09:23 -0400)]
Merge pull request #18883 from eileenmcnaughton/ppp
Remove always-true & otherwise silly if
Mathieu Lutfy [Fri, 30 Oct 2020 13:08:00 +0000 (09:08 -0400)]
(NFC) Fix typo in Money valueFormat depretation warning
Tim Otten [Fri, 30 Oct 2020 06:59:51 +0000 (23:59 -0700)]
dev/core#2141 - "Add Mail Account" - Allow hookable listing of setup links
Overview
--------
For certain types of mail accounts -- such as Google Mail and Microsoft
Exchange Online -- the setup process may require interaction with a remote
web-service. The web-service provides some critical details (like
authentication tokens) and some handy details (like their username / email
address).
If the supports one of these services, then this revision will enable a
setup process. It alters the "Add Mail Account" action to use a more
fine-tuned procedure.
Before
------
* Navigate to "Administer => CiviMail => Mail Accounts".
* Below the table, there is a singular button "Add Mail Account".
* Click the button.
* It opens an empty form for configuring the account.
After
-----
By default, the UX is the same. However, if you have an extension like
`oauth-client`, then it changes:
* Navigate to "Administer => CiviMail => Mail Accounts".
* Below the table, there is a select box for "Add Mail Account". It lists different account types.
* Choose one of the options from the dropbox. The step depends on...
* If you choose "Standard Mail Account", it opens the empty config form.
* If you choose "Microsoft Exchange Online", it redirects to MS to get authorization
from the user. Then, it redirects and prefills the config form.
Jaap Jansma [Fri, 30 Oct 2020 10:08:42 +0000 (11:08 +0100)]
Fix for dev/core#2152
eileen [Fri, 30 Oct 2020 07:23:47 +0000 (20:23 +1300)]
Remove always-true & otherwise silly if
eileen [Fri, 30 Oct 2020 07:19:29 +0000 (20:19 +1300)]
[Ref] Use direct version of participant id
ids['Participant'] is taken from the url. It is then passed to loadRelatedObjects
where
https://github.com/civicrm/civicrm-core/blob/
0bd5e6bfbe8f339dbe066e3e96e00760c93a57e2/CRM/Contribute/BAO/Contribution.php#L2890
loads an object based on it. We then set ids too the object's id - which is a long way around to
using the paramter we started from. This does that
Seamus Lee [Fri, 30 Oct 2020 02:13:36 +0000 (13:13 +1100)]
Merge pull request #18879 from colemanw/fixDAOStyle
Fix extension generated DAO files to pass civilint
Coleman Watts [Fri, 30 Oct 2020 00:25:52 +0000 (20:25 -0400)]
Fix extension generated DAO files to pass civilint
Coleman Watts [Thu, 29 Oct 2020 20:58:29 +0000 (16:58 -0400)]
Search ext: Add option to format table cell as link in search display
Coleman Watts [Thu, 29 Oct 2020 17:18:48 +0000 (13:18 -0400)]
Search ext: decouple actions, add searchKit base module, rename searchAdmin module to crmSearchAdmin
Coleman Watts [Wed, 28 Oct 2020 20:15:34 +0000 (16:15 -0400)]
Search ext: Improve styling
Coleman Watts [Wed, 28 Oct 2020 18:02:36 +0000 (14:02 -0400)]
Search ext: Dynamic templates and a preview button for displays
Coleman Watts [Tue, 27 Oct 2020 20:18:41 +0000 (16:18 -0400)]
Search ext: Support for embedding search displays in afforms
Coleman Watts [Tue, 27 Oct 2020 14:36:07 +0000 (10:36 -0400)]
Search ext: Link to displays from admin screen
Coleman Watts [Tue, 27 Oct 2020 01:35:09 +0000 (21:35 -0400)]
Search ext: Exclude settings from being html-encoded in db
Coleman Watts [Tue, 20 Oct 2020 19:55:00 +0000 (15:55 -0400)]
Search ext: Add searchDisplay and searchPage modules
Coleman Watts [Sun, 18 Oct 2020 23:52:28 +0000 (19:52 -0400)]
Search ext: group tab
Coleman Watts [Sun, 18 Oct 2020 04:15:29 +0000 (00:15 -0400)]
Search ext: Rename component crmSearch to crmSearchAdmin
Coleman Watts [Sun, 18 Oct 2020 04:03:39 +0000 (00:03 -0400)]
Search ext: Add vertical tabs
Coleman Watts [Fri, 16 Oct 2020 18:42:27 +0000 (14:42 -0400)]
Search ext: Rework URL routing in preparation for search display management
Having the API params in the URL bar (like the API Explorer) was kinda neat but isn't going to work
with more complex management of multiple displays on the same screen.
This simplifies the routing to standard CRUD routes of /list, /create/:type, & /edit/:id
Coleman Watts [Fri, 16 Oct 2020 18:39:37 +0000 (14:39 -0400)]
Search ext: Improve wording of update & delete actions
Coleman Watts [Thu, 15 Oct 2020 20:35:50 +0000 (16:35 -0400)]
Search ext: Add list view
Coleman Watts [Thu, 15 Oct 2020 13:19:16 +0000 (09:19 -0400)]
Search ext: Add SearchDisplay database entity
Seamus Lee [Thu, 29 Oct 2020 23:08:35 +0000 (10:08 +1100)]
dev/core#2149 Ensure that if a chained select field is required and there are no valid options found ensure that jquery validation doesn't block submission
Eileen McNaughton [Thu, 29 Oct 2020 21:49:33 +0000 (10:49 +1300)]
Merge pull request #18875 from colemanw/5.31-merge
Merge branch 5.31 into master
Eileen McNaughton [Thu, 29 Oct 2020 21:48:56 +0000 (10:48 +1300)]
Merge pull request #18874 from mlutfy/totalParticipantTs
Participant Calculate/Fees: fix ts usage, simplify wording
Coleman Watts [Thu, 29 Oct 2020 21:19:51 +0000 (17:19 -0400)]
Merge branch '5.31' into master
Seamus Lee [Thu, 29 Oct 2020 21:03:18 +0000 (08:03 +1100)]
Merge pull request #18712 from eileenmcnaughton/locev3
dev/core#1879 Fix inconsistent ability to view event information
Eileen McNaughton [Thu, 29 Oct 2020 20:51:24 +0000 (09:51 +1300)]
Merge pull request #18867 from sunilpawar/sms_provider
Show only Active SMS provider List on Mass SMS form
Eileen McNaughton [Thu, 29 Oct 2020 20:12:25 +0000 (09:12 +1300)]
Merge pull request #18873 from colemanw/title_plural
APIv4 - Fix nonstandard camelCase of title_plural field
Mathieu Lutfy [Thu, 29 Oct 2020 18:57:09 +0000 (14:57 -0400)]
Participant Calculate/Fees: fix ts usage, simplify wording
Matthew Wire [Thu, 29 Oct 2020 17:26:43 +0000 (17:26 +0000)]
Merge pull request #18872 from seamuslee001/dev_core_2150
dev/core#2150 Re-enact the recapture validation by validating the res…
Coleman Watts [Thu, 29 Oct 2020 15:33:19 +0000 (11:33 -0400)]
APIv4 - Fix nonstandard camelCase of title_plural field
Seamus Lee [Thu, 29 Oct 2020 01:08:23 +0000 (12:08 +1100)]
dev/core#2150 Re-enact the recapture validation by validating the response token on recapture
Ensure the form rule is actually triggered not just registered
Eileen McNaughton [Wed, 28 Oct 2020 23:42:48 +0000 (12:42 +1300)]
Merge pull request #18871 from totten/master-api-single
APIv4 - Add `$result->single()` helper
Tim Otten [Wed, 28 Oct 2020 22:36:10 +0000 (15:36 -0700)]
Merge pull request #18870 from totten/master-api-al
ClassLoader - Fix autoloading of `API_Exception`
Tim Otten [Wed, 28 Oct 2020 02:44:41 +0000 (19:44 -0700)]
APIv4 - Add $result->single() helper
Tim Otten [Mon, 26 Oct 2020 22:21:06 +0000 (15:21 -0700)]
ClassLoader - Fix autoloading of API_Exception
eileen [Mon, 19 Oct 2020 22:46:29 +0000 (11:46 +1300)]
dev/core#2043 Remove instance of pass-by-ref
The postProcess function onlly uses one value generated in the private function
processMembersip. This makes that a return value rather than something hidden in
the pass-by-ref
Eileen McNaughton [Wed, 28 Oct 2020 20:14:15 +0000 (09:14 +1300)]
Merge pull request #18306 from mattwire/refactororderapientityparams
Refactor entityParams in Order.Create API so it is easier to understand/modify