fix login member

app/Http/Controllers/Auth/SocialAccountsController.php

@@ -47,11 +47,18 @@ class SocialAccountsController extends Controller
             return redirect('/login');
         }
         if(auth()->guard('member')->user() != null){
-            $linkStatus = $accountService->findOrLink(
-                $user,
-                auth()->guard('member')->user(),
-                $provider
-            );
+            if($provider == 'google'){
+                $linkStatus = $accountService->editGoogleLink(
+                    $user,
+                    auth()->guard('member')->user()
+                );
+            }else{
+                $linkStatus = $accountService->findOrLink(
+                    $user,
+                    auth()->guard('member')->user(),
+                    $provider
+                );
+            }
             if($linkStatus)
                 return redirect()->to('/members/'.auth()->guard('member')->user()->id)->with('success',ucfirst($provider).' account successfully linked');
             else

app/Http/Controllers/MembersController.php

@@ -98,10 +98,10 @@ class MembersController extends Controller
             return redirect('/');
         
         $this->validate($request, [
-            'email' => 
-                array(
-                    'required',
-                    'regex:/[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}/'),
+            //'email' => 
+            //    array(
+            //        'required',
+            //        'regex:/[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}/'),
             'phone_number' => 
                 array(
                     'required',
@@ -121,7 +121,7 @@ class MembersController extends Controller
         }
 
         $user = Member::find($id);
-        $user->temp_email = $request->input('email');
+        //$user->temp_email = $request->input('email');
         $user->phone_number = $request->input('phone_number');
         $user->company = $request->input('company');
         $user->interest = $request->input('interest');
@@ -134,7 +134,7 @@ class MembersController extends Controller
         }
         $user->save();
 
-        if($user->email != $user->temp_email){
+        /*if($user->email != $user->temp_email){
             $provider = $user->accounts()->where('provider_name','=','google')->first();
             if($user->verifyToken != null)
                 $user->verifyToken->delete();
@@ -147,9 +147,9 @@ class MembersController extends Controller
             ]);
             Mail::to($user)->send(new SendReverificationEmail($token));
             return redirect('/members/' . $id)->with('success', 'Profile Updated. Confirmation code has been sent to new email.');
-        }else{
+        }else{*/
             return redirect('/members/' . $id)->with('success', 'Profile Updated');
-        }
+        //}
     }
 
     /**

app/SocialAccountService.php

@@ -8,6 +8,34 @@ use App\Mail\SendVerificationEmail;
 
 class SocialAccountService
 {
+    public function editGoogleLink(ProviderUser $providerUser, Member $member)
+    {
+        $account = LinkedSocialAccount::where('provider_name', 'google')
+                   ->where('provider_id', $providerUser->getId())
+                   ->first();
+        
+        if ($account){
+            if($account->member->id == $member->id){
+                $account->delete();
+            } else {
+                return false;
+            }
+        }else{
+            $temp_provider = $member->accounts()->where('provider_name','=','google')->first();
+            if($temp_provider != null)
+                $temp_provider->delete();
+        }
+        $member->email = $providerUser->getEmail();
+        $member->save();
+
+        $member->accounts()->create([
+            'provider_id'   => $providerUser->getId(),
+            'provider_name' => 'google',
+        ]);
+        return true;
+        
+    }
+
     public function findOrLink(ProviderUser $providerUser, Member $member, $provider)
     {
         $account = LinkedSocialAccount::where('provider_name', $provider)

resources/views/users/editprofile.blade.php

@@ -21,10 +21,10 @@
                                 <div class="form-group">
                                     {{Form::label('profile_image','Profile Image')}}
                                     {{Form::file('profile_image')}}
-                                    
-                                    {{Form::label('email','Email')}}
-                                    {{Form::text('email', $user->email , ['class' => 'form-control'])}}
-
+                                   
+                                    <!-- {{Form::label('email','Email')}} 
+                                    {{Form::text('email', $user->email , ['class' => 'form-control'])}} -->
+ 
                                     {{Form::label('phone_number','Phone Number')}}
                                     {{Form::text('phone_number', $user->phone_number, ['class' => 'form-control'])}}
 

resources/views/users/profile.blade.php

@@ -21,10 +21,10 @@
                         <td>Name</td>
                         <td>{{$user->name}}</td>
                     </tr>
-                    <tr>
+                    <!--<tr>
                         <td>Email</td>
                         <td><a href="mailto:{{$user->email}}">{{$user->email}}</a></td>
-                    </tr>
+                    </tr>-->
                         <td>Phone Number</td>
                         <td>{{$user->phone_number}}                            
                     </tr>
@@ -41,6 +41,19 @@
                         <td>{{$user->address}}</td>
                     </tr>
                     @if(Auth::guard('member')->user() != null && Auth::guard('member')->user()->id == $user->id)
+                        @if(Auth::guard('member')->user()->email != null)
+                            <tr>
+                                <td>
+                                    Google Account
+                                </td>
+                                <td>
+                                    <a href="/link/google" data-original-title="Edit Google Link" 
+                                        data-toggle="tooltip" type="button" class="btn btn-sm btn-warning">
+                                        {{Auth::guard('member')->user()->email}} <i class="glyphicon glyphicon-edit"></i>
+                                    </a>
+                                </td>
+                            </tr>
+                        @endif
                         @if(Auth::guard('member')->user()->facebook_email != null)
                             <tr>
                                 <td>