From 8d59a55dfc0f20e5fc38506f917729faeda1eeb4 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel.butcher@gosuperscript.com>
Date: Fri, 8 Sep 2023 15:29:43 +0100
Subject: [PATCH] Added support for LinkedIn OpenID

---
 composer.json                                 |  2 +-
 src/Providers.php                             | 20 +++++++++++++++
 .../LinkedInOpenIdOauth2RefreshResolver.php   | 25 +++++++++++++++++++
 src/Socialstream.php                          |  8 ++++++
 src/SocialstreamServiceProvider.php           |  4 ++-
 .../js/Components/ConnectedAccount.vue        | 17 +++++++++++--
 .../resources/js/Components/Socialstream.vue  |  5 ++++
 .../components/connected-account.blade.php    |  1 +
 .../views/components/socialstream.blade.php   |  7 ++++++
 .../SocialstreamRegistrationTest.php          | 11 +++++---
 stubs/tests/SocialstreamRegistrationTest.php  | 11 +++++---
 tests/Unit/ProvidersTest.php                  |  6 +++++
 12 files changed, 105 insertions(+), 12 deletions(-)
 create mode 100644 src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php

diff --git a/composer.json b/composer.json
index 14083dbb..0f3e4289 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     "require": {
         "php": "^8.1",
         "laravel/jetstream": "^3.0|^4.0",
-        "laravel/socialite": "^5.8.1"
+        "laravel/socialite": "^5.9"
     },
     "require-dev": {
         "inertiajs/inertia-laravel": "^0.6.4",
diff --git a/src/Providers.php b/src/Providers.php
index 704afc98..7b99b134 100644
--- a/src/Providers.php
+++ b/src/Providers.php
@@ -63,6 +63,14 @@ public static function hasLinkedInSupport(): bool
         return static::enabled(static::linkedin());
     }
 
+    /**
+     * Determine if the application has support for the LinkedIn OpenID provider.
+     */
+    public static function hasLinkedInOpenIdSupport(): bool
+    {
+        return static::enabled(static::linkedinOpenId());
+    }
+
     /**
      * Determine if the application has support for the Slack provider.
      */
@@ -73,6 +81,8 @@ public static function hasSlackSupport(): bool
 
     /**
      * Determine if the application has support for the Twitter provider.
+     *
+     * @deprecated use `hasTwitterOAuth1Support` instead
      */
     public static function hasTwitterSupport(): bool
     {
@@ -144,6 +154,14 @@ public static function linkedin(): string
         return 'linkedin';
     }
 
+    /**
+     * Enable the LinkedIn OpenID provider.
+     */
+    public static function linkedinOpenId(): string
+    {
+        return 'linkedin-openid';
+    }
+
     /**
      * Enable the Slack provider.
      */
@@ -154,6 +172,8 @@ public static function slack(): string
 
     /**
      * Enable the Twitter provider.
+     *
+     * @deprecated use `twitterOAuth1` instead.
      */
     public static function twitter(): string
     {
diff --git a/src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php b/src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php
new file mode 100644
index 00000000..05403450
--- /dev/null
+++ b/src/Resolvers/OAuth/LinkedInOpenIdOauth2RefreshResolver.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace JoelButcher\Socialstream\Resolvers\OAuth;
+
+use JoelButcher\Socialstream\Concerns\RefreshesOauth2Tokens;
+use JoelButcher\Socialstream\Contracts\Oauth2RefreshResolver;
+use Laravel\Socialite\Two\LinkedInOpenIdProvider;
+
+class LinkedInOpenIdOauth2RefreshResolver extends LinkedInOpenIdProvider implements Oauth2RefreshResolver
+{
+    use RefreshesOauth2Tokens;
+
+    /**
+     * Create a new provider instance.
+     */
+    public function __construct()
+    {
+        parent::__construct(
+            request: request(),
+            clientId: config('services.linkedin.client_id'),
+            clientSecret: config('services.linkedin.client_secret'),
+            redirectUrl: '',
+        );
+    }
+}
diff --git a/src/Socialstream.php b/src/Socialstream.php
index 481fd713..1c2f1e70 100644
--- a/src/Socialstream.php
+++ b/src/Socialstream.php
@@ -120,6 +120,14 @@ public static function hasLinkedInSupport(): bool
         return Providers::hasLinkedInSupport();
     }
 
+    /**
+     * Determine if the application has support for the LinkedIn OpenID provider.
+     */
+    public static function hasLinkedInOpenIdSupport(): bool
+    {
+        return Providers::hasLinkedInOpenIdSupport();
+    }
+
     /**
      * Determine if the application has support for the Slack provider.
      */
diff --git a/src/SocialstreamServiceProvider.php b/src/SocialstreamServiceProvider.php
index 089961bf..f90bd2e3 100644
--- a/src/SocialstreamServiceProvider.php
+++ b/src/SocialstreamServiceProvider.php
@@ -120,8 +120,10 @@ protected function configureRefreshTokenResolvers(): void
         Socialstream::refreshesTokensForProviderUsing(Providers::gitlab(), GitlabOauth2RefreshResolver::class);
         Socialstream::refreshesTokensForProviderUsing(Providers::google(), GoogleOauth2RefreshResolver::class);
         Socialstream::refreshesTokensForProviderUsing(Providers::linkedin(), LinkedInOauth2RefreshResolver::class);
+        Socialstream::refreshesTokensForProviderUsing(Providers::linkedinOpenId(), LinkedInOauth2RefreshResolver::class);
         Socialstream::refreshesTokensForProviderUsing(Providers::slack(), SlackOauth2RefreshResolver::class);
-        Socialstream::refreshesTokensForProviderUsing(Providers::twitter(), TwitterOauth2RefreshResolver::class);
+        Socialstream::refreshesTokensForProviderUsing(Providers::twitterOAuth1(), TwitterOauth2RefreshResolver::class);
+        Socialstream::refreshesTokensForProviderUsing(Providers::twitterOAuth2(), TwitterOauth2RefreshResolver::class);
     }
 
     /**
diff --git a/stubs/inertia/resources/js/Components/ConnectedAccount.vue b/stubs/inertia/resources/js/Components/ConnectedAccount.vue
index 634dc5d2..e29b1aa3 100644
--- a/stubs/inertia/resources/js/Components/ConnectedAccount.vue
+++ b/stubs/inertia/resources/js/Components/ConnectedAccount.vue
@@ -15,6 +15,19 @@ defineProps({
         default: null,
     }
 });
+
+const providerName =  computed(() => {
+    switch(this.provider) {
+        case 'twitter':
+        case 'twitter-oauth-2':
+            return 'Twitter'
+        case 'linkedin':
+        case 'linkedin-openid':
+            return 'LinkedIn'
+        default:
+            return name.charAt(0).toUpperCase() + provider.slice(1);
+    };
+});
 </script>
 
 <template>
@@ -27,13 +40,13 @@ defineProps({
                 <GithubIcon class="h-6 w-6 mr-2" v-if="provider === 'github'" />
                 <GitLabIcon class="h-6 w-6 mr-2" v-if="provider === 'gitlab'" />
                 <GoogleIcon class="h-6 w-6 mr-2" v-if="provider === 'google'" />
-                <LinkedInIcon class="h-6 w-6 mr-2" v-if="provider === 'linkedin'" />
+                <LinkedInIcon class="h-6 w-6 mr-2" v-if="['linkedin', 'linkedin-openid'].includes(provider)" />
                 <SlackIcon class="h-6 w-6 mr-2" v-if="provider === 'slack'" />
                 <TwitterIcon class="h-6 w-6 mr-2" v-if="['twitter', 'twitter-oauth-2'].includes(provider)" />
 
                 <div>
                     <div class="text-sm font-semibold text-gray-600 dark:text-gray-400">
-                        {{ provider === 'twitter-oauth-2' ? 'Twitter' : provider.charAt(0).toUpperCase() + provider.slice(1) }}
+                        {{ providerName }}
                     </div>
 
                     <div v-if="createdAt !== null" class="text-xs text-gray-500">
diff --git a/stubs/inertia/resources/js/Components/Socialstream.vue b/stubs/inertia/resources/js/Components/Socialstream.vue
index 4d587849..d60813f6 100644
--- a/stubs/inertia/resources/js/Components/Socialstream.vue
+++ b/stubs/inertia/resources/js/Components/Socialstream.vue
@@ -53,6 +53,11 @@ const error = computed(() => usePage().props.errors.socialstream);
         <span class="sr-only">LinkedIn</span>
       </a>
 
+      <a v-if="$page.props.socialstream.providers.includes('linkedin-openid')" :href="route('oauth.redirect', 'linkedin-openid')">
+        <LinkedInIcon class="h-6 w-6 mx-2"/>
+        <span class="sr-only">LinkedIn</span>
+      </a>
+
       <a v-if="$page.props.socialstream.providers.includes('slack')" :href="route('oauth.redirect', 'slack')">
         <SlackIcon class="h-6 w-6 mx-2"/>
         <span class="sr-only">Slack</span>
diff --git a/stubs/livewire/resources/views/components/connected-account.blade.php b/stubs/livewire/resources/views/components/connected-account.blade.php
index d64990f5..8784167b 100644
--- a/stubs/livewire/resources/views/components/connected-account.blade.php
+++ b/stubs/livewire/resources/views/components/connected-account.blade.php
@@ -16,6 +16,7 @@
                     <x-socialstream-icons.twitter class="h-6 w-6 mr-2" />
                     @break
                 @case(JoelButcher\Socialstream\Providers::linkedin())
+                @case(JoelButcher\Socialstream\Providers::linkedinOpenId())
                     <x-socialstream-icons.linkedin class="h-6 w-6 mr-2" />
                     @break
                 @case(JoelButcher\Socialstream\Providers::github())
diff --git a/stubs/livewire/resources/views/components/socialstream.blade.php b/stubs/livewire/resources/views/components/socialstream.blade.php
index e3e4bcdc..88387086 100644
--- a/stubs/livewire/resources/views/components/socialstream.blade.php
+++ b/stubs/livewire/resources/views/components/socialstream.blade.php
@@ -47,6 +47,13 @@
         </a>
     @endif
 
+    @if (JoelButcher\Socialstream\Socialstream::hasLinkedInOpenIdSupport())
+        <a href="{{ route('oauth.redirect', ['provider' => JoelButcher\Socialstream\Providers::linkedinOpenId()]) }}">
+            <x-socialstream-icons.linkedin class="h-6 w-6 mx-2" />
+            <span class="sr-only">LinkedIn</span>
+        </a>
+    @endif
+
     @if (JoelButcher\Socialstream\Socialstream::hasSlackSupport())
         <a href="{{ route('oauth.redirect', ['provider' => JoelButcher\Socialstream\Providers::slack()]) }}">
             <x-socialstream-icons.slack class="h-6 w-6 mx-2" />
diff --git a/stubs/pest-tests/SocialstreamRegistrationTest.php b/stubs/pest-tests/SocialstreamRegistrationTest.php
index 6ad4e89b..e267ca2b 100644
--- a/stubs/pest-tests/SocialstreamRegistrationTest.php
+++ b/stubs/pest-tests/SocialstreamRegistrationTest.php
@@ -46,11 +46,14 @@
     $this->assertAuthenticated();
     $response->assertRedirect(RouteServiceProvider::HOME);
 })->with([
-    [Providers::google()],
-    [Providers::facebook()],
-    [Providers::linkedin()],
     [Providers::bitbucket()],
+    [Providers::facebook()],
     [Providers::github()],
     [Providers::gitlab()],
-    [Providers::twitter()],
+    [Providers::google()],
+    [Providers::linkedin()],
+    [Providers::linkedinOpenId()],
+    [Providers::slack()],
+    [Providers::twitterOAuth1()],
+    [Providers::twitterOAuth2()],
 ]);
diff --git a/stubs/tests/SocialstreamRegistrationTest.php b/stubs/tests/SocialstreamRegistrationTest.php
index d9696083..4f007c3c 100644
--- a/stubs/tests/SocialstreamRegistrationTest.php
+++ b/stubs/tests/SocialstreamRegistrationTest.php
@@ -60,13 +60,16 @@ public function test_users_can_register_using_socialite_providers(string $social
     public static function socialiteProvidersDataProvider(): array
     {
         return [
-            [Providers::google()],
-            [Providers::facebook()],
-            [Providers::linkedin()],
             [Providers::bitbucket()],
+            [Providers::facebook()],
             [Providers::github()],
             [Providers::gitlab()],
-            [Providers::twitter()],
+            [Providers::google()],
+            [Providers::linkedin()],
+            [Providers::linkedinOpenId()],
+            [Providers::slack()],
+            [Providers::twitterOAuth1()],
+            [Providers::twitterOAuth2()],
         ];
     }
 }
diff --git a/tests/Unit/ProvidersTest.php b/tests/Unit/ProvidersTest.php
index 4ba8bca5..ead082bd 100644
--- a/tests/Unit/ProvidersTest.php
+++ b/tests/Unit/ProvidersTest.php
@@ -41,6 +41,12 @@
     $this->assertTrue(Providers::hasLinkedInSupport());
 });
 
+it('supports the \'linked-openid\' in_provider', function (): void {
+    Config::set('socialstream.providers', [Providers::linkedinOpenId()]);
+
+    $this->assertTrue(Providers::hasLinkedInOpenIdSupport());
+});
+
 it('supports the \'twitter\' provider', function (): void {
     Config::set('socialstream.providers', [Providers::twitter()]);