Merge pull request #4714 from coralproject/develop

tessalt · web-flow · commit d399c8ee971c · 2024-12-13T08:53:22.000-05:00
v9.6.1
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/client/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx b/client/src/core/client/stream/tabs/Comments/Stream/AllCommentsTab/AllCommentsTabContainer.tsx
@@ -200,7 +200,7 @@ export const AllCommentsTabContainer: FunctionComponent<Props> = ({
     if (visible && isNotFirstLoad && live) {
       setShowCommentRefreshButton(true);
     }
-  }, [visible, setShowCommentRefreshButton, live, isNotFirstLoad]);
+  }, [visible, setShowCommentRefreshButton, live]);
 
   useEffect(() => {
     if (!topOfCommentsInView && allCommentsInView) {
diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
diff --git a/server/src/core/server/app/middleware/passport/strategies/verifiers/sso.ts b/server/src/core/server/app/middleware/passport/strategies/verifiers/sso.ts
@@ -201,6 +201,7 @@ export async function findOrCreateSSOUser(
           // not affected by this update feature.
           role: role || user.role,
           avatar,
+          ssoURL: url,
         },
         lastIssuedAt
       );
diff --git a/server/src/core/server/models/user/user.ts b/server/src/core/server/models/user/user.ts
@@ -1317,6 +1317,7 @@ export interface UpdateUserInput {
   badges?: string[];
   role?: GQLUSER_ROLE;
   avatar?: string;
+  ssoURL?: string;
 }
 
 export async function updateUserFromSSO(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@coralproject/talk",`
`3`		`- "version": "9.6.0",`
	`3`	`+ "version": "9.6.1",`
`4`	`4`	`"author": "The Coral Project",`
`5`	`5`	`"homepage": "https://coralproject.net/",`
`6`	`6`	`"sideEffects": [`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ export const AllCommentsTabContainer: FunctionComponent<Props> = ({`
`200`	`200`	`if (visible && isNotFirstLoad && live) {`
`201`	`201`	`setShowCommentRefreshButton(true);`
`202`	`202`	`}`
`203`		`- }, [visible, setShowCommentRefreshButton, live, isNotFirstLoad]);`
	`203`	`+ }, [visible, setShowCommentRefreshButton, live]);`
`204`	`204`
`205`	`205`	`useEffect(() => {`
`206`	`206`	`if (!topOfCommentsInView && allCommentsInView) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "common",`
`3`		`- "version": "9.6.0",`
	`3`	`+ "version": "9.6.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1317,6 +1317,7 @@ export interface UpdateUserInput {`
`1317`	`1317`	`badges?: string[];`
`1318`	`1318`	`role?: GQLUSER_ROLE;`
`1319`	`1319`	`avatar?: string;`
	`1320`	`+ ssoURL?: string;`
`1320`	`1321`	`}`
`1321`	`1322`
`1322`	`1323`	`export async function updateUserFromSSO(`