diff --git a/composer.json b/composer.json index eda4158b..ab778da6 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,6 @@ "cweagans/composer-patches": "^1.6", "drupal/admin_toolbar": "^2.4", "drupal/core": "~9.1.2", - "drupal/config_rewrite": "^1.4", "drupal/config_update": "^1.7", "drupal/csv_serialization": "^2.0", "drupal/date_popup": "^1.1", diff --git a/modules/core/api/config/rewrite/jsonapi.settings.yml b/modules/core/api/config/rewrite/jsonapi.settings.yml deleted file mode 100644 index 8c455da1..00000000 --- a/modules/core/api/config/rewrite/jsonapi.settings.yml +++ /dev/null @@ -1 +0,0 @@ -read_only: false diff --git a/modules/core/api/config/rewrite/jsonapi_extras.settings.yml b/modules/core/api/config/rewrite/jsonapi_extras.settings.yml deleted file mode 100644 index 3798a7a0..00000000 --- a/modules/core/api/config/rewrite/jsonapi_extras.settings.yml +++ /dev/null @@ -1 +0,0 @@ -path_prefix: api diff --git a/modules/core/api/config/rewrite/simple_oauth.settings.yml b/modules/core/api/config/rewrite/simple_oauth.settings.yml deleted file mode 100644 index 917e6967..00000000 --- a/modules/core/api/config/rewrite/simple_oauth.settings.yml +++ /dev/null @@ -1,8 +0,0 @@ -access_token_expiration: 3600 -authorization_code_expiration: 300 -refresh_token_expiration: 1209600 -token_cron_batch_size: 0 -public_key: "../keys/public.key" -private_key: "../keys/private.key" -remember_clients: true -use_implicit: false diff --git a/modules/core/api/farm_api.info.yml b/modules/core/api/farm_api.info.yml index 58181013..f69355ba 100644 --- a/modules/core/api/farm_api.info.yml +++ b/modules/core/api/farm_api.info.yml @@ -4,7 +4,6 @@ type: module package: farmOS core_version_requirement: ^9 dependencies: - - config_rewrite:config_rewrite - drupal:jsonapi - entity:entity - jsonapi_extras:jsonapi_extras diff --git a/modules/core/api/farm_api.install b/modules/core/api/farm_api.install index 7777b2e4..a9d23d15 100644 --- a/modules/core/api/farm_api.install +++ b/modules/core/api/farm_api.install @@ -12,6 +12,25 @@ use Drupal\consumers\Entity\Consumer; */ function farm_api_install() { + // Allow JSON:API write operations. + \Drupal::configFactory()->getEditable('jsonapi.settings')->set('read_only', FALSE)->save(); + + // Change the base JSON:API path to /api. + \Drupal::configFactory()->getEditable('jsonapi_extras.settings')->set('path_prefix', 'api')->save(); + + // Load the simple_oauth module settings. + $simple_oauth_settings = \Drupal::configFactory()->getEditable('simple_oauth.settings'); + + // Increase access token expiration time to 1 hour. + $simple_oauth_settings->set('access_token_expiration', 3600); + + // Explicitly set the public/private key path. + $simple_oauth_settings->set('public_key', '../keys/public.key'); + $simple_oauth_settings->set('private_key', '../keys/private.key'); + + // Save simple_oauth settings. + $simple_oauth_settings->save(); + // Generate key files for simple_oauth module. // Code adapted from the contenta_jsonapi profile install tasks: // https://github.com/contentacms/contenta_jsonapi/blob/8.x-3.x/contenta_jsonapi.profile diff --git a/modules/core/entity/config/rewrite/entity_reference_integrity_enforce.settings.yml b/modules/core/entity/config/rewrite/entity_reference_integrity_enforce.settings.yml deleted file mode 100644 index 4b03b16d..00000000 --- a/modules/core/entity/config/rewrite/entity_reference_integrity_enforce.settings.yml +++ /dev/null @@ -1,8 +0,0 @@ -enabled_entity_type_ids: - asset: asset - data_stream: data_stream - file: file - log: log - quantity: quantity - taxonomy_term: taxonomy_term - user: user diff --git a/modules/core/entity/farm_entity.info.yml b/modules/core/entity/farm_entity.info.yml index d78e28b0..94092ffe 100644 --- a/modules/core/entity/farm_entity.info.yml +++ b/modules/core/entity/farm_entity.info.yml @@ -4,7 +4,6 @@ type: module package: farmOS core_version_requirement: ^9 dependencies: - - config_rewrite:config_rewrite - drupal:file - drupal:geofield - drupal:image diff --git a/modules/core/entity/farm_entity.install b/modules/core/entity/farm_entity.install new file mode 100644 index 00000000..b4a54bd3 --- /dev/null +++ b/modules/core/entity/farm_entity.install @@ -0,0 +1,24 @@ +getEditable('entity_reference_integrity_enforce.settings')->set('enabled_entity_type_ids', array_combine($enforced_entity_types, $enforced_entity_types))->save(); +} diff --git a/modules/core/ui/dashboard/farm_ui_dashboard.install b/modules/core/ui/dashboard/farm_ui_dashboard.install index b82e6877..4b8df3df 100644 --- a/modules/core/ui/dashboard/farm_ui_dashboard.install +++ b/modules/core/ui/dashboard/farm_ui_dashboard.install @@ -11,7 +11,5 @@ function farm_ui_dashboard_install() { // Set the front page to /dashboard. - // We cannot set this with config_rewrite because it breaks the config. See: - // https://www.drupal.org/project/config_rewrite/issues/3085330 \Drupal::configFactory()->getEditable('system.site')->set('page.front', '/dashboard')->save(); } diff --git a/modules/core/ui/location/config/rewrite/inspire_tree.settings.yml b/modules/core/ui/location/config/rewrite/inspire_tree.settings.yml deleted file mode 100644 index 66b8d63e..00000000 --- a/modules/core/ui/location/config/rewrite/inspire_tree.settings.yml +++ /dev/null @@ -1 +0,0 @@ -mode: light diff --git a/modules/core/ui/location/farm_ui_location.install b/modules/core/ui/location/farm_ui_location.install new file mode 100644 index 00000000..4c5bf46c --- /dev/null +++ b/modules/core/ui/location/farm_ui_location.install @@ -0,0 +1,15 @@ +getEditable('inspire_tree.settings')->set('mode', 'light')->save(); +} diff --git a/modules/core/ui/user/farm_ui_user.install b/modules/core/ui/user/farm_ui_user.install index 186bd301..11557555 100644 --- a/modules/core/ui/user/farm_ui_user.install +++ b/modules/core/ui/user/farm_ui_user.install @@ -11,7 +11,5 @@ function farm_ui_user_install() { // Set the default 403 page to /403. - // We cannot set this with config_rewrite because it breaks the config. See: - // https://www.drupal.org/project/config_rewrite/issues/3085330 \Drupal::configFactory()->getEditable('system.site')->set('page.403', '/403')->save(); }