Feature: Expose org affiliations when login not required (#5822)

* remove unused isLoginRequired prop * return org affiliations when login not required * display org affiliations when login not required
canada-ca · Oct 17, 2024 · 5d889a6 · 5d889a6
1 parent a03f03b
commit 5d889a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/api/src/organization/objects/organization.js b/api/src/organization/objects/organization.js
@@ -308,10 +308,10 @@ export const organizationType = new GraphQLObjectType({
       resolve: async (
         { _id },
         args,
-        { i18n, auth: { checkPermission }, loaders: { loadAffiliationConnectionsByOrgId } },
+        { i18n, auth: { checkPermission, loginRequiredBool }, loaders: { loadAffiliationConnectionsByOrgId } },
       ) => {
         const permission = await checkPermission({ orgId: _id })
-        if (['user', 'admin', 'owner', 'super_admin'].includes(permission) === false) {
+        if (['user', 'admin', 'owner', 'super_admin'].includes(permission) === false && loginRequiredBool) {
           throw new Error(i18n._(t`Cannot query affiliations on organization without admin permission or higher.`))
         }
 

diff --git a/frontend/src/admin/AdminPage.js b/frontend/src/admin/AdminPage.js
@@ -20,7 +20,7 @@ import { ErrorBoundary } from 'react-error-boundary'
 import withSuperAdmin from '../app/withSuperAdmin'
 // import { TourComponent } from '../userOnboarding/components/TourComponent'
 
-export default function AdminPage({ isLoginRequired }) {
+export default function AdminPage() {
   const [selectedOrg, setSelectedOrg] = useState('none')
   const [orgDetails, setOrgDetails] = useState({})
   const [searchTerm, setSearchTerm] = useState('')
@@ -147,7 +147,6 @@ export default function AdminPage({ isLoginRequired }) {
             mb="1rem"
             removeOrgCallback={setSelectedOrg}
             key={orgDetails.slug} // set key, this resets state when switching orgs (closes editing box)
-            isLoginRequired={isLoginRequired}
           />
           <AdminPanel
             activeMenu={activeMenu}

diff --git a/frontend/src/admin/OrganizationInformation.js b/frontend/src/admin/OrganizationInformation.js
@@ -461,6 +461,5 @@ const AcronymFields = withSuperAdmin(() => {
 OrganizationInformation.propTypes = {
   orgSlug: string.isRequired,
   removeOrgCallback: func.isRequired,
-  isLoginRequired: bool,
   isUserSuperAdmin: bool,
 }
diff --git a/frontend/src/app/App.js b/frontend/src/app/App.js
@@ -249,14 +249,14 @@ export function App({ initialLoading, isLoginRequired }) {
               >
                 {() => (
                   <ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
-                    <OrganizationDetails />
+                    <OrganizationDetails loginRequired={isLoginRequired} />
                   </ErrorBoundary>
                 )}
               </PrivatePage>
 
               <Page path="/admin/:activeMenu?" title={t`Admin`}>
                 {isLoggedIn() && isEmailValidated() && currentTFAMethod() !== 'NONE' ? (
-                  <AdminPage isLoginRequired={isLoginRequired} />
+                  <AdminPage />
                 ) : (
                   <Redirect
                     to={{

diff --git a/frontend/src/organizationDetails/OrganizationDetails.js b/frontend/src/organizationDetails/OrganizationDetails.js
@@ -33,8 +33,9 @@ import { RequestOrgInviteModal } from '../organizations/RequestOrgInviteModal'
 import { useUserVar } from '../utilities/userState'
 import { HistoricalSummariesGraph } from '../summaries/HistoricalSummariesGraph'
 import { ABTestVariant, ABTestWrapper } from '../app/ABTestWrapper'
+import { bool } from 'prop-types'
 
-export default function OrganizationDetails() {
+export default function OrganizationDetails({ loginRequired }) {
   const { isLoggedIn } = useUserVar()
   const { orgSlug, activeTab } = useParams()
   const history = useHistory()
@@ -137,7 +138,7 @@ export default function OrganizationDetails() {
           <Tab borderTopWidth="4px">
             <Trans>Domains</Trans>
           </Tab>
-          {data?.organization?.userHasPermission && (
+          {(data?.organization?.userHasPermission || !loginRequired) && (
             <Tab borderTopWidth="4px">
               <Trans>Users</Trans>
             </Tab>
@@ -185,7 +186,7 @@ export default function OrganizationDetails() {
               />
             </ErrorBoundary>
           </TabPanel>
-          {data?.organization?.userHasPermission && (
+          {(data?.organization?.userHasPermission || !loginRequired) && (
             <TabPanel>
               <ErrorBoundary FallbackComponent={ErrorFallbackMessage}>
                 <OrganizationAffiliations orgSlug={orgSlug} />
@@ -197,3 +198,7 @@ export default function OrganizationDetails() {
     </Box>
   )
 }
+
+OrganizationDetails.propTypes = {
+  loginRequired: bool,
+}