Merge branch 'main' into feature/rainlab-support

Author: LeMaX10

Plugin.php

@@ -54,6 +54,8 @@ public function pluginDetails()
      */
     public function register()
     {
+        $this->checkRequiredPlugins();
+
         $this->app->singleton(
             UserPluginResolverContract::class,
             static fn() => UserPluginResolver::instance(),
@@ -83,6 +85,22 @@ public function boot()
         $this->addEventListeners();
     }
 
+    protected function checkRequiredPlugins()
+    {
+        $plugins = ['RainLab.User', 'Lovata.Buddies'];
+        $pluginInstalled = false;
+
+        foreach ($plugins as $pluginName) {
+            if (PluginManager::instance()->hasPlugin($pluginName)) {
+                $pluginInstalled = true;
+            }
+        }
+
+        if (!$pluginInstalled) {
+            PluginManager::instance()->disablePlugin('ReaZzon.JWTAuth');
+        }
+    }
+
     /**
      *
      */

README.md

@@ -35,7 +35,7 @@ Route::group(['middleware' => [\ReaZzon\JWTAuth\Http\Middlewares\ResolveUser::cl
 or 
 
 ```php
-Route::post('account', function () {
+Route::get('account', function () {
 
    // Logic that should be available only for authenticated users
 

classes/contracts/Plugin.php

@@ -38,4 +38,8 @@ public function registrationValidationExtend(): array;
      * @return array
      */
     public function loginValidationExtend(): array;
+  
+    public function initActivation($model): string;
+
+    public function activateByCode($code);
 }

classes/contracts/UserPluginResolver.php

@@ -18,6 +18,8 @@ interface UserPluginResolver
      */
     public function getModel(): string;
 
+    public function getResolver(): Plugin;
+
     /**
      * @return Plugin
      */

classes/middlewares/ResolveUser.php

@@ -140,4 +140,65 @@ public function getJWTCustomClaims()
             }
         };
     }
+
+    /**
+     * @param User $user
+     * @return string
+     */
+    public function initActivation($user): string
+    {
+        $activationType = BuddiesSettings::get('activation_type', 'off');
+
+        switch ($activationType) {
+            case 'on':
+                $user->activation_code = $user->getActivationCode();
+                $user->is_activated = true;
+                break;
+
+            case 'off':
+                $user->activation_code = $user->getActivationCode();
+                $user->is_activated = false;
+                break;
+
+            case 'mail':
+                $user->activation_code = $user->getActivationCode();
+                $user->is_activated = false;
+
+                //Get mail data
+                $mailData = [
+                    'user'      => $user,
+                    'user_item' => UserItem::make($user->id, $this),
+                    'site_url'  => config('app.url'),
+                ];
+
+                $templateName = Settings::getValue('registration_mail_template', 'lovata.buddies::mail.registration');
+
+                $sendMailHelper = SendMailHelper::instance();
+                $sendMailHelper->send(
+                    $templateName,
+                    $user->email,
+                    $mailData,
+                    Registration::EMAIL_TEMPLATE_DATA_EVENT,
+                    true);
+
+                break;
+        }
+
+        $user->forceSave();
+
+        return $activationType;
+    }
+
+    public function activateByCode($code)
+    {
+        $user = User::getByActivationCode($code)->first();
+        if (empty($user)) {
+            return null;
+        }
+
+        $user->activate();
+        $user->forceSave();
+
+        return $user;
+    }
 }

classes/resolvers/BuddiesPlugin.php

@@ -74,4 +74,14 @@ public function afterRegistrationActivate()
             }
         };
     }
+
+    public function initActivation($model): string
+    {
+        // TODO: Implement initActivation() method.
+    }
+
+    public function activateByCode($code)
+    {
+        // TODO: Implement activateByCode() method.
+    }
 }

classes/resolvers/RainlabPlugin.php

@@ -20,7 +20,7 @@ class AuthController extends Controller
      * @return array
      * @throws \ApplicationException
      */
-    public function __invoke(LoginRequest $loginRequest): TokenResource
+    public function __invoke(LoginRequest $loginRequest): array
     {
         /** @var JWTSubject $user */
         $user = $this->userPluginResolver

config/jwtauth.php

@@ -5,7 +5,6 @@
 
 use October\Rain\Argon\Argon;
 use ReaZzon\JWTAuth\Classes\Dto\TokenDto;
-use ReaZzon\JWTAuth\Http\Resources\TokenResource;
 
 /**
  *
@@ -15,7 +14,7 @@ class RefreshController extends Controller
     /**
      * @return array
      */
-    public function __invoke(): TokenResource
+    public function __invoke(): array
     {
         $tokenRefreshed = $this->userPluginResolver->getGuard()->refresh(true);
         $this->userPluginResolver->getGuard()->setToken($tokenRefreshed);