bristol-su / typeform-service

database/migrations/2019_12_17_000001_create_typeform_auth_codes_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('typeform_auth_codes', function (Blueprint $table) {
+        Schema::create('typeform_auth_codes', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->bigInteger('user_id');
             $table->text('auth_code');

src/TypeformServiceProvider.php

Spacing +10 added lines, -10 removed lines

@@ -15,20 +15,20 @@ 
 
     public function register()
     {
-        $this->publishes([__DIR__ . '/../config/config.php' => config_path('typeform_service.php'),
+        $this->publishes([__DIR__.'/../config/config.php' => config_path('typeform_service.php'),
         ], 'config');
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/config.php', 'typeform_service'
+            __DIR__.'/../config/config.php', 'typeform_service'
         );
 
-        $this->publishes([__DIR__ . '/../public/services/typeform' => public_path('services/typeform')]);
-        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
+        $this->publishes([__DIR__.'/../public/services/typeform' => public_path('services/typeform')]);
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
         $this->publishes([
-            __DIR__ . '/../resources/views' => resource_path('views/vendor/typeformservice'),
+            __DIR__.'/../resources/views' => resource_path('views/vendor/typeformservice'),
         ], 'views');
 
-        $this->loadViewsFrom(__DIR__ . '/../resources/views', 'typeformservice');
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'typeformservice');
 
     }
 
@@ -50,12 +50,12 @@ 
         Route::prefix($this->app['config']->get('typeform_service.url_prefix'))
             ->middleware(['web', 'auth'])
             ->namespace('BristolSU\Service\Typeform\Http\Controllers')
-            ->group(__DIR__ . '/../routes/web.php');
+            ->group(__DIR__.'/../routes/web.php');
 
-        Route::prefix('api')->middleware(['api', 'auth'])->group(function () {
+        Route::prefix('api')->middleware(['api', 'auth'])->group(function() {
             Route::prefix($this->app['config']->get('typeform_service.url_prefix'))
                 ->namespace('BristolSU\Service\Typeform\Http\Controllers')
-                ->group(__DIR__ . '/../routes/api.php');
+                ->group(__DIR__.'/../routes/api.php');
         });
         
         JavaScriptFacade::put([
@@ -66,7 +66,7 @@ 
 
     public function registerGlobalScript($path)
     {
-        View::composer('bristolsu::base', function (\Illuminate\View\View $view) use ($path) {
+        View::composer('bristolsu::base', function(\Illuminate\View\View $view) use ($path) {
             $scripts = ($view->offsetExists('globalScripts') ? $view->offsetGet('globalScripts') : []);
             $scripts[] = asset($path);
             $view->with('globalScripts', $scripts);

src/Connectors/ApiKey.php

Spacing +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
     public function request($method, $uri, array $options = [])
     {
         $options['base_uri'] = config('typeform_service.base_uri');
-        $headers = ((isset($options['headers']) && is_array($options['headers']))?$options['headers']:[]);
-        $headers['Authorization'] = 'Bearer ' . $this->getSetting('api_key');
+        $headers = ((isset($options['headers']) && is_array($options['headers'])) ? $options['headers'] : []);
+        $headers['Authorization'] = 'Bearer '.$this->getSetting('api_key');
         $options['headers'] = $headers;
         return $this->client->request($method, $uri, $options);
     }

src/Connectors/OAuth.php

Spacing +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
     public function request($method, $uri, array $options = [])
     {
         $options['base_uri'] = config('typeform_service.base_uri');
-        $headers = ((isset($options['headers']) && is_array($options['headers']))?$options['headers']:[]);
-        $headers['Authorization'] = 'Bearer ' . $this->getAccessToken();
+        $headers = ((isset($options['headers']) && is_array($options['headers'])) ? $options['headers'] : []);
+        $headers['Authorization'] = 'Bearer '.$this->getAccessToken();
         $options['headers'] = $headers;
         return $this->client->request($method, $uri, $options);
     }
@@ -51,10 +51,10 @@ 
     private function getAccessToken($refreshable = true): string
     {
         $authCode = AuthModel::findOrFail($this->getSetting('auth_code_id'));
-        if($authCode->isValid()) {
+        if ($authCode->isValid()) {
             return $authCode->auth_code;
         }
-        if($refreshable && $this->refreshAccessToken($authCode)) {
+        if ($refreshable && $this->refreshAccessToken($authCode)) {
             return $this->getAccessToken(false);
         } else {
             // TODO Throw special error to send email to people

src/Http/Controllers/OAuthRedirectController.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
                 'code' => $request->input('code'),
                 'client_id' => config('typeform_service.client_id'),
                 'client_secret' => config('typeform_service.client_secret'),
-                'redirect_uri' => config('app.url') . '/_connector/typeform/redirect'
+                'redirect_uri' => config('app.url').'/_connector/typeform/redirect'
             ],
         ]);
         $token = json_decode($response->getBody()->getContents(), true);