ZsgsDesign / NOJ

app/Http/Controllers/OAuth/GithubController.php

Spacing +49 added lines, -49 removed lines

@@ -13,18 +13,18 @@ 
 {
     public function redirectTo()
     {
-        $accountModel = new AccountModel();
+        $accountModel=new AccountModel();
         $info=$accountModel->detail(Auth::user()->id);
-        if(Auth::check() && $info['contest_account']){
+        if (Auth::check() && $info['contest_account']) {
             return redirect('/account/settings');
         }
-        if(Auth::check() && $accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        if (Auth::check() && $accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You\'re already tied to the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can choose to unbind or go back to the homepage',
                 'buttons' => [
                     [
@@ -44,19 +44,19 @@ 
 
     public function handleCallback()
     {
-        try{
-            $github_user = Socialite::driver('github')->user();
-        }catch(\Laravel\Socialite\Two\InvalidStateException $e){
+        try {
+            $github_user=Socialite::driver('github')->user();
+        } catch (\Laravel\Socialite\Two\InvalidStateException $e) {
             return redirect('/');
         }
 
-        $accountModel = new AccountModel();
-        if(Auth::check()){
-            $user_id = Auth::user()->id;
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret) && $ret['uid'] != $user_id){
-                $user = UserModel::find($ret['uid']);
-                return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if (Auth::check()) {
+            $user_id=Auth::user()->id;
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret) && $ret['uid']!=$user_id) {
+                $user=UserModel::find($ret['uid']);
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -71,17 +71,17 @@ 
                     ]
                 ]);
             }
-            $accountModel->setExtra($user_id,'github_id',$github_user->id);
-            $accountModel->setExtra($user_id,'github_email',$github_user->email);
-            $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-            $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-            $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
-            return view('oauth.index',[
+            $accountModel->setExtra($user_id, 'github_id', $github_user->id);
+            $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+            $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+            $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+            $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
-                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                'display_html' => 'You have successfully tied up the github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 You can log in to '.config("app.name").' later using this account',
                 'buttons' => [
                     [
@@ -90,18 +90,18 @@ 
                     ],
                 ]
             ]);
-        }else{
-            $ret = $accountModel->findExtra('github_id',$github_user->id);
-            if(!empty($ret)){
+        } else {
+            $ret=$accountModel->findExtra('github_id', $github_user->id);
+            if (!empty($ret)) {
                 Auth::loginUsingId($ret['uid']);
-                $user_id = Auth::user()->id;
-                $accountModel->setExtra($user_id,'github_email',$github_user->email);
-                $accountModel->setExtra($user_id,'github_nickname',$github_user->nickname);
-                $accountModel->setExtra($user_id,'github_homepage',($github_user->user)['html_url']);
-                $accountModel->setExtra($user_id,'github_token',$github_user->token,101);
+                $user_id=Auth::user()->id;
+                $accountModel->setExtra($user_id, 'github_email', $github_user->email);
+                $accountModel->setExtra($user_id, 'github_nickname', $github_user->nickname);
+                $accountModel->setExtra($user_id, 'github_homepage', ($github_user->user)['html_url']);
+                $accountModel->setExtra($user_id, 'github_token', $github_user->token, 101);
                 return redirect('/');
-            }else{
-                return view('oauth.index',[
+            } else {
+                return view('oauth.index', [
                     'page_title'=>"OAuth",
                     'site_title'=>config("app.name"),
                     'navigation'=>"OAuth",
@@ -124,16 +124,16 @@ 
 
     public function unbind()
     {
-        $accountModel = new AccountModel();
-        if($accountModel->getExtra(Auth::user()->id ,'github_id')){
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        if ($accountModel->getExtra(Auth::user()->id, 'github_id')) {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
                 'platform' => 'Github',
                 'display_html' => 'You are trying to unbind the following two : <br />
                 Your '.config("app.name").' account : <span class="text-info">'.Auth::user()->email.'</span><br />
-                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id ,'github_email').'</span><br />
+                This Github account : <span class="text-info">'.$accountModel->getExtra(Auth::user()->id, 'github_email').'</span><br />
                 Make your decision carefully, although you can later establish the binding again',
                 'buttons' => [
                     [
@@ -147,8 +147,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -166,15 +166,15 @@ 
 
     public function confirmUnbind()
     {
-        $accountModel = new AccountModel();
-        $user_id = Auth::user()->id;
-        if($accountModel->getExtra($user_id ,'github_id')){
-            $accountModel->setExtra($user_id,'github_id',null);
-            $accountModel->setExtra($user_id,'github_email',null);
-            $accountModel->setExtra($user_id,'github_nickname',null);
-            $accountModel->setExtra($user_id,'github_homepage',null);
-            $accountModel->setExtra($user_id,'github_token',null);
-            return view('oauth.index',[
+        $accountModel=new AccountModel();
+        $user_id=Auth::user()->id;
+        if ($accountModel->getExtra($user_id, 'github_id')) {
+            $accountModel->setExtra($user_id, 'github_id', null);
+            $accountModel->setExtra($user_id, 'github_email', null);
+            $accountModel->setExtra($user_id, 'github_nickname', null);
+            $accountModel->setExtra($user_id, 'github_homepage', null);
+            $accountModel->setExtra($user_id, 'github_token', null);
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",
@@ -187,8 +187,8 @@ 
                     ],
                 ]
             ]);
-        }else{
-            return view('oauth.index',[
+        } else {
+            return view('oauth.index', [
                 'page_title'=>"OAuth",
                 'site_title'=>config("app.name"),
                 'navigation'=>"OAuth",