Skip to content
This repository has been archived by the owner on Dec 17, 2021. It is now read-only.

Commit

Permalink
Update model dockblock and change where usage
Browse files Browse the repository at this point in the history
  • Loading branch information
lahaxearnaud committed Jan 6, 2015
1 parent 0f42dbf commit be7d93a
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 6 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -363,5 +363,4 @@ Find all token for an user
```

## Todo
- token type
- config to allow only one token by user and type
9 changes: 8 additions & 1 deletion src/Lahaxearnaud/LaravelToken/models/Token.php
Expand Up @@ -13,7 +13,14 @@
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @property \Carbon\Carbon $expire_at
* @property-read \User $author
* @property-read \User $user
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereId($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereToken($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereExpireAt($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereUpdatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\Lahaxearnaud\LaravelToken\Models\Token whereLogin($value)
*/
class Token extends Model
{
Expand Down
Expand Up @@ -67,7 +67,7 @@ public function find($id) {
*/
public function findByUser($userId) {

return $this->model->where('user_id', $userId)->get();
return $this->model->whereUserId($userId)->get();
}

/**
Expand All @@ -79,10 +79,10 @@ public function findByUser($userId) {
*/
public function findByToken($token, $userId = null) {

$query = $this->model->where('token', $token);
$query = $this->model->whereToken($token);

if($userId !== null) {
$query->where('user_id', $userId);
$query->whereUserId($userId);
}

return $query->firstOrFail();
Expand Down Expand Up @@ -110,7 +110,7 @@ public function save(Token $token) {

public function exists($tokenStr) {

return $this->model->where('token', $tokenStr)->count() > 0;
return $this->model->whereToken($tokenStr)->count() > 0;
}

/**
Expand Down
18 changes: 18 additions & 0 deletions tests/models/User.php
Expand Up @@ -7,6 +7,24 @@
use Illuminate\Auth\Reminders\RemindableInterface;
use \Lahaxearnaud\LaravelToken\models\UserTokenInterface;

/**
* User
*
* @property integer $id
* @property string $username
* @property string $email
* @property string $password
* @property string $remember_token
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @method static \Illuminate\Database\Query\Builder|\User whereId($value)
* @method static \Illuminate\Database\Query\Builder|\User whereUsername($value)
* @method static \Illuminate\Database\Query\Builder|\User whereEmail($value)
* @method static \Illuminate\Database\Query\Builder|\User wherePassword($value)
* @method static \Illuminate\Database\Query\Builder|\User whereRememberToken($value)
* @method static \Illuminate\Database\Query\Builder|\User whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\User whereUpdatedAt($value)
*/
class User extends Model implements UserInterface, RemindableInterface, UserTokenInterface {

use UserTrait, RemindableTrait;
Expand Down

0 comments on commit be7d93a

Please sign in to comment.