Update OpenPlatform.

Author: mingyoung

src/Controllers/OpenPlatformController.php

@@ -9,51 +9,36 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Overtrue\LaravelWechat\Controllers;
+namespace Overtrue\LaravelWeChat\Controllers;
 
-use EasyWeChat\Foundation\Application;
+use EasyWeChat\OpenPlatform\Application;
+use EasyWeChat\OpenPlatform\Server\Guard;
 use Event;
-use Illuminate\Routing\Controller;
-use Overtrue\LaravelWechat\Events\OpenPlatform as Events;
+use Overtrue\LaravelWeChat\Events\OpenPlatform as Events;
 
-class OpenPlatformController extends Controller
+class OpenPlatformController
 {
-    /**
-     * Events.
-     *
-     * @var array
-     */
-    protected $events = [
-        'authorized' => Events\Authorized::class,
-        'unauthorized' => Events\Unauthorized::class,
-        'updateauthorized' => Events\UpdateAuthorized::class,
-    ];
-
     /**
      * Register for open platform.
      *
-     * @param \EasyWeChat\Foundation\Application $application
+     * @param \EasyWeChat\OpenPlatform\Application $application
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
     public function index(Application $application)
     {
-        $server = $application->open_platform->server;
-
-        $server->setMessageHandler([$this, 'handle']);
+        $server = $application->server;
+
+        $server->on(Guard::EVENT_AUTHORIZED, function ($payload) {
+            Event::fire(new Events\Authorized($payload));
+        });
+        $server->on(Guard::EVENT_UNAUTHORIZED, function ($payload) {
+            Event::fire(new Events\Unauthorized($payload));
+        });
+        $server->on(Guard::EVENT_UPDATE_AUTHORIZED, function ($payload) {
+            Event::fire(new Events\UpdateAuthorized($payload));
+        });
 
         return $server->serve();
     }
-
-    /**
-     * Handle event message and fire event.
-     *
-     * @param \EasyWeChat\Support\Collection $message
-     */
-    public function handle($message)
-    {
-        if ($event = array_get($this->events, $message->InfoType)) {
-            Event::fire(new $event($message));
-        }
-    }
 }

src/Events/OpenPlatform/Authorized.php

@@ -9,34 +9,19 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Overtrue\LaravelWechat\Events\OpenPlatform;
-
-use EasyWeChat\Support\Collection;
-use Illuminate\Queue\SerializesModels;
+namespace Overtrue\LaravelWeChat\Events\OpenPlatform;
 
 class Authorized
 {
-    use SerializesModels;
-
-    public $message;
+    public $payload;
 
     /**
      * Create a new event instance.
      *
-     * @param \EasyWeChat\Support\Collection $message
-     */
-    public function __construct(Collection $message)
-    {
-        $this->message = $message;
-    }
-
-    /**
-     * Get the channels the event should be broadcast on.
-     *
-     * @return array
+     * @param array $payload
      */
-    public function broadcastOn()
+    public function __construct(array $payload)
     {
-        return [];
+        $this->payload = $payload;
     }
 }

src/Events/OpenPlatform/Unauthorized.php

@@ -9,34 +9,19 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Overtrue\LaravelWechat\Events\OpenPlatform;
-
-use EasyWeChat\Support\Collection;
-use Illuminate\Queue\SerializesModels;
+namespace Overtrue\LaravelWeChat\Events\OpenPlatform;
 
 class Unauthorized
 {
-    use SerializesModels;
-
-    public $message;
+    public $payload;
 
     /**
      * Create a new event instance.
      *
-     * @param \EasyWeChat\Support\Collection $message
-     */
-    public function __construct(Collection $message)
-    {
-        $this->message = $message;
-    }
-
-    /**
-     * Get the channels the event should be broadcast on.
-     *
-     * @return array
+     * @param array $payload
      */
-    public function broadcastOn()
+    public function __construct(array $payload)
     {
-        return [];
+        $this->payload = $payload;
     }
 }

src/Events/OpenPlatform/UpdateAuthorized.php

@@ -9,34 +9,19 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Overtrue\LaravelWechat\Events\OpenPlatform;
-
-use EasyWeChat\Support\Collection;
-use Illuminate\Queue\SerializesModels;
+namespace Overtrue\LaravelWeChat\Events\OpenPlatform;
 
 class UpdateAuthorized
 {
-    use SerializesModels;
-
-    public $message;
+    public $payload;
 
     /**
      * Create a new event instance.
      *
-     * @param \EasyWeChat\Support\Collection $message
-     */
-    public function __construct(Collection $message)
-    {
-        $this->message = $message;
-    }
-
-    /**
-     * Get the channels the event should be broadcast on.
-     *
-     * @return array
+     * @param array $payload
      */
-    public function broadcastOn()
+    public function __construct(array $payload)
     {
-        return [];
+        $this->payload = $payload;
     }
 }

src/Providers/RouteServiceProvider.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Overtrue\LaravelWechat;
+namespace Overtrue\LaravelWeChat;
 
 use EasyWeChat\MiniProgram\Application as MiniProgram;
 use EasyWeChat\OfficialAccount\Application as OfficialAccount;
@@ -19,7 +19,7 @@
 use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
 use Laravel\Lumen\Application as LumenApplication;
-use Overtrue\LaravelWechat\Providers\RouteServiceProvider;
+use Overtrue\LaravelWeChat\Controllers\OpenPlatformController;
 use Overtrue\Socialite\User as SocialiteUser;
 
 /**
@@ -36,7 +36,9 @@ public function boot()
     {
         $this->setupConfig();
 
-        $this->app->register(RouteServiceProvider::class);
+        if (config('wechat.route.enabled')) {
+            $this->registerRoutes();
+        }
     }
 
     /**
@@ -94,6 +96,19 @@ public function register()
         }
     }
 
+    /**
+     * Register routes.
+     */
+    protected function registerRoutes()
+    {
+        $router = $this->app instanceof LaravelApplication ? $this->app['router'] : $this->app;
+
+        // Register open-platform routes...
+        $router->group(config('wechat.route.open_platform.attributes', []), function ($router) {
+            $router->post(config('wechat.route.open_platform.uri'), OpenPlatformController::class.'@index');
+        });
+    }
+
     /**
      * 创建模拟登录.
      */