Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #514

Closed
wants to merge 2 commits into from
Closed

Main #514

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "laravel/sanctum",
"name": "kashifali/sanctum",
"description": "Laravel Sanctum provides a featherweight authentication system for SPAs and simple APIs.",
"keywords": ["laravel", "sanctum", "auth"],
"license": "MIT",
Expand Down Expand Up @@ -30,7 +30,7 @@
},
"autoload": {
"psr-4": {
"Laravel\\Sanctum\\": "src/"
"kashifali\\Sanctum\\": "src/"
}
},
"autoload-dev": {
Expand Down
4 changes: 2 additions & 2 deletions src/Console/Commands/PruneExpired.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Laravel\Sanctum\Console\Commands;
namespace kashifali\Sanctum\Console\Commands;

use Illuminate\Console\Command;
use Laravel\Sanctum\Sanctum;
use kashifali\Sanctum\Sanctum;
use Symfony\Component\Console\Attribute\AsCommand;

#[AsCommand(name: 'sanctum:prune-expired')]
Expand Down
2 changes: 1 addition & 1 deletion src/Contracts/HasAbilities.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Contracts;
namespace kashifali\Sanctum\Contracts;

interface HasAbilities
{
Expand Down
10 changes: 5 additions & 5 deletions src/Contracts/HasApiTokens.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Contracts;
namespace kashifali\Sanctum\Contracts;

use DateTimeInterface;

Expand All @@ -27,22 +27,22 @@ public function tokenCan(string $ability);
* @param string $name
* @param array $abilities
* @param \DateTimeInterface|null $expiresAt
* @return \Laravel\Sanctum\NewAccessToken
* @return \kashifali\Sanctum\NewAccessToken
*/
public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null);

/**
* Get the access token currently associated with the user.
*
* @return \Laravel\Sanctum\Contracts\HasAbilities
* @return \kashifali\Sanctum\Contracts\HasAbilities
*/
public function currentAccessToken();

/**
* Set the current access token for the user.
*
* @param \Laravel\Sanctum\Contracts\HasAbilities $accessToken
* @return \Laravel\Sanctum\Contracts\HasApiTokens
* @param \kashifali\Sanctum\Contracts\HasAbilities $accessToken
* @return \kashifali\Sanctum\Contracts\HasApiTokens
*/
public function withAccessToken($accessToken);
}
6 changes: 3 additions & 3 deletions src/Events/TokenAuthenticated.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?php

namespace Laravel\Sanctum\Events;
namespace kashifali\Sanctum\Events;

class TokenAuthenticated
{
/**
* The personal access token that was authenticated.
*
* @var \Laravel\Sanctum\PersonalAccessToken
* @var \kashifali\Sanctum\PersonalAccessToken
*/
public $token;

/**
* Create a new event instance.
*
* @param \Laravel\Sanctum\PersonalAccessToken $token
* @param \kashifali\Sanctum\PersonalAccessToken $token
* @return void
*/
public function __construct($token)
Expand Down
2 changes: 1 addition & 1 deletion src/Exceptions/MissingAbilityException.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Exceptions;
namespace kashifali\Sanctum\Exceptions;

use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Support\Arr;
Expand Down
4 changes: 2 additions & 2 deletions src/Exceptions/MissingScopeException.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

namespace Laravel\Sanctum\Exceptions;
namespace kashifali\Sanctum\Exceptions;

use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Support\Arr;

/**
* @deprecated
* @see \Laravel\Sanctum\Exceptions\MissingAbilityException
* @see \kashifali\Sanctum\Exceptions\MissingAbilityException
*/
class MissingScopeException extends AuthorizationException
{
Expand Down
4 changes: 2 additions & 2 deletions src/Guard.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use Illuminate\Contracts\Auth\Factory as AuthFactory;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Laravel\Sanctum\Events\TokenAuthenticated;
use kashifali\Sanctum\Events\TokenAuthenticated;

class Guard
{
Expand Down
10 changes: 5 additions & 5 deletions src/HasApiTokens.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use DateTimeInterface;
use Illuminate\Support\Str;
Expand All @@ -10,7 +10,7 @@ trait HasApiTokens
/**
* The access token the user is using for the current request.
*
* @var \Laravel\Sanctum\Contracts\HasAbilities
* @var \kashifali\Sanctum\Contracts\HasAbilities
*/
protected $accessToken;

Expand Down Expand Up @@ -41,7 +41,7 @@ public function tokenCan(string $ability)
* @param string $name
* @param array $abilities
* @param \DateTimeInterface|null $expiresAt
* @return \Laravel\Sanctum\NewAccessToken
* @return \kashifali\Sanctum\NewAccessToken
*/
public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
{
Expand Down Expand Up @@ -75,7 +75,7 @@ public function generateTokenString()
/**
* Get the access token currently associated with the user.
*
* @return \Laravel\Sanctum\Contracts\HasAbilities
* @return \kashifali\Sanctum\Contracts\HasAbilities
*/
public function currentAccessToken()
{
Expand All @@ -85,7 +85,7 @@ public function currentAccessToken()
/**
* Set the current access token for the user.
*
* @param \Laravel\Sanctum\Contracts\HasAbilities $accessToken
* @param \kashifali\Sanctum\Contracts\HasAbilities $accessToken
* @return $this
*/
public function withAccessToken($accessToken)
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/CsrfCookieController.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Http\Controllers;
namespace kashifali\Sanctum\Http\Controllers;

use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Middleware/AuthenticateSession.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Closure;
use Illuminate\Auth\AuthenticationException;
Expand Down
6 changes: 3 additions & 3 deletions src/Http/Middleware/CheckAbilities.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Illuminate\Auth\AuthenticationException;
use Laravel\Sanctum\Exceptions\MissingAbilityException;
use kashifali\Sanctum\Exceptions\MissingAbilityException;

class CheckAbilities
{
Expand All @@ -15,7 +15,7 @@ class CheckAbilities
* @param mixed ...$abilities
* @return \Illuminate\Http\Response
*
* @throws \Illuminate\Auth\AuthenticationException|\Laravel\Sanctum\Exceptions\MissingAbilityException
* @throws \Illuminate\Auth\AuthenticationException|\kashifali\Sanctum\Exceptions\MissingAbilityException
*/
public function handle($request, $next, ...$abilities)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Http/Middleware/CheckForAnyAbility.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Illuminate\Auth\AuthenticationException;
use Laravel\Sanctum\Exceptions\MissingAbilityException;
use kashifali\Sanctum\Exceptions\MissingAbilityException;

class CheckForAnyAbility
{
Expand All @@ -15,7 +15,7 @@ class CheckForAnyAbility
* @param mixed ...$abilities
* @return \Illuminate\Http\Response
*
* @throws \Illuminate\Auth\AuthenticationException|\Laravel\Sanctum\Exceptions\MissingAbilityException
* @throws \Illuminate\Auth\AuthenticationException|\kashifali\Sanctum\Exceptions\MissingAbilityException
*/
public function handle($request, $next, ...$abilities)
{
Expand Down
10 changes: 5 additions & 5 deletions src/Http/Middleware/CheckForAnyScope.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Laravel\Sanctum\Exceptions\MissingScopeException;
use kashifali\Sanctum\Exceptions\MissingScopeException;

/**
* @deprecated
* @see \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility
* @see \kashifali\Sanctum\Http\Middleware\CheckForAnyAbility
*/
class CheckForAnyScope
{
Expand All @@ -18,13 +18,13 @@ class CheckForAnyScope
* @param mixed ...$scopes
* @return \Illuminate\Http\Response
*
* @throws \Illuminate\Auth\AuthenticationException|\Laravel\Sanctum\Exceptions\MissingScopeException
* @throws \Illuminate\Auth\AuthenticationException|\kashifali\Sanctum\Exceptions\MissingScopeException
*/
public function handle($request, $next, ...$scopes)
{
try {
return (new CheckForAnyAbility())->handle($request, $next, ...$scopes);
} catch (\Laravel\Sanctum\Exceptions\MissingAbilityException $e) {
} catch (\kashifali\Sanctum\Exceptions\MissingAbilityException $e) {
throw new MissingScopeException($e->abilities());
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Http/Middleware/CheckScopes.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Laravel\Sanctum\Exceptions\MissingScopeException;
use kashifali\Sanctum\Exceptions\MissingScopeException;

/**
* @deprecated
* @see \Laravel\Sanctum\Http\Middleware\CheckAbilities
* @see \kashifali\Sanctum\Http\Middleware\CheckAbilities
*/
class CheckScopes
{
Expand All @@ -18,13 +18,13 @@ class CheckScopes
* @param mixed ...$scopes
* @return \Illuminate\Http\Response
*
* @throws \Illuminate\Auth\AuthenticationException|\Laravel\Sanctum\Exceptions\MissingScopeException
* @throws \Illuminate\Auth\AuthenticationException|\kashifali\Sanctum\Exceptions\MissingScopeException
*/
public function handle($request, $next, ...$scopes)
{
try {
return (new CheckAbilities())->handle($request, $next, ...$scopes);
} catch (\Laravel\Sanctum\Exceptions\MissingAbilityException $e) {
} catch (\kashifali\Sanctum\Exceptions\MissingAbilityException $e) {
throw new MissingScopeException($e->abilities());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Middleware/EnsureFrontendRequestsAreStateful.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum\Http\Middleware;
namespace kashifali\Sanctum\Http\Middleware;

use Illuminate\Routing\Pipeline;
use Illuminate\Support\Collection;
Expand Down
6 changes: 3 additions & 3 deletions src/NewAccessToken.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Jsonable;
Expand All @@ -10,7 +10,7 @@ class NewAccessToken implements Arrayable, Jsonable
/**
* The access token instance.
*
* @var \Laravel\Sanctum\PersonalAccessToken
* @var \kashifali\Sanctum\PersonalAccessToken
*/
public $accessToken;

Expand All @@ -24,7 +24,7 @@ class NewAccessToken implements Arrayable, Jsonable
/**
* Create a new access token result.
*
* @param \Laravel\Sanctum\PersonalAccessToken $accessToken
* @param \kashifali\Sanctum\PersonalAccessToken $accessToken
* @param string $plainTextToken
* @return void
*/
Expand Down
5 changes: 3 additions & 2 deletions src/PersonalAccessToken.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use Illuminate\Database\Eloquent\Model;
use Laravel\Sanctum\Contracts\HasAbilities;
use kashifali\Sanctum\Contracts\HasAbilities;

class PersonalAccessToken extends Model implements HasAbilities
{
protected $connection = 'pgsql-auth';
/**
* The attributes that should be cast to native types.
*
Expand Down
6 changes: 3 additions & 3 deletions src/Sanctum.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use Mockery;

Expand All @@ -11,7 +11,7 @@ class Sanctum
*
* @var string
*/
public static $personalAccessTokenModel = 'Laravel\\Sanctum\\PersonalAccessToken';
public static $personalAccessTokenModel = 'kashifali\\Sanctum\\PersonalAccessToken';

/**
* A callback that can get the token from the request.
Expand Down Expand Up @@ -42,7 +42,7 @@ public static function currentApplicationUrlWithPort()
/**
* Set the current user for the application with the given abilities.
*
* @param \Illuminate\Contracts\Auth\Authenticatable|\Laravel\Sanctum\HasApiTokens $user
* @param \Illuminate\Contracts\Auth\Authenticatable|\kashifali\Sanctum\HasApiTokens $user
* @param array $abilities
* @param string $guard
* @return \Illuminate\Contracts\Auth\Authenticatable
Expand Down
8 changes: 4 additions & 4 deletions src/SanctumServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php

namespace Laravel\Sanctum;
namespace kashifali\Sanctum;

use Illuminate\Auth\RequestGuard;
use Illuminate\Contracts\Http\Kernel;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\ServiceProvider;
use Laravel\Sanctum\Console\Commands\PruneExpired;
use Laravel\Sanctum\Http\Controllers\CsrfCookieController;
use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
use kashifali\Sanctum\Console\Commands\PruneExpired;
use kashifali\Sanctum\Http\Controllers\CsrfCookieController;
use kashifali\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;

class SanctumServiceProvider extends ServiceProvider
{
Expand Down
Loading
Loading