Completed
Pull Request — master (#18)
by Alexis
02:22
created
config/u2f.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
-     * User: LAHAXE Arnaud
4
-     * Date: 18/05/2015
5
-     * Time: 17:49
6
-     * FileName : u2f.php
7
-     * Project : laravel-u2f
8
-     */
3
+ * User: LAHAXE Arnaud
4
+ * Date: 18/05/2015
5
+ * Time: 17:49
6
+ * FileName : u2f.php
7
+ * Project : laravel-u2f
8
+ */
9 9
 
10 10
 return [
11 11
     /*
Please login to merge, or discard this patch.
src/U2fServiceProvider.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -31,23 +31,23 @@
 block discarded – undo
31 31
             $router->get('register', [
32 32
                 'uses' => 'U2fController@registerData',
33 33
                 'as' => 'u2f.register.data',
34
-               'middleware' => 'auth'
34
+                'middleware' => 'auth'
35 35
             ]);
36 36
             $router->post('register', [
37 37
                 'uses' => 'U2fController@register',
38 38
                 'as' => 'u2f.register',
39
-               'middleware' => 'auth'
39
+                'middleware' => 'auth'
40 40
             ]);
41 41
 
42 42
             $router->get('auth', [
43 43
                 'uses' => 'U2fController@authData',
44 44
                 'as' => 'u2f.auth.data',
45
-               'middleware' => 'auth'
45
+                'middleware' => 'auth'
46 46
             ]);
47 47
             $router->post('auth', [
48 48
                 'uses' => 'U2fController@auth',
49 49
                 'as' => 'u2f.auth',
50
-               'middleware' => 'auth'
50
+                'middleware' => 'auth'
51 51
             ]);
52 52
         });
53 53
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -53,17 +53,17 @@
 block discarded – undo
53 53
 
54 54
 
55 55
         $this->publishes([
56
-            __DIR__ . '/../database/migrations/' => base_path('/database/migrations')
56
+            __DIR__.'/../database/migrations/' => base_path('/database/migrations')
57 57
         ], 'migrations');
58 58
 
59
-        $this->publishes([ (__DIR__ . '/../config/u2f.php') => config_path('u2f.php') ], 'config');
59
+        $this->publishes([ (__DIR__.'/../config/u2f.php') => config_path('u2f.php') ], 'config');
60 60
 
61 61
         $this->publishes([
62
-            __DIR__. '/../resources/js' => public_path('vendor/u2f'),
62
+            __DIR__.'/../resources/js' => public_path('vendor/u2f'),
63 63
         ], 'public');
64 64
 
65
-        $this->loadViewsFrom(__DIR__ . '/../views/', 'u2f');
66
-        $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'u2f');
65
+        $this->loadViewsFrom(__DIR__.'/../views/', 'u2f');
66
+        $this->loadTranslationsFrom(__DIR__.'/../resources/lang', 'u2f');
67 67
 
68 68
     }
69 69
 
Please login to merge, or discard this patch.
src/http/Middleware/U2f.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,14 +44,14 @@
 block discarded – undo
44 44
      */
45 45
     public function handle($request, Closure $next)
46 46
     {
47
-        if(!$this->config->get('u2f.enable')) {
47
+        if (!$this->config->get('u2f.enable')) {
48 48
             return $next($request);
49 49
         }
50 50
 
51 51
         if (!$this->u2f->check()) {
52
-            if(!Auth::guest()){
53
-                if(
54
-                    U2fKey::where('user_id', '=', Auth::user()->getAuthIdentifier())->count()  === 0
52
+            if (!Auth::guest()) {
53
+                if (
54
+                    U2fKey::where('user_id', '=', Auth::user()->getAuthIdentifier())->count() === 0
55 55
                     && $this->config->get('u2f.byPassUserWithoutKey')
56 56
                 ) {
57 57
                     return $next($request);
Please login to merge, or discard this patch.
src/http/Controllers/U2fController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         list($req, $sigs) = $this->u2f->getRegisterData(Auth::user());
44 44
         Event::fire('u2f.register.data', [ 'user' => Auth::user() ]);
45 45
 
46
-        session(['u2f.registerData' => $req]);
46
+        session([ 'u2f.registerData' => $req ]);
47 47
 
48 48
         return view($this->config->get('u2f.register.view'))
49 49
             ->with('currentKeys', $sigs)
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
             Event::fire('u2f.register', [ 'u2fKey' => $key, 'user' => Auth::user() ]);
65 65
             session()->forget('u2f.registerData');
66 66
             
67
-            session([$this->config->get('u2f.sessionU2fName') => true]);
67
+            session([ $this->config->get('u2f.sessionU2fName') => true ]);
68 68
 
69 69
             if ($this->config->get('u2f.register.postSuccessRedirectRoute')) {
70 70
 
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
     public function authData()
89 89
     {
90 90
 
91
-        if($this->u2f->check()) {
91
+        if ($this->u2f->check()) {
92 92
             return $this->redirectAfterSuccessAuth();
93 93
         }
94 94
 
95 95
         $req = $this->u2f->getAuthenticateData(Auth::user());
96 96
         Event::fire('u2f.authentication.data', [ 'user' => Auth::user() ]);
97 97
 
98
-        session(['u2f.authenticationData' => $req]);
98
+        session([ 'u2f.authenticationData' => $req ]);
99 99
 
100 100
         return view($this->config->get('u2f.authenticate.view'))
101 101
             ->with('authenticationData', $req);
Please login to merge, or discard this patch.
src/U2f.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     public function __construct(Config $config, Session $session)
38 38
     {
39 39
         $scheme = Request::isSecure() ? "https://" : "http://";
40
-        $this->u2f = new \u2flib_server\U2F($scheme . Request::getHttpHost());
40
+        $this->u2f = new \u2flib_server\U2F($scheme.Request::getHttpHost());
41 41
         $this->config = $config;
42 42
         $this->session = $session;
43 43
     }
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         $U2fKey->counter = $reg->counter;
115 115
         $U2fKey->save();
116 116
         
117
-        session([$this->config->get('u2f.sessionU2fName') => true]);
117
+        session([ $this->config->get('u2f.sessionU2fName') => true ]);
118 118
 
119 119
         return $U2fKey;
120 120
     }
Please login to merge, or discard this patch.