Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API page of Settings menu #1168

Merged
merged 29 commits into from
Mar 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
71923a8
init new menu
Jan 26, 2021
4f4ddcd
fix settings menu
Jan 27, 2021
6845789
fix personal settings
Jan 27, 2021
e15b145
Merge branch 'develop' into feature/settings
Jan 27, 2021
d02c247
init api page
Feb 2, 2021
3f9a863
change the endpoint widget
Feb 4, 2021
3adb5ea
extend link with url param
Feb 4, 2021
98724dd
Change tooltip texts on drawer
herflis Feb 8, 2021
69dcf35
fix findings
Feb 10, 2021
0663727
Merge remote-tracking branch 'origin' into feature/settings
Feb 10, 2021
9c3ca8d
fix drawer height
Feb 10, 2021
512d110
remove extra string resource
Feb 10, 2021
78d50c5
fix scroll
Feb 10, 2021
2ee8a3f
Merge branch 'feature/settings' into feature/settings_api
Feb 10, 2021
4a9aa06
add is url to repo
Feb 11, 2021
2f44d2a
fix link
Feb 11, 2021
91d85b3
merge with develop
Mar 10, 2021
945e0b4
fix things
Mar 10, 2021
e34efec
Merge branch 'develop' into feature/settings_api
Mar 12, 2021
00439a1
Update apps/sensenet/src/components/settings/api-keys.tsx
Mar 12, 2021
97ec1ae
fix findings
Mar 12, 2021
d6f3dff
Update apps/sensenet/src/components/settings/api-keys-endpoint-widget…
Mar 17, 2021
c5f3759
Update apps/sensenet/src/components/settings/api-keys-endpoint-widget…
Mar 17, 2021
524817b
fix findings
Mar 17, 2021
9d166a2
Merge branch 'develop' into feature/settings_api
Mar 17, 2021
09517b8
fix findings
Mar 17, 2021
755ca90
merge with develop
Mar 17, 2021
63e3bb8
change png to svg
Mar 17, 2021
6c37bb3
Update apps/sensenet/src/components/settings/api-keys-endpoint-widget…
Mar 17, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/sensenet/src/application-paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const PATHS = {
settings: { appPath: '/settings/:submenu?' },
} as const

type SettingsItemType = 'stats' | 'apiKeys' | 'webhooks' | 'adminui'
type SettingsItemType = 'stats' | 'apikeys' | 'webhooks' | 'adminui'

type RoutesWithContentBrowser = keyof Pick<typeof PATHS, 'content' | 'usersAndGroups' | 'contentTypes' | 'trash'>

Expand Down
1 change: 1 addition & 0 deletions apps/sensenet/src/assets/js.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/sensenet/src/assets/net.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/sensenet/src/assets/react.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/sensenet/src/assets/redux.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions apps/sensenet/src/components/settings/api-key.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
export interface Secret {
id: string
value: string
creationDate: string
validTill: string
}

export enum ApiKeyType {
ExternalClient = 'ExternalClient',
ExternalSpa = 'ExternalSpa',
}

export interface ApiKey {
name: string
repository: string
clientId: string
userName: string
authority: string
type: ApiKeyType
secrets: Secret[]
}
144 changes: 144 additions & 0 deletions apps/sensenet/src/components/settings/api-keys-endpoint-widget.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
import { useRepository } from '@sensenet/hooks-react'
import {
createStyles,
Divider,
Grid,
Hidden,
Link,
makeStyles,
Paper,
TextField,
Theme,
Tooltip,
} from '@material-ui/core'
import React from 'react'
import jslogo from '../../assets/js.svg'
import dotnetlogo from '../../assets/net.svg'
import reactlogo from '../../assets/react.svg'
import reduxlogo from '../../assets/redux.svg'
import { useWidgetStyles } from '../../globalStyles'
import { useLocalization } from '../../hooks'

const useStyles = makeStyles((theme: Theme) => {
return createStyles({
rowContainer: {
display: 'flex',
justifyContent: 'space-between',
padding: '10px 0 16px 0',
fontSize: '16px',
},
clientLink: {
color: theme.palette.primary.main,
},
input: {
paddingTop: '10px',
paddingBottom: '10px',
backgroundColor: theme.palette.common.white,
color: theme.palette.common.black,
},
paragraph: {
padding: '16px 0',
},
logo: {
margin: '30px 16px 16px',
cursor: 'pointer',
},
apiDocsLink: {
display: 'inline-block',
'&:hover': {
textDecoration: 'none',
},
},
})
})

export const ApiEndpointWidget: React.FunctionComponent = () => {
const classes = useStyles()
const widgetClasses = useWidgetStyles()
const localization = useLocalization().settings
const repository = useRepository()

return (
<div className={widgetClasses.root}>
<Paper elevation={0} className={widgetClasses.container} style={{ padding: 0 }}>
<Grid container spacing={1} style={{ padding: '10px' }}>
<Grid item xs={12} lg={6} style={{ padding: '1.5rem' }}>
<div className={classes.rowContainer}>{localization.apiEndpoint}</div>
<div>{localization.apiEndPointApi}</div>
<TextField
name="endpoint"
variant="outlined"
fullWidth
value={repository.configuration.repositoryUrl}
inputProps={{
readOnly: true,
className: classes.input,
}}
className={classes.paragraph}
/>
<div>{localization.apiEndPointIs}</div>
<TextField
name="endpoint"
variant="outlined"
fullWidth
value={repository.configuration.identityServerUrl}
inputProps={{
readOnly: true,
className: classes.input,
}}
className={classes.paragraph}
/>
</Grid>

<Hidden mdDown>
<Divider orientation="vertical" flexItem />
</Hidden>

<Grid item style={{ padding: '1.5rem' }}>
<div className={classes.rowContainer}>
<span>{localization.apiClients}</span>
</div>
<div style={{ margin: '0 0 16px 0' }}>{localization.learnAboutApi}</div>
<Link target="_blank" className={classes.clientLink} href={localization.clientLink}>
{localization.clientLink}
</Link>
<div>
<Tooltip title="javascript" placement="bottom">
<Link
className={classes.apiDocsLink}
target="_blank"
href="https://docs.sensenet.com/api-docs/basic-concepts?chosenLanguage=js-snclient">
<img className={classes.logo} src={jslogo} alt="js-logo" width="35" height="35" />
</Link>
</Tooltip>
<Tooltip title=".net" placement="bottom">
<Link
className={classes.apiDocsLink}
target="_blank"
href="https://docs.sensenet.com/api-docs/basic-concepts?chosenLanguage=dotnet">
<img className={classes.logo} src={dotnetlogo} alt="dotnet-logo" width="35" height="35" />
</Link>
</Tooltip>
<Tooltip title="react" placement="bottom">
<Link
className={classes.apiDocsLink}
target="_blank"
href="https://docs.sensenet.com/api-docs/basic-concepts?chosenLanguage=reactjs">
<img className={classes.logo} src={reactlogo} alt="react-logo" width="35" height="35" />
</Link>
</Tooltip>
<Tooltip title="redux" placement="bottom">
<Link
className={classes.apiDocsLink}
target="_blank"
href="https://docs.sensenet.com/api-docs/basic-concepts?chosenLanguage=react-redux">
<img className={classes.logo} src={reduxlogo} alt="reduc-logo" width="35" height="35" />
</Link>
</Tooltip>
</div>
</Grid>
</Grid>
</Paper>
</div>
)
}
176 changes: 176 additions & 0 deletions apps/sensenet/src/components/settings/api-keys-secrets.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
import { useRepository } from '@sensenet/hooks-react'
import {
CircularProgress,
createStyles,
IconButton,
InputLabel,
makeStyles,
Paper,
TextField,
Theme,
} from '@material-ui/core'
import { Refresh } from '@material-ui/icons'
import React, { useEffect, useState } from 'react'
import { useGlobalStyles } from '../../globalStyles'
import { useLocalization } from '../../hooks'
import { ApiKey, ApiKeyType, Secret } from './api-key'
import { Tab } from './api-keys-tab'
import { TabPanel } from './api-keys-tab-panel'
import { Tabs } from './api-keys-tabs'

const useStyles = makeStyles((theme: Theme) => {
return createStyles({
description: {
marginBottom: '2rem',
'& a': {
color: theme.palette.primary.main,
textDecoration: 'underline',
},
},
inputLabel: {
display: 'flex',
alignItems: 'flex-end',
marginBottom: '0.5rem',
},
input: {
paddingTop: '10px',
paddingBottom: '10px',
backgroundColor: theme.palette.common.white,
color: theme.palette.common.black,
},
refreshIcon: { marginLeft: '0.5rem', padding: 0 },
})
})

export const ApiSecretsWidget: React.FunctionComponent = () => {
const classes = useStyles()
const globalClasses = useGlobalStyles()
const repo = useRepository()
const localization = useLocalization().settings
const [activeTabIndex, setActiveTabIndex] = useState(0)
const [isRegenerating, setIsRegenerating] = useState(false)
const [externalClients, setExternalClients] = useState<ApiKey[]>([])
const [externalSpas, setExternalSpas] = useState<ApiKey[]>([])

const regenerateApiKey = async (client: ApiKey) => {
setIsRegenerating(true)
const response = await repo.executeAction<any, Secret>({
idOrPath: '/Root',
name: 'RegenerateSecretForRepository',
method: 'POST',
body: {
clientId: client.clientId,
secretId: client.secrets[0]?.id,
},
})

setExternalSpas(
externalClients.map((externalClient) => {
if (externalClient.secrets[0].id === response.id) {
externalClient.secrets[0] = response
}
return client
}),
)
setIsRegenerating(false)
}

useEffect(() => {
;(async () => {
const response = await repo.executeAction<any, { clients: ApiKey[] }>({
idOrPath: '/Root',
name: 'GetClientsForRepository',
method: 'GET',
})

setExternalClients(response.clients.filter((client) => client.type === ApiKeyType.ExternalClient))
setExternalSpas(response.clients.filter((client) => client.type === ApiKeyType.ExternalSpa))
})()
}, [repo])

function a11yPropsForTab(index: number) {
return {
id: `api-key-tab-${index}`,
'aria-controls': `api-key-tabpanel-${index}`,
}
}

return (
<>
<Tabs value={activeTabIndex} aria-label={localization.apiKeys} onChange={(_, value) => setActiveTabIndex(value)}>
<Tab label={localization.yourAppId} {...a11yPropsForTab(0)} />
<Tab label={localization.personalAccessToken} {...a11yPropsForTab(1)} />
</Tabs>

<TabPanel value={activeTabIndex} index={0}>
<p className={classes.description} dangerouslySetInnerHTML={{ __html: localization.spaDescription }} />
{externalSpas.map((spa) => (
<Paper key={spa.clientId} className={globalClasses.cardRoot}>
<InputLabel shrink htmlFor={spa.clientId} className={classes.inputLabel}>
{localization.clientId}
</InputLabel>
<TextField
name={spa.clientId}
variant="outlined"
fullWidth
value={spa.clientId}
inputProps={{
readOnly: true,
className: classes.input,
}}
/>
</Paper>
))}
</TabPanel>

<TabPanel value={activeTabIndex} index={1}>
<p className={classes.description} dangerouslySetInnerHTML={{ __html: localization.clientDescription }} />
{externalClients.map((client) => (
<Paper key={client.clientId} className={globalClasses.cardRoot}>
<div style={{ marginBottom: '1rem' }}>
<InputLabel shrink htmlFor={client.clientId} className={classes.inputLabel}>
{localization.clientId}
</InputLabel>
<TextField
name={client.clientId}
variant="outlined"
fullWidth
value={client.clientId}
inputProps={{
readOnly: true,
className: classes.input,
}}
/>
</div>

<div>
<InputLabel shrink htmlFor="repository" className={classes.inputLabel}>
{localization.clientSecret}
<IconButton
disabled={isRegenerating}
onClick={() => regenerateApiKey(client)}
className={classes.refreshIcon}>
<Refresh aria-label={localization.regenerate} />
</IconButton>
</InputLabel>
{isRegenerating ? (
<CircularProgress color="primary" size={32} />
) : (
<TextField
name="repository"
variant="outlined"
fullWidth
value={client.secrets[0].value}
inputProps={{
readOnly: true,
className: classes.input,
}}
/>
)}
</div>
</Paper>
))}
</TabPanel>
</>
)
}
26 changes: 26 additions & 0 deletions apps/sensenet/src/components/settings/api-keys-tab-panel.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { Box, Typography } from '@material-ui/core'
import React from 'react'

interface TabPanelProps {
value: number
index: number
}

export const TabPanel: React.FC<TabPanelProps> = (props) => {
const { children, value, index, ...other } = props

return (
<div
role="tabpanel"
hidden={value !== index}
id={`api-keys-tabpanel-${index}`}
aria-labelledby={`api-keys-tab-${index}`}
{...other}>
{value === index && (
<Box>
<Typography component="div">{children}</Typography>
</Box>
)}
</div>
)
}
Loading