Lumen

1 files changed, 28 insertions, 26 deletions

diff --git a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
index bfd939f..c3481ac 100644
--- a/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
+++ b/src/CamilStaps/BotleaguesApi/BotleaguesApiServiceProvider.php
@@ -19,9 +19,10 @@
  */
 namespace CamilStaps\BotleaguesApi;
 
+use Illuminate\Support\Facades\App;
 use \Illuminate\Support\Facades\Request;
 use \Illuminate\Support\ServiceProvider;
-use Response;
+use \Dingo\Api\Http\Response;
 
 class BotleaguesApiServiceProvider extends ServiceProvider {
 
@@ -42,29 +43,30 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
         $this->loadViewsFrom(__DIR__ . '/../../views', 'botleagues-api');
         $this->publishes([ __DIR__ . '/../../views' => base_path('resources/view/vendor/botleagues-api')], 'views');
 
-        $this->publishes([ __DIR__ . '/../../config/botleaguesapi.php' => config_path('botleaguesapi.php')], 'config');
-
-		include __DIR__ . '/../../filters.php';
+        //$this->publishes([ __DIR__ . '/../../config/botleaguesapi.php' => config_path('botleaguesapi.php')], 'config');
 
 		include __DIR__ . '/../../routes.php';
 
-        // To allow loading API requests from the specified domain
-        $allowed_origin = config('botleaguesapi.allowed_origin');
-        if (is_array($allowed_origin)) {
-            $origin = Request::header('Origin');
-            if (in_array($origin, $allowed_origin)) {
-                header('Access-Control-Allow-Origin: ' . $origin);
-            } else {
-                header('Access-Control-Allow-Origin: ' . $allowed_origin[0]);
-            }
-        } else {
-            header('Access-Control-Allow-Origin: ' . $allowed_origin);
+
+
+        $request = app('request');
+        if ($request->isMethod('OPTIONS')) {
+            app()->options($request->path(), function() { return response('', 200); });
         }
-        header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
-        header('Access-Control-Allow-Headers: Authorization');
-        header('Access-Control-Expose-Headers: Location');
 
 		$this->setupErrorHandlers();
+
+        config(['api.auth' => [
+            'basic' => function ($app) {
+                return new \Dingo\Api\Auth\Provider\Basic($app['auth']);
+            },
+            'token' => function ($app) {
+                return new \CamilStaps\BotleaguesApi\TokenAuthenticationProvider;
+            },
+            'activationcode' => function ($app) {
+                return new \CamilStaps\BotleaguesApi\ActivationCodeAuthenticationProvider;
+            }
+        ]]);
     }
 
 	/**
@@ -83,7 +85,7 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
 	 */
 	public function provides()
 	{
-		return array('CamilStaps\BotleaguesApi\BotleaguesApiServiceProvider');
+		return ['CamilStaps\BotleaguesApi\BotleaguesApiServiceProvider'];
 	}
 
 	/**
@@ -93,22 +95,22 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
         $exception = app('api.exception');
 
         $exception->register(function(\Symfony\Component\HttpKernel\Exception\NotFoundHttpException $e) {
-            return Response::make(
+            return new Response(
                 ['error' => 'Endpoint not found'],
                 404);
         });
 		$exception->register(function(\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
-			return Response::make(
+			return new Response(
 				['error' => 'Resource not found'],
 				404);
 		});
         $exception->register(function(\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException $e) {
-			return Response::make(
-				['error' => !config('app.debug') || empty($e->getMessage()) ? 'Access denied' : $e->getMessage()],
+			return new Response(
+				['error' => !env('APP_DEBUG') || empty($e->getMessage()) ? 'Access denied' : $e->getMessage()],
 				404);
 		});
         $exception->register(function(Exception\ValidationException $e) {
-			return Response::make(
+			return new Response(
 				[
 					'error' => $e->getMessage(),
 					'errors' => $e->errors
@@ -117,8 +119,8 @@ class BotleaguesApiServiceProvider extends ServiceProvider {
 		});
 
         $exception->register(function(\Exception $e) {
-            return Response::make(
-				['error' => config('app.debug') ? $e->getMessage() : "Internal error"],
+            return new Response(
+				['error' => env('APP_DEBUG') ? $e->getMessage() : "Internal error"],
 				500);
 		});
 	}