Fixed login issue related to the decoupling.

Now the module uses its own User trait as well.

src/Cloudoki/OaStack/Controllers/OAuth2Controller.php

@@ -50,24 +50,15 @@ public static function login ($payload)
 			throw new \Cloudoki\InvalidParameterException ('Invalid e-mail.');
 		}
 
-		$userModelClass = config ('oastack.user_model', null);
+		$userModelClass = config ('oastack.user_model', User::class);
 
-		if ($userModelClass != null) {
-			// We have to use the base app's user model and authentication strategy
-			$userModel = app()->make($userModelClass);
+		// We have to use the base app's user model and authentication strategy
+		$userModel = app()->make($userModelClass);
 
-			$user = call_user_func(array($userModel, 'findByLoginId'), $payload->email);
+		$user = call_user_func(array($userModel, 'findByLoginId'), $payload->email);
 
-			if (!isset($user) || !$user->checkPassword ($payload->password)) {
-				throw new \Cloudoki\InvalidParameterException ('Invalid password or e-mail.');
-			}
-		} else {
-			// We're allowed to use our own `user` model and authentication strategy
-			$user = User::email ($payload->email)->first ();
-
-			if (!isset($user) || !$user->checkPassword ($payload->password)) {
-				throw new \Cloudoki\InvalidParameterException ('Invalid password or e-mail.');
-			}
+		if (!isset($user) || !$user->checkPassword ($payload->password)) {
+			throw new \Cloudoki\InvalidParameterException ('Invalid password or e-mail.');
 		}
 
 		# Validate Authorization

src/Cloudoki/OaStack/Models/User.php

@@ -5,14 +5,17 @@
 use Cloudoki\OaStack\Models\Oauth2Authorization;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Hash;
+use Cloudoki\OaStack\Traits\User as UserTrait;
+
 /**
  *	User Model
  *	Add the namespace if you want to extend your custom User model with this one.
  */
 class User extends BaseModel
 {
 	use SoftDeletes;
-
+	use UserTrait;
+
 	/**
 	 * The model type.
 	 *
@@ -40,36 +43,6 @@ public function accounts ()
 		return $this->belongsToMany ('Cloudoki\OaStack\Models\Account')->withPivot ('invitation_token');
 	}
 
-	/**
-	 * Acces Token relationship
-	 *
-	 * @return hasMany
-	 */
-	public function oauth2accesstokens ()
-	{
-		return $this->hasMany('Cloudoki\OaStack\Models\Oauth2AccessToken');
-	}
-
-	/**
-	 * Authorisations relationship
-	 *
-	 * @return hasMany
-	 */
-	public function oauth2authorizations ()
-	{
-		return $this->hasMany('Cloudoki\OaStack\Models\Oauth2Authorization');
-	}
-
-	/**
-	 * Clients relationship
-	 *
-	 * @return hasMany
-	 */
-	public function oauth2clients ()
-	{
-		return $this->hasMany('Cloudoki\OaStack\Models\Oauth2Client');
-	}
-
 	/**
 	 * Get Accounts
 	 * All accounts related to the user.
@@ -127,7 +100,7 @@ public function getFirstName ()
 	public function setFirstName ($firstname)
 	{
 		$this->firstname = $firstname;
-		
+
 		return $this;
 	}
 
@@ -149,10 +122,10 @@ public function getLastName ()
 	public function setLastName ($name)
 	{
 		$this->lastname = $name;
-		
+
 		return $this;
 	}
-	
+
 	/**
 	 * Get user name
 	 *
@@ -181,7 +154,7 @@ public function getEmail ()
 	public function setEmail ($email)
 	{
 		$this->email = $email;
-		
+
 		return $this;
 	}
 
@@ -194,19 +167,8 @@ public function setEmail ($email)
 	public function setPassword($value)
 	{
 		$this->password = Hash::make ($value);
-
-		return $this;
-	}
 
-	/**
-	 * Check password
-	 *
-	 * @param string $value
-	 * @return bool
-	 */
-	public function checkPassword ($value)
-	{
-		return Hash::check ($value, $this->password);
+		return $this;
 	}
 
 	/**
@@ -243,7 +205,7 @@ public function makeToken ()
 
 		return md5 (uniqid ( $rand[rand (0, 9)] . ' ' . $rand[rand (0, 9)], true));
 	}
-	
+
 	/**
 	 *	Set Reset Token
 	 *