fix: improper SSO format (regression), update openapi schema

NodeBB · Aug 21, 2023 · 4a84680 · 4a84680
1 parent db15e7c
commit 4a84680
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git 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
@@ -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
@@ -42,7 +42,8 @@ editController.get = async function (req, res) {
 
 	payload.sso = [];
 	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) {