Merge branch 'develop' into 1.2

Author: LukeTowers

modules/backend/ServiceProvider.php

@@ -112,7 +112,7 @@ protected function registerAssetBundles()
             }
         });
 
-        PackageManager::instance()->registerCallback(function ($mix) {
+        PackageManager::registerCallback(function ($mix) {
             $mix->registerPackage('module-backend.formwidgets.codeeditor', '~/modules/backend/formwidgets/codeeditor/assets/winter.mix.js');
         });
     }

modules/backend/controllers/Users.php

@@ -1,16 +1,22 @@
-<?php namespace Backend\Controllers;
-
-use Mail;
-use Lang;
-use Flash;
-use Backend;
-use Redirect;
-use Response;
-use BackendMenu;
-use BackendAuth;
-use Backend\Models\UserGroup;
+<?php
+
+namespace Backend\Controllers;
+
+use Backend\Behaviors\FormController;
+use Backend\Behaviors\ListController;
+use Backend\Behaviors\RelationController;
 use Backend\Classes\Controller;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Backend\Facades\BackendMenu;
+use Backend\Models\UserGroup;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Str;
 use System\Classes\SettingsManager;
+use Winter\Storm\Support\Facades\Flash;
+use Winter\Storm\Support\Facades\Mail;
 
 /**
  * Backend user controller
@@ -25,8 +31,9 @@ class Users extends Controller
      * @var array Extensions implemented by this controller.
      */
     public $implement = [
-        \Backend\Behaviors\FormController::class,
-        \Backend\Behaviors\ListController::class,
+        FormController::class,
+        ListController::class,
+        RelationController::class,
     ];
 
     /**
@@ -99,6 +106,18 @@ public function formExtendQuery($query)
         $query->withTrashed();
     }
 
+    /**
+     * Before creating a new user, generate password if auto-generate is enabled
+     */
+    public function formBeforeCreate($model)
+    {
+        if (post('User._auto_generate_password')) {
+            $password = Str::random(22);
+            $model->password = $password;
+            $model->password_confirmation = $password;
+        }
+    }
+
     /**
      * Update controller
      */

modules/backend/controllers/users/config_relation.yaml

@@ -0,0 +1,31 @@
+# ===================================
+#  Relation Behavior Config
+# ===================================
+
+throttle:
+    label: backend::lang.user.throttle_tab_label
+    view:
+        list:
+            columns:
+                ip_address:
+                    label: backend::lang.user.throttle_ip_address
+                    searchable: true
+                attempts:
+                    label: backend::lang.user.throttle_attempts
+                    width: 100px
+                    align: center
+                last_attempt_at:
+                    label: backend::lang.user.throttle_last_attempt
+                    type: datetime
+                    searchable: true
+                suspended_at:
+                    label: backend::lang.user.throttle_suspended_at
+                    type: datetime
+                    searchable: true
+        toolbarButtons: delete|refresh
+        showSearch: true
+        showSorting: true
+        recordsPerPage: 10
+        defaultSort:
+            column: last_attempt_at
+            direction: desc

modules/backend/formwidgets/codeeditor/README.md

@@ -167,7 +167,7 @@ modules/backend/formwidgets/codeeditor/
 
 #### Build Command
 ```bash
-php artisan mix:compile --package=module-backend.formwidgets.codeeditor -p
+php artisan mix:compile --package=module-backend.formwidgets.codeeditor -f
 ```
 
 #### Build Configuration

modules/backend/formwidgets/codeeditor/assets/js/build/codeeditor.bundle.js

@@ -43,6 +43,16 @@ import constrainedEditor from 'constrained-editor-plugin';
 import { parse as parseXml } from 'fast-plist';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
+// Fix: Twig tokenizer doesn't handle <script type="module"> (https://github.com/wintercms/winter/issues/1449)
+// Monaco's HTML tokenizer explicitly maps type="module" to text/javascript,
+// but the Twig tokenizer uses a generic capture that passes the raw type value
+// as a language ID. "module" isn't a valid language ID, causing a nullLanguage error.
+import { language as twigLanguage } from 'monaco-editor/esm/vs/basic-languages/twig/twig';
+twigLanguage.tokenizer.scriptAfterTypeEquals.unshift(
+    [/"module"/, { token: 'attribute.value.html', switchTo: '@scriptWithCustomType.text/javascript' }],
+    [/'module'/, { token: 'attribute.value.html', switchTo: '@scriptWithCustomType.text/javascript' }],
+);
+
 ((Snowboard) => {
     /**
      * Code editor widget.
@@ -81,6 +91,7 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
             this.fullscreen = false;
             this.cachedThemes = {};
             this.resizeThrottle = null;
+            this.savedState = null;
             this.callbacks = {
                 fullScreenChange: () => this.onFullScreenChange(),
                 resize: () => {
@@ -183,7 +194,8 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
                 this.visibilityListener = false;
             }
             if (this.clickListener) {
-                document.removeEventListener('click', this.callbacks.click);
+                document.removeEventListener('click', this.callbacks.click, { capture: true });
+                this.clickListener = false;
             }
         }
 
@@ -194,6 +206,11 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
          * and preventing slowdown of the browser.
          */
         dispose() {
+            if (this.editor) {
+                this.savedState = {
+                    position: this.editor.getPosition(),
+                };
+            }
             if (this.disposables.length > 0) {
                 this.disposables.forEach((disposable) => {
                     disposable.dispose();
@@ -204,11 +221,15 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
                 window.removeEventListener('resize', this.callbacks.resize);
                 this.resizeListener = false;
             }
+            if (this.model) {
+                this.model.dispose();
+                this.model = null;
+            }
             if (this.editor) {
                 this.editor.dispose();
                 this.editor = null;
             }
-            this.events.fire('dispose', this, this.editor);
+            this.events.fire('dispose', this);
         }
 
         /**
@@ -239,6 +260,11 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
          * Creates a Monaco editor instance in the given element.
          */
         createEditor() {
+            // Guard against creating a duplicate editor (both onObserve and onVisibilityChange
+            // can trigger creation simultaneously)
+            if (this.editor) {
+                return;
+            }
 
             // Force a specific height on the container - stops Monaco from indefinitely trying
             // to resize if the container has a fluid height
@@ -259,6 +285,15 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
             this.enableStatusBarActions();
             this.registerKeyBindings();
 
+            // Restore cursor position and scroll state from before the editor was disposed
+            if (this.savedState) {
+                if (this.savedState.position) {
+                    this.editor.setPosition(this.savedState.position);
+                    this.editor.revealPositionInCenter(this.savedState.position);
+                }
+                this.savedState = null;
+            }
+
             this.events.fire('create', this, this.editor);
         }
 
@@ -398,9 +433,12 @@ import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
                     this.clickStartedInEditor = false;
                 }, 20);
             }));
-            document.addEventListener('click', this.callbacks.click, {
-                capture: true,
-            });
+            if (!this.clickListener) {
+                document.addEventListener('click', this.callbacks.click, {
+                    capture: true,
+                });
+                this.clickListener = true;
+            }
 
             window.addEventListener('resize', this.callbacks.resize);
             this.resizeListener = true;

modules/backend/formwidgets/codeeditor/assets/js/build/codeeditor.bundle/847.js

@@ -154,6 +154,8 @@
         'superuser_comment' => 'Grants this account unlimited access to all areas of the system. Super users can add and manage other users. ',
         'send_invite' => 'Send invitation by email',
         'send_invite_comment' => 'Sends a welcome message containing login and password information.',
+        'auto_generate_password' => 'Auto-generate password',
+        'auto_generate_password_comment' => 'Automatically create a secure random password. Uncheck to set a password manually.',
         'delete_confirm' => 'Delete this administrator?',
         'return' => 'Return to admin list',
         'allow' => 'Allow',
@@ -165,6 +167,13 @@
         'updated_at' => 'Updated at',
         'deleted_at' => 'Deleted at',
         'show_deleted' => 'Show deleted',
+        'throttle_tab' => 'Failed Logins',
+        'throttle_tab_label' => 'Failed Login Records',
+        'throttle_comment' => 'View failed login attempts for this user. These records are automatically generated when login attempts fail. Users are suspended after exceeding the attempt limit.',
+        'throttle_ip_address' => 'IP Address',
+        'throttle_attempts' => 'Attempts',
+        'throttle_last_attempt' => 'Last Attempt',
+        'throttle_suspended_at' => 'Suspended At',
         'group' => [
             'name' => 'Group',
             'name_field' => 'Name',

modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js

@@ -57,6 +57,10 @@ class User extends UserBase
         'avatar' => \System\Models\File::class
     ];
 
+    public $hasMany = [
+        'throttle' => [UserThrottle::class, 'key' => 'user_id']
+    ];
+
     /**
      * Purge attributes from data set.
      */

modules/backend/lang/en/lang.php

@@ -3,54 +3,64 @@
 # ===================================
 
 fields:
-    is_superuser:
-        context: [create, update]
-        tab: backend::lang.user.permissions
-        label: backend::lang.user.superuser
-        type: switch
-        comment: backend::lang.user.superuser_comment
+    first_name:
+        span: left
+        label: backend::lang.user.first_name
+    last_name:
+        span: right
+        label: backend::lang.user.last_name
+    login:
+        span: left
+        label: backend::lang.user.login
+    email:
+        span: right
+        type: email
+        label: backend::lang.user.email
 
 tabs:
     defaultTab: backend::lang.user.account
     icons:
         backend::lang.user.account: icon-user
         backend::lang.user.groups: icon-users
         backend::lang.user.permissions: icon-key
+        backend::lang.user.throttle_tab: icon-ban
 
     fields:
-        login:
-            span: left
-            label: backend::lang.user.login
-
-        email:
-            span: right
-            type: email
-            label: backend::lang.user.email
-
         send_invite:
             context: create
             type: checkbox
             label: backend::lang.user.send_invite
             comment: backend::lang.user.send_invite_comment
             default: true
 
-        first_name:
-            span: left
-            label: backend::lang.user.first_name
-
-        last_name:
-            span: right
-            label: backend::lang.user.last_name
+        _auto_generate_password:
+            context: create
+            type: checkbox
+            label: backend::lang.user.auto_generate_password
+            comment: backend::lang.user.auto_generate_password_comment
+            default: true
+            trigger:
+                action: show
+                field: send_invite
+                condition: checked
 
         password:
             type: password
             span: left
             label: backend::lang.user.password
+            trigger:
+                action: disable
+                field: _auto_generate_password
+                condition: checked
 
         password_confirmation:
             type: password
             span: right
             label: backend::lang.user.password_confirmation
+            trigger:
+                action: disable
+                field: _auto_generate_password
+                condition: checked
 
         role:
             context: [create, update]
@@ -65,6 +75,13 @@ tabs:
             type: checkboxlist
             tab: backend::lang.user.groups
 
+        throttle:
+            label: backend::lang.user.throttle_tab_label
+            type: relationmanager
+            tab: backend::lang.user.throttle_tab
+            context: [update]
+            commentAbove: backend::lang.user.throttle_comment
+
 secondaryTabs:
     fields:
         btn_impersonate:
@@ -85,3 +102,8 @@ secondaryTabs:
             mode: image
             imageHeight: 250
             imageWidth: 250
+        is_superuser:
+            context: [create, update]
+            label: backend::lang.user.superuser
+            type: switch
+            comment: backend::lang.user.superuser_comment