Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated simple oauth to latest version. #357

Merged
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ aliases:
- &job-build
working_directory: &working-directory /app
docker:
- image: &builder-image singledigital/bay-ci-builder:4.x
- image: &builder-image singledigital/bay-ci-builder:5.x
environment:
INSTALL_NEW_SITE: 1
LAGOON_ENVIRONMENT_TYPE: ci
Expand Down
15 changes: 10 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"drupal/address": "^1.4",
"drupal/allowed_formats": "^1.1",
"drupal/better_exposed_filters": "^5.0-beta3",
"drupal/ckeditor_config": "^3.0",
"drupal/ckeditor_config": "^3.2",
"drupal/ckeditor_iframe": "^2.0-beta1",
"drupal/ckeditor_liststyle": "^1.4",
"drupal/ckeditor_scayt": "^1.3",
Expand All @@ -33,7 +33,7 @@
"drupal/entity_browser": "^2.6",
"drupal/entity_reference_revisions": "^1.9",
"drupal/entity_embed": "^1.1",
"drupal/environment_indicator": "^3.5",
"drupal/environment_indicator": "^4.0",
"drupal/fakeobjects": "^1.0",
"drupal/fast_404": "^2.0",
"drupal/field_group": "^3.1",
Expand All @@ -54,7 +54,7 @@
"drupal/redirect": "^1.3",
"drupal/role_delegation": "^1.0-alpha1",
"drupal/seckit": "^1.1",
"drupal/simple_oauth": "^4.5",
"drupal/simple_oauth": "^5.2",
"drupal/simple_sitemap": "^3.0",
"drupal/smart_trim": "^1.1",
"drupal/smtp": "^1.0@RC",
Expand Down Expand Up @@ -227,7 +227,11 @@
"Poor performance when using moderation state views filter - https://www.drupal.org/project/drupal/issues/3097303#comment-13559283": "https://www.drupal.org/files/issues/2020-04-17/3097303-9.patch",
"Refactor Xss::attributes() to allow filtering of style attribute values - https://www.drupal.org/project/drupal/issues/3109650#comment-14098404": "https://www.drupal.org/files/issues/2021-05-10/refactor_xss_attributes-3109650-33.patch",
"Empty breadcrumb at node/add and node/add/{content_type} when frontpage view is enabled - https://www.drupal.org/project/drupal/issues/3220437": "https://www.drupal.org/files/issues/2021-08-25/3220437-61.patch",
"Sort menu list by menu title - https://www.drupal.org/project/drupal/issues/3070721#comment-13918119": "https://www.drupal.org/files/issues/2020-11-26/sort_menu_list-3070721-9.patch"
"Sort menu list by menu title - https://www.drupal.org/project/drupal/issues/3070721#comment-13918119": "https://www.drupal.org/files/issues/2020-11-26/sort_menu_list-3070721-9.patch",
"Add a 'machine_name' widget for string field types with a UniqueField constraint - https://www.drupal.org/project/drupal/issues/2685749": "https://www.drupal.org/files/issues/2022-02-14/2685749-106.patch"
},
"drupal/ckeditor_config": {
"[PHP 8.1] Deprecated function: strcasecmp(): Passing null to parameter #1 ($string1) of type string is deprecated - https://www.drupal.org/project/ckeditor_config/issues/3330938#comment-14852534": "https://www.drupal.org/files/issues/2023-01-04/php-8.1-deprecated-function-warnings-3330938-3.patch"
},
"drupal/entity_embed": {
"More defensive handling of data-entity-embed-display-settings - https://www.drupal.org/project/entity_embed/issues/3010942": "https://www.drupal.org/files/issues/2019-12-11/3077225-10.reduce-invalid-config-logs.patch"
Expand All @@ -246,7 +250,8 @@
"Add password validation to the user entity as a constraint - https://www.drupal.org/project/password_policy/issues/2941526#comment-13525843": "https://www.drupal.org/files/issues/2020-03-27/password_policy-move-password-validation-to-user-entity-2941526-8-D8.patch"
},
"drupal/simple_oauth": {
"access:false even though permission is checked for the role - https://www.drupal.org/project/simple_oauth/issues/2958159#comment-13847450": "https://www.drupal.org/files/issues/2020-10-05/simple_oauth-refresh_token_authenticated_missing_scope-2958159-4.patch"
"access:false even though permission is checked for the role - https://www.drupal.org/project/simple_oauth/issues/2958159#comment-13847450": "https://www.drupal.org/files/issues/2020-10-05/simple_oauth-refresh_token_authenticated_missing_scope-2958159-4.patch",
"Allow to add multiple redirect uri for a single client - https://www.drupal.org/project/simple_oauth/issues/3331436": "https://git.drupalcode.org/project/simple_oauth/-/merge_requests/87.patch"
},
"drupal/tablefield": {
"[UX] Add the ability to hide or disable the import CSV option - https://www.drupal.org/project/tablefield/issues/2337743": "https://www.drupal.org/files/issues/2020-11-11/tablefield-allowed_data_sources-2337743-16.patch"
Expand Down
1 change: 1 addition & 0 deletions dev-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@
#
# Uncomment and set the Dev-Tools's commit value and commit this change.
# export GH_COMMIT=COMMIT_SHA
export GH_COMMIT=ed88053154aaf46c43a5289b126621242d01afe8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, once this has been approved and released I will do that.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this is the way.


bash <(curl -L https://raw.githubusercontent.com/dpc-sdp/dev-tools/master/install?"$(date +%s)") "$@"
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public function processItem($data) {
if ($user) {
if (!\Drupal::keyValue('tide_inactive_users_management')
->get($user->id())) {
_tide_inactive_users_management_sending_email($user);
tide_block_inactive_users_management_sending_email($user);
$current_time = time();
$block_time = strtotime('+1 month', $current_time);
$config = \Drupal::configFactory()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function tide_block_inactive_users_mail($key, &$message, $params) {
/**
* Helper function to send emails.
*/
function _tide_inactive_users_management_sending_email(User $user) {
function tide_block_inactive_users_management_sending_email(User $user) {
// Settings.
$logger = \Drupal::service('logger.factory')
->get(InactiveUsersHandler::LOGGER_CHANNEL);
Expand Down
6 changes: 3 additions & 3 deletions modules/tide_jira/tide_jira.module
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ use Drupal\node\NodeInterface;
* Implements hook_ENTITY_TYPE_insert().
*/
function tide_jira_node_insert(NodeInterface $node) {
handle_save($node);
tide_jira_handle_save($node);
}

/**
* Implements hook_ENTITY_TYPE_update().
*/
function tide_jira_node_update(NodeInterface $node) {
handle_save($node);
tide_jira_handle_save($node);
}

/**
* Handle the node save operation.
*/
function handle_save(NodeInterface $node) {
function tide_jira_handle_save(NodeInterface $node) {
// Never let an error working with JIRA stop content from being saved.
try {
$moderation_state = $node->get('moderation_state')->value;
Expand Down