diff --git a/pos-module-user/CHANGELOG.md b/pos-module-user/CHANGELOG.md index edb7b675..27bcd4a2 100644 --- a/pos-module-user/CHANGELOG.md +++ b/pos-module-user/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +## v5.3.0 + +* Every page now sets `layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}"` instead of leaving `layout:` unset. This lets a consuming app or module (for example a theme that depends on this module) restyle every built-in page - `/sessions/new`, `/users/new`, `/passwords/*`, 2FA, OAuth - by setting a single `modules/user/LAYOUT` constant, without needing to override any of this module's page files. Falls back to the Instance's actual `default_layout` (via `context.config`, itself unreleased at the time of writing) once available, and to a literal `'application'` on engines that predate `context.config` - existing behavior is unchanged unless `modules/user/LAYOUT` is explicitly set. + ## v5.1.1 * Fix: remove theme_render for can_do_or_unauthorized command diff --git a/pos-module-user/modules/user/public/views/pages/authentication_links/create.liquid b/pos-module-user/modules/user/public/views/pages/authentication_links/create.liquid index e3cbde9e..5afc9269 100644 --- a/pos-module-user/modules/user/public/views/pages/authentication_links/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/authentication_links/create.liquid @@ -1,6 +1,7 @@ --- method: post slug: authentication_links +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function object = 'modules/user/commands/authentication_links/create', email: context.params.authentication_link.email, host: context.location.host, hcaptcha_params: context.params, valid_for: null diff --git a/pos-module-user/modules/user/public/views/pages/oauth/callback.liquid b/pos-module-user/modules/user/public/views/pages/oauth/callback.liquid index 5caf0146..e6c40be3 100644 --- a/pos-module-user/modules/user/public/views/pages/oauth/callback.liquid +++ b/pos-module-user/modules/user/public/views/pages/oauth/callback.liquid @@ -1,6 +1,7 @@ --- method: get slug: oauth/:provider/callback +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid # platformos-check-disable ConvertIncludeToRender diff --git a/pos-module-user/modules/user/public/views/pages/oauth/start.liquid b/pos-module-user/modules/user/public/views/pages/oauth/start.liquid index 9356a656..16665d28 100644 --- a/pos-module-user/modules/user/public/views/pages/oauth/start.liquid +++ b/pos-module-user/modules/user/public/views/pages/oauth/start.liquid @@ -1,6 +1,7 @@ --- method: post slug: oauth/:provider/start +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid diff --git a/pos-module-user/modules/user/public/views/pages/oauth/unassign.liquid b/pos-module-user/modules/user/public/views/pages/oauth/unassign.liquid index de609148..e8e1dd45 100644 --- a/pos-module-user/modules/user/public/views/pages/oauth/unassign.liquid +++ b/pos-module-user/modules/user/public/views/pages/oauth/unassign.liquid @@ -1,6 +1,7 @@ --- slug: oauth/:provider/unassign method: delete +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_user = 'modules/user/queries/user/current' diff --git a/pos-module-user/modules/user/public/views/pages/passwords/create.liquid b/pos-module-user/modules/user/public/views/pages/passwords/create.liquid index 4273520e..cc7567ba 100644 --- a/pos-module-user/modules/user/public/views/pages/passwords/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/passwords/create.liquid @@ -1,6 +1,7 @@ --- slug: passwords method: post +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid assign input = context.params.password diff --git a/pos-module-user/modules/user/public/views/pages/passwords/new.liquid b/pos-module-user/modules/user/public/views/pages/passwords/new.liquid index 66d8958d..0e875fe0 100644 --- a/pos-module-user/modules/user/public/views/pages/passwords/new.liquid +++ b/pos-module-user/modules/user/public/views/pages/passwords/new.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid if context.session.reset_password_session_user_id == blank function user = 'modules/user/helpers/user_from_temporary_token', token: context.params.token, email: context.params.email diff --git a/pos-module-user/modules/user/public/views/pages/passwords/reset.liquid b/pos-module-user/modules/user/public/views/pages/passwords/reset.liquid index ac953216..f4ac956b 100644 --- a/pos-module-user/modules/user/public/views/pages/passwords/reset.liquid +++ b/pos-module-user/modules/user/public/views/pages/passwords/reset.liquid @@ -1 +1,4 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% render 'modules/user/passwords/reset', context: context, values: null, errors: null %} diff --git a/pos-module-user/modules/user/public/views/pages/profiles/2fa/create.liquid b/pos-module-user/modules/user/public/views/pages/profiles/2fa/create.liquid index 3ec7f617..5431ae47 100644 --- a/pos-module-user/modules/user/public/views/pages/profiles/2fa/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/profiles/2fa/create.liquid @@ -1,6 +1,7 @@ --- slug: profiles/2fa method: post +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/profiles/2fa/delete.liquid b/pos-module-user/modules/user/public/views/pages/profiles/2fa/delete.liquid index 7552075b..3c5380b0 100644 --- a/pos-module-user/modules/user/public/views/pages/profiles/2fa/delete.liquid +++ b/pos-module-user/modules/user/public/views/pages/profiles/2fa/delete.liquid @@ -1,6 +1,7 @@ --- slug: profiles/2fa/delete method: post +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/profiles/2fa/disable.liquid b/pos-module-user/modules/user/public/views/pages/profiles/2fa/disable.liquid index 0ef75da2..9b95ca76 100644 --- a/pos-module-user/modules/user/public/views/pages/profiles/2fa/disable.liquid +++ b/pos-module-user/modules/user/public/views/pages/profiles/2fa/disable.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid function current_profile = 'modules/user/helpers/current_profile' if current_profile.user.id == null or current_profile.otp_configured != true diff --git a/pos-module-user/modules/user/public/views/pages/profiles/2fa/new.liquid b/pos-module-user/modules/user/public/views/pages/profiles/2fa/new.liquid index 70c73db5..d50e6bfd 100644 --- a/pos-module-user/modules/user/public/views/pages/profiles/2fa/new.liquid +++ b/pos-module-user/modules/user/public/views/pages/profiles/2fa/new.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid function current_profile = 'modules/user/helpers/current_profile' if current_profile.user.id == null diff --git a/pos-module-user/modules/user/public/views/pages/sessions/2fa.liquid b/pos-module-user/modules/user/public/views/pages/sessions/2fa.liquid index 7e16d764..117a456f 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/2fa.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/2fa.liquid @@ -1,5 +1,6 @@ --- method: post +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/sessions/create.liquid b/pos-module-user/modules/user/public/views/pages/sessions/create.liquid index 24f37072..81f16f38 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/create.liquid @@ -1,6 +1,7 @@ --- method: post slug: sessions +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/sessions/destroy.liquid b/pos-module-user/modules/user/public/views/pages/sessions/destroy.liquid index 563bb06e..052b3292 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/destroy.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/destroy.liquid @@ -1,6 +1,7 @@ --- slug: sessions method: delete +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/sessions/impersonation/create.liquid b/pos-module-user/modules/user/public/views/pages/sessions/impersonation/create.liquid index bd2e3f3c..44030840 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/impersonation/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/impersonation/create.liquid @@ -1,6 +1,7 @@ --- slug: sessions/impersonations/:user_id method: post +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/sessions/impersonation/destroy.liquid b/pos-module-user/modules/user/public/views/pages/sessions/impersonation/destroy.liquid index 85bfbb61..56f61e2b 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/impersonation/destroy.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/impersonation/destroy.liquid @@ -1,6 +1,7 @@ --- slug: sessions/impersonations method: delete +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid if context.session.original_user_id == blank diff --git a/pos-module-user/modules/user/public/views/pages/sessions/new.liquid b/pos-module-user/modules/user/public/views/pages/sessions/new.liquid index 9b470242..7fa544c4 100644 --- a/pos-module-user/modules/user/public/views/pages/sessions/new.liquid +++ b/pos-module-user/modules/user/public/views/pages/sessions/new.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/users/create.liquid b/pos-module-user/modules/user/public/views/pages/users/create.liquid index 9d00033b..f5b6c31b 100644 --- a/pos-module-user/modules/user/public/views/pages/users/create.liquid +++ b/pos-module-user/modules/user/public/views/pages/users/create.liquid @@ -1,6 +1,7 @@ --- method: post slug: users +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/users/email/edit.liquid b/pos-module-user/modules/user/public/views/pages/users/email/edit.liquid index 9705fbf5..c64027e8 100644 --- a/pos-module-user/modules/user/public/views/pages/users/email/edit.liquid +++ b/pos-module-user/modules/user/public/views/pages/users/email/edit.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid function current_profile = 'modules/user/helpers/current_profile' if current_profile.user == null diff --git a/pos-module-user/modules/user/public/views/pages/users/email/update.liquid b/pos-module-user/modules/user/public/views/pages/users/email/update.liquid index 1b4b258d..29ad4a36 100644 --- a/pos-module-user/modules/user/public/views/pages/users/email/update.liquid +++ b/pos-module-user/modules/user/public/views/pages/users/email/update.liquid @@ -1,6 +1,7 @@ --- slug: users/email/edit method: put +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" --- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/modules/user/public/views/pages/users/new.liquid b/pos-module-user/modules/user/public/views/pages/users/new.liquid index 22d0a479..3b907b74 100644 --- a/pos-module-user/modules/user/public/views/pages/users/new.liquid +++ b/pos-module-user/modules/user/public/views/pages/users/new.liquid @@ -1,3 +1,6 @@ +--- +layout: "{{ context.constants['modules/user/LAYOUT'] | default: context.config.default_layout | default: 'application' }}" +--- {% liquid function current_profile = 'modules/user/helpers/current_profile' diff --git a/pos-module-user/pos-module.json b/pos-module-user/pos-module.json index d56ed4d1..82aa3c95 100644 --- a/pos-module-user/pos-module.json +++ b/pos-module-user/pos-module.json @@ -1,6 +1,6 @@ { "machine_name": "user", - "version": "5.2.11", + "version": "5.3.0", "name": "User", "dependencies": { "core": "^2.1.9",