mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-25 22:52:53 -04:00 
			
		
		
		
	FIxes for microsoft oauth
This commit is contained in:
		
							parent
							
								
									f57c725632
								
							
						
					
					
						commit
						d9ca212f81
					
				| @ -514,7 +514,7 @@ class LoginController extends BaseController | ||||
|             $email = $user->getMail() ?: $user->getUserPrincipalName(); | ||||
| 
 | ||||
|             $query = [ | ||||
|                 'oauth_user_id' => $account['idToken']['oid'], | ||||
|                 'oauth_user_id' => $user->getId(), | ||||
|                 'oauth_provider_id'=> 'microsoft', | ||||
|             ]; | ||||
| 
 | ||||
| @ -534,7 +534,7 @@ class LoginController extends BaseController | ||||
| 
 | ||||
|                 Auth::login($existing_login_user, true); | ||||
| 
 | ||||
|                 return $this->existingLoginUser($account['idToken']['oid'], 'microsoft'); | ||||
|                 return $this->existingLoginUser($user->getId(), 'microsoft'); | ||||
|             } | ||||
| 
 | ||||
|             // Signup!
 | ||||
| @ -543,7 +543,7 @@ class LoginController extends BaseController | ||||
|                 'last_name' => $user->getSurname() ?: '' , | ||||
|                 'password' => '', | ||||
|                 'email' => $email, | ||||
|                 'oauth_user_id' => $account['idToken']['oid'], | ||||
|                 'oauth_user_id' => $user->getId(), | ||||
|                 'oauth_provider_id' => 'microsoft', | ||||
|             ]; | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user