[pull] master from mattermost:master#782
Merged
Merged
Conversation
…37100) release-11.8 shipped 000184_add_admin_to_permission_level as its last migration (v11.8.0 GA). On master the same migration landed as 000189 after 000184 had already been assigned to add_lastused_to_incoming_webhooks, creating a number collision that would cause the webhooks migration to be silently skipped when upgrading from 11.8. Renumber on master to resolve: - 000189 → 000184 (add_admin_to_permission_level): aligns with the GA number - 000184 → 000196 (add_lastused_to_incoming_webhooks): fresh unapplied number Regenerate migrations.list accordingly. Co-authored-by: Cursor <cursoragent@cursor.com>
#36707) * [MM-68421] Frontend: PAT creation UI — expiry picker and status display Wires the webapp UI to the server-side support added in PR #36706 (and the MM-68419 model changes): - Extends UserAccessToken type with expires_at, and ClientConfig with EnforcePersonalAccessTokenExpiry / MaximumPersonalAccessTokenLifetimeDays. - Threads expires_at through Client4.createUserAccessToken and the mattermost-redux createUserAccessToken action. - Adds a date/time picker to the PAT creation form (reuses DateTimePickerModal). Honors enforcement and clamps to the max-lifetime setting; maps server error ids (expires_at_required/in_past/too_far) to localized messages. - Displays expiry, derived status badge (active/expired/disabled), and an approaching-expiry warning (<7 days) in the account settings token list. Mirrors expiry + status in the admin Manage Tokens modal. - Adds the supporting i18n keys. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Address review: i18n, ServerError type, scss, explicit guards - Inject intl so the "Expires in N days" tooltip and the picker ariaLabel are localized instead of hard-coded English. - Use the canonical ServerError type from @mattermost/types/errors instead of an ad-hoc inline cast. - Dedupe the new i18n ids — keep a single "Expires: " string per namespace and drop the duplicates introduced in the first pass. - Add scss for setting-box__token-expiry / __token-status / __token-expiry-warning so the new status pill and warning render with the expected styling. - Replace truthy checks on the numeric expiresAt with explicit > 0 comparisons for readability. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Replace expiry datetime picker with preset chooser + custom date Per UX discussion: PATs are long-lived so sub-day precision is noise. Swap the DateTimePickerModal for a native <select> of presets (No expiry, 7d, 30d, 90d, 1 year, Custom date) with a date-only <input type="date"> revealed when Custom is selected. Effective time is end-of-local-day, which matches how users think about expiry. - Drops the DateTimePickerModal import and the picker open/close handlers; removes the moment-timezone import. - Adds isPresetAllowed() that hides presets exceeding MaximumPersonalAccessTokenLifetimeDays, and a defaultExpiryPreset() that picks 30d (then 7d, then Custom) when enforcement is on, No expiry otherwise. - The custom <input type="date"> uses min=today and max=now+maxDays for native bounds; submit-time validation still maps server error ids if the user bypasses the bounds. - i18n: adds preset labels; drops the now-unused picker/clear/change strings. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Fix CI: playwright config and ESLint blank line - Add EnforcePersonalAccessTokenExpiry / MaximumPersonalAccessTokenLifetimeDays to e2e-tests/playwright/lib/src/server/default_config.ts so its tsc -b matches the updated ServiceSettings shape. - Drop a stray double blank line in user_access_token_section.tsx that tripped no-multiple-empty-lines. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Sort i18n keys to match formatjs extract output ci/i18n-extract diffs en.json against the formatjs extractor's sorted output and fails on any difference. Re-run the extract so the new PAT-expiry keys land in alphabetical position. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Address CodeRabbit findings - Clamp the default custom-expiry date to maxLifetimeDays when set so the form doesn't open in an invalid state when defaultExpiryPreset() falls back to 'custom'. - Reject a cleared/empty custom date with expires_at_required instead of silently submitting without an expiry; only forward expiresAt to the action when it's > 0. - Use an explicit undefined check in Client4.createUserAccessToken so an intentional 0 isn't dropped from the request body. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Update manage_tokens_modal snapshot for expiry + status row The admin token list now renders an Expires row and a status badge per token; refresh the jest snapshot. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Add unit tests for PAT expiry helpers Per the PR Test Analysis advisory: export the pure helpers from user_access_token_section.tsx and add unit tests covering them. Coverage: - deriveTokenStatus: active / expired / inactive branches. - mapServerErrorIdToMessage: all three server error ids (short and api.user.create_user_access_token.*.app_error variants) and the default null path. - endOfLocalDayPlusDays: end-of-day on the Nth future day, 0 days. - endOfLocalDayFromIsoDate: valid ISO date and malformed inputs. - PRESET_DAYS: snapshot of the preset durations. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Freeze time in PAT helper tests to avoid midnight flake The date arithmetic helpers (Date.now, new Date()) could disagree across a midnight boundary, making the tests theoretically flaky. Pin system time to a stable mid-day in 2026 via jest.useFakeTimers. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * [MM-68421] Add component tests for PAT expiry creation UI Covers the create-form validation branches (missing description, empty custom date, past date, beyond maxLifetimeDays), enforceExpiry rendering (no-expiry option hidden + enforced hint), maxLifetimeDays preset filtering, and token-list status display (active/expired/disabled, never, and the "expires soon" warning). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Add behavioral status/expiry tests for manage_tokens_modal Covers the admin token modal's derived status display: Active + "Never" for an active token without expiry, Expired for an active token past its expiry, Disabled for an inactive token regardless of expiry, and Active with a rendered date (not "Never") for a token expiring in the future. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Align PAT expiry UI with shipped server contract The server (#36706) did not ship a separate EnforcePersonalAccessTokenExpiry flag — expiry enforcement is implied by MaximumPersonalAccessTokenLifetimeDays > 0. Two webapp gaps surfaced once the server side merged: - enforceExpiry was read from the never-sent config.EnforcePersonalAccessToken Expiry, so the "hide No-expiry / require expiry" path was dead. Derive it from maxLifetimeDays > 0 instead and drop the dead config flag from the component, redux props, ClientConfig/ServiceSettings types, and the e2e default config. - The server returns app.user_access_token.expires_at_{required,in_past,too_far} .app_error, but mapServerErrorIdToMessage matched the api.user.create_user_ access_token.* namespace, so the localized errors never fired. Map the actual ids. Unit tests updated accordingly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Add Playwright e2e for PAT expiry UI Covers, against a real server, the personal access token expiry surfaces in Account Settings > Security: - the expiry picker renders all presets and reveals the custom-date input - a custom expiry with no date is blocked client-side - MaximumPersonalAccessTokenLifetimeDays > 0 hides "No expiry" and oversized presets, shows the enforced hint, and rejects an over-the-limit custom date - the token list shows Active/Never, an "expires in N days" warning, and the Disabled badge (seeded via the API) The expired-status badge is left to the component unit tests since the server rejects creating a token whose expiry is already in the past. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Use locator('option') for native select assertions getByRole('option') does not reliably match the options of a closed native <select>, which would make the absence assertions (toHaveCount(0)) pass vacuously. Query option elements by DOM instead, matching the repo's house pattern for native selects. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Fix expiry overshoot vs server cap and review nits Review found that presets/custom dates resolve to end-of-local-day, which can sit up to ~24h beyond the server cap of "now + MaximumPersonalAccessTokenLife timeDays" (an exact duration from creation time). With a max configured, the default preset equals the cap, so accepting the default and saving was rejected server-side with expires_at_too_far for most of the day. - Clamp the submitted expiry to the server cap when a maximum lifetime is set. Validation still runs on the raw end-of-day value so an explicitly out-of-range custom date is still rejected; only the in-range end-of-day overshoot is clamped. - Count "expires in N days" from the start of today and floor it, so an end-of-day expiry no longer over-reports by one (a 7-day token reads "7 days", not "8"). - Add an aria-label to the custom expiry date input. Tests: unit coverage for clampExpiresAtToMaxLifetime; a Playwright spec that creates a token with the default preset under a 30-day cap and asserts success. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Apply prettier formatting to PAT e2e spec The ci/playwright/npm-check job (lint + prettier + tsc + lint:test-docs) failed on prettier formatting. eslint and tsc were clean; reformat the spec to satisfy prettier as well. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Add PAT max-lifetime System Console setting and creation-form UX fixes - Add ServiceSettings.MaximumPersonalAccessTokenLifetimeDays number field to System Console > Integrations > Integration Management, after Enable Personal Access Tokens (disabled when tokens are disabled). - Disable the token creation Save button until a non-empty description is entered (description input is now controlled; whitespace-only rejected). - Render the token creation form as a distinct "Create New Token" card so it no longer blends into the existing token list. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * Fix stylelint property order in new-token card Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * [MM-68421] Validate PAT expiry inline before submit Surface the expiry validation error in the create-token form and disable Save while the selection is invalid, instead of only failing inside the create-confirmation flow. Previously a system admin had to click Save then "Yes, Create" before seeing "An expiry date is required." for an empty custom date. Extracts the expiry checks into getExpiryValidationError(), reuses it as the handleCreateToken guard, and renders the result inline + in the Save button's disabled condition. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * [MM-68421] Fix PAT expiry e2e specs for inline validation The "blocks submitting a custom expiry with no date chosen" and "enforces expiry when a maximum lifetime is configured" specs clicked the Save button and expected an inline error afterward. Since 7ccd65e surfaces the expiry error inline and disables Save while the selection is invalid, the click timed out on a disabled button. Assert the inline error is visible and that Save is disabled, instead of clicking it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Automatic Merge
This 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )