Merge branch 'master' into fix-profile-open

2amigos · Sep 18, 2024 · 771b946 · 771b946
2 parents d3d2d5a + b70f389
commit 771b946
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -76,7 +76,7 @@ jobs:
               run:  vendor/bin/phpstan analyse
 
             - name: Archive failed tests artifacts - test output & log
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               if: failure()
               with:
                   name: test-outputs-php-${{ matrix.php-versions }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 - New #553: created Da\User\AuthClient\Microsoft365 auth client (edegaudenzi)
 - Ehh: Added SecurityHelper to the Bootstrap classMap
 - Fix #546: The profile/show page must not be visible by default, implement configurable policy (TonisOrmisson)
+- Fix #397: No more fatal Exceptions when connecting to already taken Social Network (edegaudenzi)
+- Ehh: Added option to pre-fill recovery email via url parameter (TonisOrmisson)
 
 ## 1.6.3 Mar 18th, 2024
 

diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php
@@ -89,14 +89,18 @@ public function actionRequest()
             throw new NotFoundHttpException();
         }
 
+        $request = Yii::$app->request;
+
         /** @var RecoveryForm $form */
         $form = $this->make(RecoveryForm::class, [], ['scenario' => RecoveryForm::SCENARIO_REQUEST]);
-
+        if(!$request->getIsPost() && !empty($request->get('email'))) {
+            $form->email = $request->get('email');
+        }
         $event = $this->make(FormEvent::class, [$form]);
 
         $this->make(AjaxRequestModelValidator::class, [$form])->validate();
 
-        if ($form->load(Yii::$app->request->post()) && $form->validate()) {
+        if ($form->load($request->post()) && $form->validate()) {
             $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event);
 
             $mailService = MailFactory::makeRecoveryMailerService($form->email);

diff --git a/src/User/Module.php b/src/User/Module.php
@@ -226,6 +226,7 @@ class Module extends BaseModule
         '<action:(register|resend)>' => 'registration/<action>',
         'confirm/<id:\d+>/<code:[A-Za-z0-9_-]+>' => 'registration/confirm',
         'forgot' => 'recovery/request',
+        'forgot/<email:[a-zA-Z0-9_.±]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+>' => 'recovery/request',
         'recover/<id:\d+>/<code:[A-Za-z0-9_-]+>' => 'recovery/reset'
     ];
     /**

diff --git a/src/User/Service/SocialNetworkAccountConnectService.php b/src/User/Service/SocialNetworkAccountConnectService.php
@@ -93,6 +93,6 @@ protected function getSocialNetworkAccount()
             }
         }
 
-        return false;
+        return $account;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,6 @@ protected function getSocialNetworkAccount() @@
                 }
             }
-            return false;
+            return $account;
         }
     }