From df65c60081e515f23c5e8e470559b3e2d6198b57 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 21 Aug 2023 15:38:41 -0400
Subject: [PATCH] fix: improper SSO format (regression), update openapi schema

---
 public/openapi/components/schemas/UserObject.yaml | 15 ---------------
 public/openapi/read/user/userslug/edit.yaml       | 15 +++++++++++++++
 src/controllers/accounts/edit.js                  |  3 ++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/public/openapi/components/schemas/UserObject.yaml b/public/openapi/components/schemas/UserObject.yaml
index d10acf63bc..c2b3177637 100644
--- a/public/openapi/components/schemas/UserObject.yaml
+++ b/public/openapi/components/schemas/UserObject.yaml
@@ -512,21 +512,6 @@ UserObjectFull:
           - name
           - visibility
           - public
-    sso:
-      type: array
-      items:
-        type: object
-        properties:
-          associated:
-            type: boolean
-          url:
-            type: string
-          name:
-            type: string
-          icon:
-            type: string
-          deauthUrl:
-            type: string
     websiteLink:
       type: string
     websiteName:
diff --git a/public/openapi/read/user/userslug/edit.yaml b/public/openapi/read/user/userslug/edit.yaml
index 734ea32abf..8ba486b5e8 100644
--- a/public/openapi/read/user/userslug/edit.yaml
+++ b/public/openapi/read/user/userslug/edit.yaml
@@ -47,6 +47,21 @@ get:
                     type: number
                   defaultAvatar:
                     type: string
+                  sso:
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        associated:
+                          type: boolean
+                        url:
+                          type: string
+                        name:
+                          type: string
+                        icon:
+                          type: string
+                        deauthUrl:
+                          type: string
                   groupSelectSize:
                     type: number
                   title:
diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index 9b6526ad80..8560f043e8 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -41,7 +41,8 @@ editController.get = async function (req, res) {
 	payload.groups = _groups.filter(g => g && g.userTitleEnabled && !groups.isPrivilegeGroup(g.name) && g.name !== 'registered-users');
 
 	if (req.uid === res.locals.uid || canManageUsers) {
-		payload.sso = await plugins.hooks.fire('filter:auth.list', { uid: res.locals.uid, associations: [] });
+		const { associations } = await plugins.hooks.fire('filter:auth.list', { uid: res.locals.uid, associations: [] });
+		payload.sso = associations;
 	}
 
 	if (!allowMultipleBadges) {