Skip to content

Commit

Permalink
Rename additional occurrences of 'post' to 'secure'
Browse files Browse the repository at this point in the history
  • Loading branch information
michalkleiner committed Aug 28, 2023
1 parent a4213fb commit 8f9b5cd
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 97 deletions.
4 changes: 2 additions & 2 deletions plugins/UsersManager/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -384,13 +384,13 @@ public function addNewToken()
Nonce::checkNonce(self::NONCE_ADD_AUTH_TOKEN);

$description = \Piwik\Request::fromRequest()->getStringParameter('description', '');
$postOnly = \Piwik\Request::fromRequest()->getBoolParameter('secure_only', false);
$secureOnly = \Piwik\Request::fromRequest()->getBoolParameter('secure_only', false);

$login = Piwik::getCurrentUserLogin();

$generatedToken = $this->userModel->generateRandomTokenAuth();

$this->userModel->addTokenAuth($login, $generatedToken, $description, Date::now()->getDatetime(), null, false, $postOnly);
$this->userModel->addTokenAuth($login, $generatedToken, $description, Date::now()->getDatetime(), null, false, $secureOnly);

$container = StaticContainer::getContainer();
$email = $container->make(TokenAuthCreatedEmail::class, [
Expand Down
4 changes: 2 additions & 2 deletions plugins/UsersManager/UsersManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'UsersManager_PrivAdmin';
$translationKeys[] = 'UsersManager_PrivNone';
$translationKeys[] = 'UsersManager_PrivView';
$translationKeys[] = 'UsersManager_OnlyAllowPostRequests';
$translationKeys[] = 'UsersManager_PostOnly';
$translationKeys[] = 'UsersManager_OnlyAllowSecureRequests';
$translationKeys[] = 'UsersManager_RemovePermissions';
$translationKeys[] = 'UsersManager_RemoveSuperuserAccessConfirm';
$translationKeys[] = 'UsersManager_RemoveUserAccess';
Expand All @@ -372,6 +371,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
$translationKeys[] = 'UsersManager_RoleFor';
$translationKeys[] = 'UsersManager_RolesHelp';
$translationKeys[] = 'UsersManager_SaveBasicInfo';
$translationKeys[] = 'UsersManager_SecureOnly';
$translationKeys[] = 'UsersManager_SendInvite';
$translationKeys[] = 'UsersManager_SetPermission';
$translationKeys[] = 'UsersManager_Status';
Expand Down
4 changes: 2 additions & 2 deletions plugins/UsersManager/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
"CopyDeniedHints": "Please try again by either switching browsers or copying and sharing this link directly instead: %1$s",
"AuthTokenSecureOnlyHelp": "Enable this option to only allow this token to be used in a secure way (e.g. POST requests), this is recommended as a best security practice. The token will then not be valid as a URL parameter in GET requests.",
"AuthTokenSecureOnlyHelpForced": "The system administrator has configured Matomo to only allow tokens to be created for use in secure way (e.g. via POST requests), you cannot change this token option.",
"OnlyAllowPostRequests": "Only allow POST requests",
"PostOnly": "POST only"
"OnlyAllowSecureRequests": "Only allow secure requests",
"SecureOnly": "Secure only"
}
}
2 changes: 1 addition & 1 deletion plugins/UsersManager/templates/addNewToken.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
vue-entry="UsersManager.AddNewToken"
no-description="{{ noDescription|json_encode }}"
form-nonce="{{ nonce|json_encode }}"
force-post-only="{{ forcePostOnly|json_encode }}"
force-secure-only="{{ forceSecureOnly|json_encode }}"
></div>

{% endblock %}
154 changes: 77 additions & 77 deletions plugins/UsersManager/vue/dist/UsersManager.umd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plugins/UsersManager/vue/dist/UsersManager.umd.min.js

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions plugins/UsersManager/vue/src/AddNewToken/AddNewToken.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<Field
uicontrol="checkbox"
name="secure_only"
:title="translate('UsersManager_OnlyAllowPostRequests')"
:title="translate('UsersManager_OnlyAllowSecureRequests')"
:required="false"
:inline-help=postOnlyHelp
v-model="tokenPostOnly"
:disabled=forcePostOnlyCalc
:inline-help=secureOnlyHelp
v-model="tokenSecureOnly"
:disabled=forceSecureOnlyCalc
/>

<input type="hidden" :value="formNonce" name="nonce">
Expand All @@ -61,14 +61,14 @@ import { Field } from 'CorePluginsAdmin';
interface AddNewTokenState {
tokenDescription: string;
tokenPostOnly: boolean;
tokenSecureOnly: boolean;
}
export default defineComponent({
props: {
formNonce: String,
noDescription: Boolean,
forcePostOnly: Boolean,
forceSecureOnly: Boolean,
},
components: {
ContentBlock,
Expand All @@ -77,7 +77,7 @@ export default defineComponent({
data(): AddNewTokenState {
return {
tokenDescription: '',
tokenPostOnly: true,
tokenSecureOnly: true,
};
},
computed: {
Expand All @@ -101,11 +101,11 @@ export default defineComponent({
'</a>',
);
},
forcePostOnlyCalc() {
return this.forcePostOnly;
forceSecureOnlyCalc() {
return this.forceSecureOnly;
},
postOnlyHelp() {
return (this.forcePostOnly ? translate('UsersManager_AuthTokenSecureOnlyHelpForced')
secureOnlyHelp() {
return (this.forceSecureOnly ? translate('UsersManager_AuthTokenSecureOnlyHelpForced')
: translate('UsersManager_AuthTokenSecureOnlyHelp'));
},
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/UsersManager/vue/src/UserSecurity/UserSecurity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<th>{{ translate('General_CreationDate') }}</th>
<th>{{ translate('General_Description') }}</th>
<th>{{ translate('UsersManager_LastUsed') }}</th>
<th>{{ translate('UsersManager_PostOnly') }}</th>
<th>{{ translate('UsersManager_SecureOnly') }}</th>
<th
v-if="hasTokensWithExpireDate"
:title="translate('UsersManager_TokensWithExpireDateCreationBySystem')"
Expand Down

0 comments on commit 8f9b5cd

Please sign in to comment.