diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 05a88bfffc1..b4e2668f678 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -17,7 +17,6 @@ use SocialiteProviders\Google\GoogleExtendSocialite; use SocialiteProviders\LinkedIn\LinkedInExtendSocialite; use SocialiteProviders\Manager\SocialiteWasCalled; -use SocialiteProviders\Twitter\TwitterExtendSocialite; class EventServiceProvider extends ServiceProvider { @@ -42,7 +41,6 @@ class EventServiceProvider extends ServiceProvider GitHubExtendSocialite::class, GoogleExtendSocialite::class, LinkedInExtendSocialite::class, - TwitterExtendSocialite::class, ], WebauthnRegister::class => [ WebauthnRegistered::class, diff --git a/composer.json b/composer.json index dff13396a87..deb4b9c310a 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,6 @@ "socialiteproviders/google": "^4.1", "socialiteproviders/linkedin": "^4.2", "socialiteproviders/microsoft-azure": "^5.1", - "socialiteproviders/twitter": "^4.1", "stevebauman/location": "^7.0", "thecodingmachine/safe": "^2.5", "tightenco/ziggy": "1.8.1", diff --git a/composer.lock b/composer.lock index a64c6cffb7f..5177e022eae 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0929abcdbee333d57b053a463baf61d3", + "content-hash": "027933779ffd8e1c6e2787576d10c339", "packages": [ { "name": "asbiin/laravel-webauthn", @@ -7583,56 +7583,6 @@ }, "time": "2022-03-15T21:17:43+00:00" }, - { - "name": "socialiteproviders/twitter", - "version": "4.1.2", - "source": { - "type": "git", - "url": "https://github.com/SocialiteProviders/Twitter.git", - "reference": "54ddc36c1475bbdc111a89edee1468e3c9cf1229" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/SocialiteProviders/Twitter/zipball/54ddc36c1475bbdc111a89edee1468e3c9cf1229", - "reference": "54ddc36c1475bbdc111a89edee1468e3c9cf1229", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": "^7.4 || ^8.0", - "socialiteproviders/manager": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "SocialiteProviders\\Twitter\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Brian Faust", - "email": "hello@brianfaust.de" - } - ], - "description": "Twitter OAuth1 Provider for Laravel Socialite", - "keywords": [ - "laravel", - "oauth", - "provider", - "socialite", - "twitter" - ], - "support": { - "docs": "https://socialiteproviders.com/twitter", - "issues": "https://github.com/socialiteproviders/providers/issues", - "source": "https://github.com/socialiteproviders/providers" - }, - "time": "2023-05-25T23:12:53+00:00" - }, { "name": "spatie/data-transfer-object", "version": "3.9.1", @@ -18437,5 +18387,5 @@ "ext-fileinfo": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/config/auth.php b/config/auth.php index 82fc28354b3..26e941db509 100644 --- a/config/auth.php +++ b/config/auth.php @@ -111,7 +111,7 @@ | List of available login providers, coma separated. This uses socialite | packages. | - | Supported: azure, facebook, github, google, linkedin, saml2, twitter. + | Supported: azure, facebook, github, google, linkedin, saml2. | */ diff --git a/config/services.php b/config/services.php index 6495ebced3a..b67f8cb72d1 100644 --- a/config/services.php +++ b/config/services.php @@ -80,10 +80,4 @@ 'logo' => env('SAML2_LOGO', '/img/auth/saml2.svg'), ], - 'twitter' => [ - 'client_id' => env('TWITTER_CLIENT_ID'), - 'client_secret' => env('TWITTER_CLIENT_SECRET'), - 'redirect' => env('TWITTER_REDIRECT_URI', '/auth/twitter/callback'), - ], - ]; diff --git a/lang/de/auth.php b/lang/de/auth.php index e2e3f30db11..817fbe7637f 100644 --- a/lang/de/auth.php +++ b/lang/de/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'SAML 2.0-Anbieter', - 'login_provider_twitter' => 'Twitter', 'password' => 'Das Passwort ist falsch.', 'throttle' => 'Zu viele Loginversuche. Versuchen Sie es bitte in :seconds Sekunden nochmal.', ]; diff --git a/lang/en/auth.php b/lang/en/auth.php index 837b03931d3..5970c201c32 100644 --- a/lang/en/auth.php +++ b/lang/en/auth.php @@ -11,7 +11,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'SAML 2.0 provider', - 'login_provider_twitter' => 'Twitter', 'password' => 'The password is incorrect.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', ]; diff --git a/lang/es/auth.php b/lang/es/auth.php index 5464e162d7a..7bb39012928 100644 --- a/lang/es/auth.php +++ b/lang/es/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'Proveedor SAML 2.0', - 'login_provider_twitter' => 'Twitter', 'password' => 'La contraseña es incorrecta.', 'throttle' => 'Demasiados intentos de acceso. Por favor intente nuevamente en :seconds segundos.', ]; diff --git a/lang/fr/auth.php b/lang/fr/auth.php index ade70ad0823..5976c55554c 100644 --- a/lang/fr/auth.php +++ b/lang/fr/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'Fournisseur SAML 2.0', - 'login_provider_twitter' => 'Twitter', 'password' => 'Le mot de passe est incorrect', 'throttle' => 'Tentatives de connexion trop nombreuses. Veuillez essayer de nouveau dans :seconds secondes.', ]; diff --git a/lang/it/auth.php b/lang/it/auth.php index e2984f24996..28e54e6d3c7 100644 --- a/lang/it/auth.php +++ b/lang/it/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'Fornitore SAML 2.0', - 'login_provider_twitter' => 'Twitter', 'password' => 'Il campo :attribute non è corretto.', 'throttle' => 'Troppi tentativi di accesso. Riprova tra :seconds secondi.', ]; diff --git a/lang/ml/auth.php b/lang/ml/auth.php index f74a116fd75..2ff3a6b6850 100644 --- a/lang/ml/auth.php +++ b/lang/ml/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'SAML 2.0 പ്രോവൈഡർ', - 'login_provider_twitter' => 'Twitter', 'password' => 'അസാധുവായ പാസ്സ്‌വേഡ്.', 'throttle' => 'ലോഗിൻ നിങ്ങളുടെ അക്കൗണ്ടിന് നൽകിയ ശ്രമങ്ങൾ കൂടുതൽ ആയിരിക്കുന്നു. ദയവായി :seconds സെക്കൻഡ് ശേഷം ശ്രമിക്കുക.', ]; diff --git a/lang/pt/auth.php b/lang/pt/auth.php index 59fcb4321b2..d407b4337ad 100644 --- a/lang/pt/auth.php +++ b/lang/pt/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'Provedor SAML 2.0', - 'login_provider_twitter' => 'Twitter', 'password' => 'A palavra-passe está errada.', 'throttle' => 'O número limite de tentativas de login foi atingido. Por favor tente novamente dentro de :seconds segundos.', ]; diff --git a/lang/ru/auth.php b/lang/ru/auth.php index c1d68384b34..3c2552b199c 100644 --- a/lang/ru/auth.php +++ b/lang/ru/auth.php @@ -9,7 +9,6 @@ 'login_provider_google' => 'Google', 'login_provider_linkedin' => 'LinkedIn', 'login_provider_saml2' => 'Provedor SAML 2.0', - 'login_provider_twitter' => 'Twitter', 'password' => 'Некорректный пароль.', 'throttle' => 'Слишком много попыток входа. Пожалуйста, попробуйте ещё раз через :seconds секунд.', ]; diff --git a/resources/js/Pages/Vault/Index.vue b/resources/js/Pages/Vault/Index.vue index ecb56755ecb..29e1c864830 100644 --- a/resources/js/Pages/Vault/Index.vue +++ b/resources/js/Pages/Vault/Index.vue @@ -34,7 +34,7 @@ Régis & - + Alexis