Merge branch 'main' into PORTALS-3269

apps/SageAccountWeb/src/components/ChangePasswordPage.tsx

@@ -3,16 +3,10 @@ import { LeftRightPanel } from './LeftRightPanel'
 import { SourceAppLogo } from './SourceApp'
 import { SetPasswordInstructions } from './ResetPassword'
 import { ChangePassword } from 'synapse-react-client'
-import { useLocation } from 'react-router-dom'
 
 export const ChangePasswordPage = () => {
-  const { search } = useLocation()
-  const urlSearchParams = new URLSearchParams(search)
-  const errorCode = urlSearchParams.get('errorCode') ?? ''
-  const instructions =
-    errorCode == 'PASSWORD_RESET_VIA_EMAIL_REQUIRED'
-      ? 'Your current password does not meet Synapse security requirements'
-      : 'Set a new password'
+  // previously, if the errorCode was PASSWORD_RESET_VIA_EMAIL_REQUIRED then this page would tell the user that their current password does not meet Synapse security requirements.  But this is not necessarily true.
+  const instructions = 'Set a new password'
   return (
     <>
       <LeftRightPanel

apps/portals-e2e/src/configs/exploreConfig.ts

@@ -52,7 +52,7 @@ const exploreConfig: ExploreConfig = {
       'Projects',
       'Studies',
       'Publications',
-      'Computational Tools',
+      // 'Computational Tools', // empty - known data curation issue
     ],
     people_charts: ['People'],
   },

apps/synapse-oauth-signin/package.json

@@ -22,6 +22,7 @@
     "react-dom": "^18.2.0",
     "react-router-dom": "^5.3.4",
     "sass": "^1.71.1",
+    "universal-cookie": "^4.0.4",
     "synapse-react-client": "workspace:*"
   },
   "devDependencies": {

apps/synapse-oauth-signin/src/AppInitializer.tsx

@@ -6,18 +6,23 @@ import {
   SynapseConstants,
 } from 'synapse-react-client'
 import { handleErrorRedirect } from './URLUtils'
+import UniversalCookies from 'universal-cookie'
 
+const cookies = new UniversalCookies()
 function AppInitializer(
   props: React.PropsWithChildren<Record<string, unknown>>,
 ) {
+  const accountSitePrompted =
+    cookies.get(SynapseConstants.ACCOUNT_SITE_PROMPTED_FOR_LOGIN_COOKIE_KEY) ==
+    'true' // short-lived cookie
   const urlSearchParams = new URLSearchParams(window.location.search)
-  const prompt = urlSearchParams.get('prompt')
+  const prompt = accountSitePrompted ? 'none' : urlSearchParams.get('prompt')
 
   let maxAge = undefined
   // check max age when re-establishing the session, not to auto-consent.
   const maxAgeURLParam = urlSearchParams.get('max_age')
   // SWC-5597: if max_age is defined, then return if the user last authenticated more than max_age seconds ago
-  if (maxAgeURLParam && parseInt(maxAgeURLParam)) {
+  if (!accountSitePrompted && maxAgeURLParam && parseInt(maxAgeURLParam)) {
     maxAge = parseInt(maxAgeURLParam)
   }
 

apps/synapse-portal-framework/src/components/RedirectDialog.tsx

@@ -43,7 +43,11 @@ export const synapseRedirectInstructions = (
 
 const isSynapseURL = (url: string) => {
   if (!url) return false
-  return new URL(url).hostname.toLowerCase() === 'www.synapse.org'
+  const parsedURL = new URL(url)
+  return (
+    parsedURL.hostname.toLowerCase() === 'www.synapse.org' &&
+    parsedURL.pathname.startsWith('/Synapse')
+  )
 }
 
 const getInitialCountdownSeconds = (redirectURL: string) => {
@@ -106,7 +110,7 @@ const RedirectDialog = (props: RedirectDialogProps) => {
           className="RedirectDialog"
           PaperProps={{ sx: { padding: 0 } }}
         >
-          <DialogContent>
+          <DialogContent sx={{ p: 0, ml: 0, mr: 0 }}>
             <div className="redirect-dialog-body">
               <Typography
                 variant="headline1"

packages/synapse-react-client/src/components/Authentication/Login.test.tsx

@@ -255,7 +255,7 @@ describe('StandaloneLoginForm', () => {
     )
     expect(callback).not.toHaveBeenCalled()
     expect(window.location.assign).toHaveBeenCalledWith(
-      'http://localhost:3000/changePassword?errorCode=PASSWORD_RESET_VIA_EMAIL_REQUIRED',
+      'http://localhost:3000/changePassword',
     )
   })
 })

packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.test.ts

@@ -126,6 +126,7 @@ describe('TableColumnSchemaEditorUtils', () => {
       ColumnTypeEnum.BOOLEAN_LIST,
       ColumnTypeEnum.DATE_LIST,
       ColumnTypeEnum.INTEGER_LIST,
+      ColumnTypeEnum.ENTITYID_LIST,
     ]
 
     Object.values(ColumnTypeEnum).forEach((key: ColumnType) => {

packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.ts

@@ -145,6 +145,7 @@ export function canHaveMaxListLength(
     case ColumnTypeEnum.BOOLEAN_LIST:
     case ColumnTypeEnum.DATE_LIST:
     case ColumnTypeEnum.INTEGER_LIST:
+    case ColumnTypeEnum.ENTITYID_LIST:
       return true
     default:
       // all others are false

packages/synapse-react-client/src/utils/AppUtils/AppUtils.ts

@@ -1,5 +1,8 @@
 import { useHistory } from 'react-router-dom'
-import { LAST_PLACE_LOCALSTORAGE_KEY } from '../SynapseConstants'
+import {
+  ACCOUNT_SITE_PROMPTED_FOR_LOGIN_COOKIE_KEY,
+  LAST_PLACE_LOCALSTORAGE_KEY,
+} from '../SynapseConstants'
 import { useEffect, useState } from 'react'
 import UniversalCookies from 'universal-cookie'
 
@@ -33,6 +36,16 @@ export function storeRedirectURLForOneSageLoginAndGotoURL(href: string) {
 }
 
 export function processRedirectURLInOneSage() {
+  // PORTALS-3299 : Indicate that we have completed the login workflow (cookie expires in a minute) to break out of a cycle
+  const expireDate = new Date()
+  expireDate.setMinutes(expireDate.getMinutes() + 1)
+  const hostname = window.location.hostname.toLowerCase()
+  cookies.set(ACCOUNT_SITE_PROMPTED_FOR_LOGIN_COOKIE_KEY, 'true', {
+    path: '/',
+    expires: expireDate,
+    domain: hostname.endsWith('.synapse.org') ? 'synapse.org' : undefined,
+  })
+
   if (cookies.get(ONE_SAGE_REDIRECT_COOKIE_KEY)) {
     const href = cookies.get(ONE_SAGE_REDIRECT_COOKIE_KEY)
     cookies.remove(ONE_SAGE_REDIRECT_COOKIE_KEY)

packages/synapse-react-client/src/utils/SynapseConstants.ts

@@ -186,6 +186,9 @@ export const ACCESS_TOKEN_COOKIE_KEY =
   'org.sagebionetworks.security.user.login.token'
 export const LAST_PLACE_LOCALSTORAGE_KEY = 'last_place_url'
 
+export const ACCOUNT_SITE_PROMPTED_FOR_LOGIN_COOKIE_KEY =
+  'org.sagebionetworks.account.promptedforlogin'
+
 /* Persistent localStorage keys on SWC logout */
 export const PERSISTENT_LOCAL_STORAGE_KEYS = [
   ...ORIENTATION_BANNER_KEYS,

packages/synapse-react-client/src/utils/hooks/useLogin.ts

@@ -71,15 +71,8 @@ export default function useLogin(opts: UseLoginOptions): UseLoginReturn {
   const [twoFaErrorResponse, setTwoFaErrorResponse] = useState<
     TwoFactorAuthErrorResponse | undefined
   >()
-  const changePasswordSearchParams = new URLSearchParams()
-  changePasswordSearchParams.set(
-    'errorCode',
-    ErrorResponseCode.PASSWORD_RESET_VIA_EMAIL_REQUIRED,
-  )
-  const changePasswordUrl = useOneSageURL(
-    '/changePassword',
-    changePasswordSearchParams,
-  )
+
+  const changePasswordUrl = useOneSageURL('/changePassword')
   /**
    * Update state variable if optional prop changes
    */