feat: add loginProvider to CurrentUserSerializer (#64)

* add loginProvider to CurrentUserSeerializer * Apply fixes from StyleCI * remove unneccessary comments --------- Co-authored-by: StyleCI Bot <[email protected]>
FriendsOfFlarum · Oct 4, 2023 · 4f61917 · 4f61917
1 parent df8df7d
commit 4f61917
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 14 deletions.
diff --git a/extend.php b/extend.php
@@ -11,9 +11,12 @@
 
 namespace FoF\OAuth;
 
+use Flarum\Api\Serializer\CurrentUserSerializer;
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Extend;
 use Flarum\Frontend\Document;
+use Flarum\User\User;
+use FoF\Extend\Controllers\AbstractOAuthController;
 use FoF\Extend\Events\OAuthLoginSuccessful;
 
 return [
@@ -66,4 +69,12 @@
 
     (new Extend\Event())
         ->listen(OAuthLoginSuccessful::class, Listeners\UpdateEmailFromProvider::class),
+
+    (new Extend\ApiSerializer(CurrentUserSerializer::class))
+        ->attributes(function (CurrentUserSerializer $serializer, User $user, array $attributes) {
+            $session = $serializer->getRequest()->getAttribute('session');
+            $attributes['loginProvider'] = $session->get(AbstractOAuthController::SESSION_OAUTH2PROVIDER);
+
+            return $attributes;
+        }),
 ];
diff --git a/js/src/forum/components/ProviderInfo.tsx b/js/src/forum/components/ProviderInfo.tsx
@@ -18,7 +18,6 @@ export default class ProviderInfo extends Component<IProviderInfoAttrs> {
           <p className="LinkedAccountsList-item-title">{provider.name()}</p>
           <p className="helpText">{app.translator.trans('fof-oauth.forum.user.settings.linked-account.orphaned-account')}</p>
           {this.renderDates(provider)}
-          {/* Any other content for the orphaned state can be added here */}
         </div>
       );
     }
@@ -32,11 +31,9 @@ export default class ProviderInfo extends Component<IProviderInfoAttrs> {
       );
     }
 
-    // Assuming not linked state means neither orphaned nor linked
     return (
       <div>
         <p className="LinkedAccountsList-item-title">{app.translator.trans(`fof-oauth.forum.providers.${provider.name()}`)}</p>
-        {/* Any content for the not linked state can be added here */}
       </div>
     );
   }

diff --git a/js/src/forum/extend.ts b/js/src/forum/extend.ts
@@ -0,0 +1,11 @@
+import Extend from 'flarum/common/extenders';
+import User from 'flarum/common/models/User';
+import LinkedAccount from './models/LinkedAccount';
+
+export default [
+  new Extend.Model(User) //
+    .attribute<string>('loginProvider'),
+
+  new Extend.Store() //
+    .add('linked-accounts', LinkedAccount),
+];
diff --git a/...d/addLinkedAccountsToUserSecurityPage.tsx → ...s/addLinkedAccountsToUserSecurityPage.tsx b/...d/addLinkedAccountsToUserSecurityPage.tsx → ...s/addLinkedAccountsToUserSecurityPage.tsx
diff --git a/js/src/forum/extend/extendLoginSignup.js → js/src/forum/extenders/extendLoginSignup.js b/js/src/forum/extend/extendLoginSignup.js → js/src/forum/extenders/extendLoginSignup.js
diff --git a/js/src/forum/index.js b/js/src/forum/index.js
diff --git a/js/src/forum/index.ts b/js/src/forum/index.ts
@@ -0,0 +1,10 @@
+import app from 'flarum/forum/app';
+import addLinkedAccountsToUserSecurityPage from './extenders/addLinkedAccountsToUserSecurityPage';
+import extendLoginSignup from './extenders/extendLoginSignup';
+
+export { default as extend } from './extend';
+
+app.initializers.add('fof/oauth', () => {
+  extendLoginSignup();
+  addLinkedAccountsToUserSecurityPage();
+});