update Cerebrate UI components and respect skip_proxy flag
#10372
Conversation
T
8000
his file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add skip_proxy field to the Cerebrates UI components to add, view, and index configured cerebrates - `view.ctp` (renders between `URL` and `Owner Organisation`) - index index.ctp (renders after `Description`) - add.ctp (renders after `description`)
Added a 4th argument to `AppModel::setupHttpSocket( ..)` (null by default) to allow specification of the `$model` to use when setting up via `SyncTool`. `$model` defaults to null so that it falls though to the default model used by SyncTool::setupHttpSocket i.e. "Server"
Update the call to `AppModel::setupHttpSocket` to specify the server model as "Cerebrate" and thereby pass the model on to `SyncTool::setupHttpSocket` which picks-up the Cerebrate's `skip_proxy setting`
corrected typo in error handling.
A `SocketException` attempts to access the erros's [sic] getMessage attribute when throwing a BadRequestException:
```
throw new BadRequestException(__('Something went wrong. Error returned: %s', $e->getMessage));
```
missing function parentheses added
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
skip_proxysetting is now fully supported in the Cerebrate UI, including:This also ensures the
skip_proxysetting is properly respected in HTTP requests made viaSyncTool::setupHttpSocket(). Previously, the method defaulted to using the 'Server' model key, which caused it to overlookskip_proxyand other configuration values when used by models like 'Cerebrate'.To resolve this:
AppModel::setupHttpSocket()was extended to accept an optional$modelparameter. If provided, it is passed through toSyncTool::setupHttpSocket()to ensure the correct settings are used.AppModelthat do not yet pass a model identifier.Tested and confirmed working in production with
skip_proxyenabled.