fix: rename Oauth with OAuth

joelbutcher · Oct 19, 2023 · 7381a79 · 7381a79
1 parent bf55c5a
commit 7381a79
Show file tree

Hide file tree

Showing 30 changed files with 113 additions and 113 deletions.
diff --git a/config/socialstream.php b/config/socialstream.php
@@ -14,6 +14,6 @@
         // Features::generateMissingEmails(),
         Features::rememberSession(),
         Features::providerAvatars(),
-        Features::refreshOauthTokens(),
+        Features::refreshOAuthTokens(),
     ],
 ];
diff --git a/src/Actions/Auth/Breeze/Blade/AuthenticateOauthCallback.php b/src/Actions/Auth/Breeze/Blade/AuthenticateOauthCallback.php
@@ -8,7 +8,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Support\MessageBag;
 use JoelButcher\Socialstream\ConnectedAccount;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOauthCallback;
+use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
 use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
 use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
@@ -17,7 +17,7 @@
 use JoelButcher\Socialstream\Socialstream;
 use Laravel\Socialite\Contracts\User as ProviderUser;
 
-class AuthenticateOauthCallback implements AuthenticatesOauthCallback
+class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
 {
     /**
      * Create a new controller instance.

diff --git a/src/Actions/Auth/Breeze/HandleOauthCallbackErrors.php b/src/Actions/Auth/Breeze/HandleOauthCallbackErrors.php
@@ -6,9 +6,9 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOauthCallbackErrors;
+use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
 
-class HandleOauthCallbackErrors implements HandlesOauthCallbackErrors
+class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
 {
     /**
      * Handles the request if the "errors" key is present.

diff --git a/src/Actions/Auth/Breeze/Livewire/AuthenticateOauthCallback.php b/src/Actions/Auth/Breeze/Livewire/AuthenticateOauthCallback.php
@@ -8,7 +8,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Support\MessageBag;
 use JoelButcher\Socialstream\ConnectedAccount;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOauthCallback;
+use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
 use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
 use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
@@ -17,7 +17,7 @@
 use JoelButcher\Socialstream\Socialstream;
 use Laravel\Socialite\Contracts\User as ProviderUser;
 
-class AuthenticateOauthCallback implements AuthenticatesOauthCallback
+class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
 {
     /**
      * Create a new controller instance.

diff --git a/src/Actions/Auth/Filament/AuthenticateOauthCallback.php b/src/Actions/Auth/Filament/AuthenticateOauthCallback.php
@@ -5,14 +5,14 @@
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOauthCallback;
+use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
 use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
 use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
 use JoelButcher\Socialstream\Socialstream;
 use Laravel\Socialite\Contracts\User as ProviderUser;
 
-class AuthenticateOauthCallback implements AuthenticatesOauthCallback
+class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
 {
     /**
      * Create a new controller instance.

diff --git a/src/Actions/Auth/Filament/HandleOauthCallbackErrors.php b/src/Actions/Auth/Filament/HandleOauthCallbackErrors.php
@@ -5,9 +5,9 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOauthCallbackErrors;
+use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
 
-class HandleOauthCallbackErrors implements HandlesOauthCallbackErrors
+class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
 {
     /**
      * Handles the request if the "errors" key is present.

diff --git a/src/Actions/Auth/Jetstream/AuthenticateOauthCallback.php b/src/Actions/Auth/Jetstream/AuthenticateOauthCallback.php
@@ -8,7 +8,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Support\MessageBag;
 use JoelButcher\Socialstream\ConnectedAccount;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOauthCallback;
+use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\CreatesConnectedAccounts;
 use JoelButcher\Socialstream\Contracts\CreatesUserFromProvider;
 use JoelButcher\Socialstream\Contracts\UpdatesConnectedAccounts;
@@ -19,7 +19,7 @@
 use Laravel\Fortify\Features as FortifyFeatures;
 use Laravel\Socialite\Contracts\User as ProviderUser;
 
-class AuthenticateOauthCallback implements AuthenticatesOauthCallback
+class AuthenticateOAuthCallback implements AuthenticatesOAuthCallback
 {
     /**
      * Create a new controller instance.

diff --git a/src/Actions/Auth/Jetstream/HandleOauthCallbackErrors.php b/src/Actions/Auth/Jetstream/HandleOauthCallbackErrors.php
@@ -5,10 +5,10 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
-use JoelButcher\Socialstream\Contracts\HandlesOauthCallbackErrors;
+use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
 use Laravel\Fortify\Features as FortifyFeatures;
 
-class HandleOauthCallbackErrors implements HandlesOauthCallbackErrors
+class HandleOAuthCallbackErrors implements HandlesOAuthCallbackErrors
 {
     /**
      * Handles the request if the "errors" key is present.

diff --git a/src/Concerns/RefreshesOauth2Tokens.php b/src/Concerns/RefreshesOauth2Tokens.php
@@ -10,9 +10,9 @@
 use Laravel\Socialite\Two\AbstractProvider;
 
 /**
- * @mixin AbstractProvider&RefreshesOauth2Tokens
+ * @mixin AbstractProvider&RefreshesOAuth2Tokens
  */
-trait RefreshesOauth2Tokens
+trait RefreshesOAuth2Tokens
 {
     /**
      * Refresh the token for the current provider.

diff --git a/src/ConnectedAccount.php b/src/ConnectedAccount.php
@@ -7,7 +7,7 @@
 
 abstract class ConnectedAccount extends Model
 {
-    use HasOauth2Tokens;
+    use HasOAuth2Tokens;
 
     /**
      * Get the credentials used for authenticating services.

diff --git a/src/Contracts/AuthenticatesOauthCallback.php b/src/Contracts/AuthenticatesOauthCallback.php
@@ -7,7 +7,7 @@
 use Laravel\Fortify\Contracts\LoginResponse;
 use Laravel\Socialite\Contracts\User;
 
-interface AuthenticatesOauthCallback
+interface AuthenticatesOAuthCallback
 {
     /**
      * Authenticates users returning from an OAuth flow.

diff --git a/src/Contracts/HandlesOauthCallbackErrors.php b/src/Contracts/HandlesOauthCallbackErrors.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
-interface HandlesOauthCallbackErrors
+interface HandlesOAuthCallbackErrors
 {
     /**
      * Handles the request if the "errors" key is present.

diff --git a/src/Contracts/Oauth2RefreshResolver.php b/src/Contracts/Oauth2RefreshResolver.php
@@ -5,7 +5,7 @@
 use JoelButcher\Socialstream\ConnectedAccount;
 use JoelButcher\Socialstream\RefreshedCredentials;
 
-interface Oauth2RefreshResolver
+interface OAuth2RefreshResolver
 {
     /**
      * Refreshes the token for the current provider.

diff --git a/src/Enums/ProviderEnum.php b/src/Enums/ProviderEnum.php
@@ -19,13 +19,13 @@ enum ProviderEnum: string
     case LinkedInOpenId = 'linkedin-openid';
     case Slack = 'slack';
     case Twitter = 'twitter';
-    case TwitterOauth2 = 'twitter-oauth-2';
+    case TwitterOAuth2 = 'twitter-oauth-2';
 
     public function name(): string
     {
         return match ($this) {
             self::Github => 'GitHub',
-            self::Twitter, self::TwitterOauth2 => 'Twitter',
+            self::Twitter, self::TwitterOAuth2 => 'Twitter',
             self::LinkedIn, self::LinkedInOpenId => 'LinkedIn',
             default => Str::of($this->value)->headline(),
         };

diff --git a/src/Features.php b/src/Features.php
@@ -58,9 +58,9 @@ public static function hasRememberSessionFeatures(): bool
     /**
      * Determine if the application should refresh the tokens on retrieval.
      */
-    public static function refreshesOauthTokens(): bool
+    public static function refreshesOAuthTokens(): bool
     {
-        return static::enabled(static::refreshOauthTokens());
+        return static::enabled(static::refreshOAuthTokens());
     }
 
     /**
@@ -106,7 +106,7 @@ public static function rememberSession(): string
     /**
      * Enable the automatic refresh token update on token retrieval.
      */
-    public static function refreshOauthTokens(): string
+    public static function refreshOAuthTokens(): string
     {
         return 'refresh-oauth-tokens';
     }

diff --git a/src/HasOauth2Tokens.php b/src/HasOauth2Tokens.php
@@ -13,7 +13,7 @@
  * @property string|null $refresh_token
  * @property DateTimeInterface|null $expires_at
  */
-trait HasOauth2Tokens
+trait HasOAuth2Tokens
 {
     /**
      * Intercepts and refreshes the "token" attribute if it has expired.
@@ -22,7 +22,7 @@ protected function token(): Attribute
     {
         return Attribute::make(
             get: function ($token) {
-                if (! Socialstream::refreshesOauthTokens()) {
+                if (! Socialstream::refreshesOAuthTokens()) {
                     return $token;
                 }
 

diff --git a/src/Http/Controllers/OAuthController.php b/src/Http/Controllers/OAuthController.php
@@ -6,10 +6,10 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
-use JoelButcher\Socialstream\Contracts\AuthenticatesOauthCallback;
+use JoelButcher\Socialstream\Contracts\AuthenticatesOAuthCallback;
 use JoelButcher\Socialstream\Contracts\GeneratesProviderRedirect;
 use JoelButcher\Socialstream\Contracts\HandlesInvalidState;
-use JoelButcher\Socialstream\Contracts\HandlesOauthCallbackErrors;
+use JoelButcher\Socialstream\Contracts\HandlesOAuthCallbackErrors;
 use JoelButcher\Socialstream\Contracts\ResolvesSocialiteUsers;
 use Laravel\Fortify\Contracts\LoginResponse;
 use Laravel\Socialite\Two\InvalidStateException;
@@ -21,9 +21,9 @@ class OAuthController extends Controller
      * Create a new controller instance.
      */
     public function __construct(
-        protected HandlesOauthCallbackErrors $errorHandler,
+        protected HandlesOAuthCallbackErrors $errorHandler,
         protected ResolvesSocialiteUsers $userResolver,
-        protected AuthenticatesOauthCallback $authenticator,
+        protected AuthenticatesOAuthCallback $authenticator,
         protected HandlesInvalidState $invalidStateHandler
     ) {
         //

diff --git a/src/Providers.php b/src/Providers.php
@@ -236,7 +236,7 @@ public static function twitterOAuth1(string $label = null): string
      */
     public static function twitterOAuth2(string $label = null): string
     {
-        return tap(ProviderEnum::TwitterOauth2->value, fn (string $provider) => static::addLabelFor($provider, $label));
+        return tap(ProviderEnum::TwitterOAuth2->value, fn (string $provider) => static::addLabelFor($provider, $label));
     }
 
     public static function addLabelFor(ProviderEnum|string $provider, string $label = null): void

diff --git a/src/Resolvers/OAuth/BitbucketOauth2RefreshResolver.php b/src/Resolvers/OAuth/BitbucketOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\BitbucketProvider;
 
-class BitbucketOauth2RefreshResolver extends BitbucketProvider implements Oauth2RefreshResolver
+class BitbucketOAuth2RefreshResolver extends BitbucketProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/FacebookOauth2RefreshResolver.php b/src/Resolvers/OAuth/FacebookOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\FacebookProvider;
 
-class FacebookOauth2RefreshResolver extends FacebookProvider implements Oauth2RefreshResolver
+class FacebookOAuth2RefreshResolver extends FacebookProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/GithubOauth2RefreshResolver.php b/src/Resolvers/OAuth/GithubOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\GithubProvider;
 
-class GithubOauth2RefreshResolver extends GithubProvider implements Oauth2RefreshResolver
+class GithubOAuth2RefreshResolver extends GithubProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/GitlabOauth2RefreshResolver.php b/src/Resolvers/OAuth/GitlabOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\GitlabProvider;
 
-class GitlabOauth2RefreshResolver extends GitlabProvider implements Oauth2RefreshResolver
+class GitlabOAuth2RefreshResolver extends GitlabProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/GoogleOauth2RefreshResolver.php b/src/Resolvers/OAuth/GoogleOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\GoogleProvider;
 
-class GoogleOauth2RefreshResolver extends GoogleProvider implements Oauth2RefreshResolver
+class GoogleOAuth2RefreshResolver extends GoogleProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/LinkedInOauth2RefreshResolver.php b/src/Resolvers/OAuth/LinkedInOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\LinkedInProvider;
 
-class LinkedInOauth2RefreshResolver extends LinkedInProvider implements Oauth2RefreshResolver
+class LinkedInOAuth2RefreshResolver extends LinkedInProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php b/src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\LinkedInOpenIdProvider;
 
-class LinkedInOpenIdOauth2RefreshResolver extends LinkedInOpenIdProvider implements Oauth2RefreshResolver
+class LinkedInOpenIdOAuth2RefreshResolver extends LinkedInOpenIdProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.

diff --git a/src/Resolvers/OAuth/SlackOauth2RefreshResolver.php b/src/Resolvers/OAuth/SlackOauth2RefreshResolver.php
@@ -2,13 +2,13 @@
 
 namespace JoelButcher\Socialstream\Resolvers\OAuth;
 
-use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
-use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use JoelButcher\Socialstream\Concerns\RefreshesOAuth2Tokens;
+use JoelButcher\Socialstream\Contracts\OAuth2RefreshResolver;
 use Laravel\Socialite\Two\SlackProvider;
 
-class SlackOauth2RefreshResolver extends SlackProvider implements Oauth2RefreshResolver
+class SlackOAuth2RefreshResolver extends SlackProvider implements OAuth2RefreshResolver
 {
-    use RefreshesOauth2Tokens;
+    use RefreshesOAuth2Tokens;
 
     /**
      * Create a new provider instance.