mirror of
https://github.com/outline/outline.git
synced 2026-11-22 05:51:43 +03:00
fix: oauthAuthentications endpoint should not consider revoked
fix: Allow revoking from list Combined API keys and Apps screens
This commit is contained in:
9 files changed
+143
-53
No files matched your search
@@ -30,7 +30,7 @@ import usePolicy from "./usePolicy";
|
||||
|
||||
const ApiKeys = lazy(() => import("~/scenes/Settings/ApiKeys"));
|
||||
const Applications = lazy(() => import("~/scenes/Settings/Applications"));
|
||||
const PersonalApiKeys = lazy(() => import("~/scenes/Settings/PersonalApiKeys"));
|
||||
const APIAndApps = lazy(() => import("~/scenes/Settings/APIAndApps"));
|
||||
const Details = lazy(() => import("~/scenes/Settings/Details"));
|
||||
const Export = lazy(() => import("~/scenes/Settings/Export"));
|
||||
const Features = lazy(() => import("~/scenes/Settings/Features"));
|
||||
@@ -88,12 +88,12 @@ const useSettingsConfig = () => {
|
||||
icon: EmailIcon,
|
||||
},
|
||||
{
|
||||
name: t("Authorizations"),
|
||||
path: settingsPath("authorizations"),
|
||||
component: PersonalApiKeys,
|
||||
enabled: can.createApiKey && !can.listApiKeys,
|
||||
name: t("API & Apps"),
|
||||
path: settingsPath("api-and-apps"),
|
||||
component: APIAndApps,
|
||||
enabled: true,
|
||||
group: t("Account"),
|
||||
icon: CodeIcon,
|
||||
icon: PadlockIcon,
|
||||
},
|
||||
// Workspace
|
||||
{
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import { observer } from "mobx-react";
|
||||
import * as React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useMenuState } from "reakit/Menu";
|
||||
import OAuthAuthentication from "~/models/oauth/OAuthAuthentication";
|
||||
import ConfirmationDialog from "~/components/ConfirmationDialog";
|
||||
import ContextMenu from "~/components/ContextMenu";
|
||||
import MenuItem from "~/components/ContextMenu/MenuItem";
|
||||
import OverflowMenuButton from "~/components/ContextMenu/OverflowMenuButton";
|
||||
import useStores from "~/hooks/useStores";
|
||||
|
||||
type Props = {
|
||||
/** The OAuthAuthentication to associate with the menu */
|
||||
oauthAuthentication: OAuthAuthentication;
|
||||
};
|
||||
|
||||
function OAuthAuthenticationMenu({ oauthAuthentication }: Props) {
|
||||
const menu = useMenuState({
|
||||
modal: true,
|
||||
});
|
||||
const { dialogs } = useStores();
|
||||
const { t } = useTranslation();
|
||||
|
||||
const handleRevoke = React.useCallback(() => {
|
||||
dialogs.openModal({
|
||||
title: t("Revoke {{ appName }}", {
|
||||
appName: oauthAuthentication.oauthClient.name,
|
||||
}),
|
||||
content: (
|
||||
<ConfirmationDialog
|
||||
onSubmit={async () => {
|
||||
await oauthAuthentication.deleteAll();
|
||||
dialogs.closeAllModals();
|
||||
}}
|
||||
submitText={t("Revoke")}
|
||||
savingText={`${t("Revoking")}…`}
|
||||
danger
|
||||
>
|
||||
{t("Are you sure you want to revoke access?")}
|
||||
</ConfirmationDialog>
|
||||
),
|
||||
});
|
||||
}, [t, dialogs, oauthAuthentication]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<OverflowMenuButton aria-label={t("Show menu")} {...menu} />
|
||||
<ContextMenu {...menu}>
|
||||
<MenuItem {...menu} onClick={handleRevoke} dangerous>
|
||||
{t("Revoke")}
|
||||
</MenuItem>
|
||||
</ContextMenu>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default observer(OAuthAuthenticationMenu);
|
||||
@@ -1,4 +1,5 @@
|
||||
import { observable } from "mobx";
|
||||
import { action, observable } from "mobx";
|
||||
import { client } from "~/utils/ApiClient";
|
||||
import User from "../User";
|
||||
import ParanoidModel from "../base/ParanoidModel";
|
||||
import Field from "../decorators/Field";
|
||||
@@ -24,6 +25,16 @@ class OAuthAuthentication extends ParanoidModel {
|
||||
oauthClientId: string;
|
||||
|
||||
lastActiveAt: string;
|
||||
|
||||
@action
|
||||
public async deleteAll() {
|
||||
await client.post(`/${this.store.apiEndpoint}.delete`, {
|
||||
oauthClientId: this.oauthClientId,
|
||||
scope: this.scope,
|
||||
});
|
||||
|
||||
return this.store.remove(this.id);
|
||||
}
|
||||
}
|
||||
|
||||
export default OAuthAuthentication;
|
||||
@@ -1,5 +1,5 @@
|
||||
import { observer } from "mobx-react";
|
||||
import { CodeIcon } from "outline-icons";
|
||||
import { PadlockIcon } from "outline-icons";
|
||||
import * as React from "react";
|
||||
import { useTranslation, Trans } from "react-i18next";
|
||||
import ApiKey from "~/models/ApiKey";
|
||||
@@ -11,6 +11,7 @@ import PaginatedList from "~/components/PaginatedList";
|
||||
import Scene from "~/components/Scene";
|
||||
import Text from "~/components/Text";
|
||||
import { createApiKey } from "~/actions/definitions/apiKeys";
|
||||
import env from "~/env";
|
||||
import useActionContext from "~/hooks/useActionContext";
|
||||
import useCurrentTeam from "~/hooks/useCurrentTeam";
|
||||
import useCurrentUser from "~/hooks/useCurrentUser";
|
||||
@@ -19,18 +20,19 @@ import useStores from "~/hooks/useStores";
|
||||
import ApiKeyListItem from "./components/ApiKeyListItem";
|
||||
import OAuthAuthenticationListItem from "./components/OAuthAuthenticationListItem";
|
||||
|
||||
function PersonalApiKeys() {
|
||||
function APIAndApps() {
|
||||
const team = useCurrentTeam();
|
||||
const user = useCurrentUser();
|
||||
const { t } = useTranslation();
|
||||
const { apiKeys, oauthAuthentications } = useStores();
|
||||
const can = usePolicy(team);
|
||||
const context = useActionContext();
|
||||
const appName = env.APP_NAME;
|
||||
|
||||
return (
|
||||
<Scene
|
||||
title={t("API")}
|
||||
icon={<CodeIcon />}
|
||||
title={t("API & Apps")}
|
||||
icon={<PadlockIcon />}
|
||||
actions={
|
||||
<>
|
||||
{can.createApiKey && (
|
||||
@@ -46,28 +48,33 @@ function PersonalApiKeys() {
|
||||
</>
|
||||
}
|
||||
>
|
||||
<Heading>{t("API")}</Heading>
|
||||
<Text as="p" type="secondary">
|
||||
<Trans
|
||||
defaults="Create personal API keys to authenticate with the API and programatically control
|
||||
your workspace's data. API keys have the same permissions as your user account.
|
||||
For more details see the <em>developer documentation</em>."
|
||||
components={{
|
||||
em: (
|
||||
<a
|
||||
href="https://www.getoutline.com/developers"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
/>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
</Text>
|
||||
<Heading>{t("API & Apps")}</Heading>
|
||||
<h2>{t("API keys")}</h2>
|
||||
{can.createApiKey ? (
|
||||
<Text as="p" type="secondary">
|
||||
<Trans
|
||||
defaults="Create personal API keys to authenticate with the API and programatically control
|
||||
your workspace's data. For more details see the <em>developer documentation</em>."
|
||||
components={{
|
||||
em: (
|
||||
<a
|
||||
href="https://www.getoutline.com/developers"
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
/>
|
||||
),
|
||||
}}
|
||||
/>
|
||||
</Text>
|
||||
) : (
|
||||
<Trans>
|
||||
{t("API keys have been disabled by an admin for your account")}
|
||||
</Trans>
|
||||
)}
|
||||
<PaginatedList<ApiKey>
|
||||
fetch={apiKeys.fetchPage}
|
||||
items={apiKeys.personalApiKeys}
|
||||
options={{ userId: user.id }}
|
||||
heading={<h2>{t("Personal keys")}</h2>}
|
||||
renderItem={(apiKey) => (
|
||||
<ApiKeyListItem key={apiKey.id} apiKey={apiKey} />
|
||||
)}
|
||||
@@ -75,7 +82,17 @@ function PersonalApiKeys() {
|
||||
<PaginatedList
|
||||
fetch={oauthAuthentications.fetchPage}
|
||||
items={oauthAuthentications.orderedData}
|
||||
heading={<h2>{t("Authentications")}</h2>}
|
||||
heading={
|
||||
<>
|
||||
<h2>{t("Application access")}</h2>
|
||||
<Text as="p" type="secondary">
|
||||
{t(
|
||||
"Manage which third-party and internal applications have been granted access to your {{ appName }} account.",
|
||||
{ appName }
|
||||
)}
|
||||
</Text>
|
||||
</>
|
||||
}
|
||||
renderItem={(oauthAuthentication: OAuthAuthentication) => (
|
||||
<OAuthAuthenticationListItem
|
||||
key={oauthAuthentication.id}
|
||||
@@ -87,4 +104,4 @@ function PersonalApiKeys() {
|
||||
);
|
||||
}
|
||||
|
||||
export default observer(PersonalApiKeys);
|
||||
export default observer(APIAndApps);
|
||||
@@ -8,6 +8,7 @@ import { AvatarVariant } from "~/components/Avatar/Avatar";
|
||||
import ListItem from "~/components/List/Item";
|
||||
import Text from "~/components/Text";
|
||||
import Time from "~/components/Time";
|
||||
import OAuthAuthenticationMenu from "~/menus/OAuthAuthenticationMenu";
|
||||
|
||||
type Props = {
|
||||
/** The OAuthAuthentication to display */
|
||||
@@ -19,14 +20,18 @@ const OAuthAuthenticationListItem = ({ oauthAuthentication }: Props) => {
|
||||
|
||||
const subtitle = (
|
||||
<>
|
||||
{oauthAuthentication.lastActiveAt && (
|
||||
<Text type="tertiary">
|
||||
{t("Accessed data")}{" "}
|
||||
<Time dateTime={oauthAuthentication.lastActiveAt} addSuffix />{" "}
|
||||
·{" "}
|
||||
</Text>
|
||||
)}
|
||||
<Text type="tertiary">
|
||||
{oauthAuthentication.lastActiveAt ? (
|
||||
<>
|
||||
{t("Last active")}{" "}
|
||||
<Time dateTime={oauthAuthentication.lastActiveAt} addSuffix />
|
||||
</>
|
||||
) : (
|
||||
t("Never used")
|
||||
)}{" "}
|
||||
·{" "}
|
||||
</Text>
|
||||
<Text type="tertiary" ellipsis>
|
||||
{OAuthScopeHelper.normalizeScopes(oauthAuthentication.scope, t).join(
|
||||
", "
|
||||
)}
|
||||
@@ -46,6 +51,9 @@ const OAuthAuthenticationListItem = ({ oauthAuthentication }: Props) => {
|
||||
}
|
||||
title={oauthAuthentication.oauthClient.name}
|
||||
subtitle={subtitle}
|
||||
actions={
|
||||
<OAuthAuthenticationMenu oauthAuthentication={oauthAuthentication} />
|
||||
}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -12,7 +12,6 @@ import {
|
||||
BelongsTo,
|
||||
ForeignKey,
|
||||
Table,
|
||||
BeforeCreate,
|
||||
IsDate,
|
||||
Unique,
|
||||
} from "sequelize-typescript";
|
||||
@@ -115,13 +114,6 @@ class OAuthAuthentication extends ParanoidModel<
|
||||
return this.save({ silent: true });
|
||||
};
|
||||
|
||||
// hooks
|
||||
|
||||
@BeforeCreate
|
||||
static async setLastActiveAt(model: OAuthAuthentication) {
|
||||
model.lastActiveAt = new Date();
|
||||
}
|
||||
|
||||
// instance methods
|
||||
|
||||
/** Checks if the authentication has access to the given path */
|
||||
|
||||
@@ -34,6 +34,7 @@ router.post(
|
||||
FROM oauth_authentications oa
|
||||
INNER JOIN oauth_clients oc ON oc.id = oa."oauthClientId"
|
||||
WHERE oa."userId" = :userId
|
||||
AND oa."deletedAt" IS NULL
|
||||
ORDER BY oa."oauthClientId", oa."scope", oa."lastActiveAt", oa."createdAt" DESC
|
||||
LIMIT :limit OFFSET :offset
|
||||
`,
|
||||
|
||||
@@ -12,7 +12,7 @@ export type OAuthAuthenticationsListReq = z.infer<
|
||||
export const OAuthAuthenticationsDeleteSchema = BaseSchema.extend({
|
||||
body: z.object({
|
||||
oauthClientId: z.string(),
|
||||
scope: z.string().optional(),
|
||||
scope: z.array(z.string()).optional(),
|
||||
}),
|
||||
});
|
||||
|
||||
|
||||
@@ -520,7 +520,7 @@
|
||||
"Unsubscribed from document": "Unsubscribed from document",
|
||||
"Unsubscribed from collection": "Unsubscribed from collection",
|
||||
"Account": "Account",
|
||||
"Authorizations": "Authorizations",
|
||||
"API & Apps": "API & Apps",
|
||||
"Details": "Details",
|
||||
"Security": "Security",
|
||||
"Features": "Features",
|
||||
@@ -561,6 +561,9 @@
|
||||
"New child document": "New child document",
|
||||
"Save in workspace": "Save in workspace",
|
||||
"Notification settings": "Notification settings",
|
||||
"Revoke {{ appName }}": "Revoke {{ appName }}",
|
||||
"Revoking": "Revoking",
|
||||
"Are you sure you want to revoke access?": "Are you sure you want to revoke access?",
|
||||
"Delete app": "Delete app",
|
||||
"Revision options": "Revision options",
|
||||
"Share link revoked": "Share link revoked",
|
||||
@@ -875,6 +878,11 @@
|
||||
"Something went wrong": "Something went wrong",
|
||||
"Please try again or contact support if the problem persists": "Please try again or contact support if the problem persists",
|
||||
"No documents found for your search filters.": "No documents found for your search filters.",
|
||||
"Create personal API keys to authenticate with the API and programatically control\n your workspace's data. For more details see the <em>developer documentation</em>.": "Create personal API keys to authenticate with the API and programatically control\n your workspace's data. For more details see the <em>developer documentation</em>.",
|
||||
"{t(\"API keys have been disabled by an admin for your account\")}": "{t(\"API keys have been disabled by an admin for your account\")}",
|
||||
"API keys have been disabled by an admin for your account": "API keys have been disabled by an admin for your account",
|
||||
"Application access": "Application access",
|
||||
"Manage which third-party and internal applications have been granted access to your {{ appName }} account.": "Manage which third-party and internal applications have been granted access to your {{ appName }} account.",
|
||||
"API": "API",
|
||||
"API keys can be used to authenticate with the API and programatically control\n your workspace's data. For more details see the <em>developer documentation</em>.": "API keys can be used to authenticate with the API and programatically control\n your workspace's data. For more details see the <em>developer documentation</em>.",
|
||||
"Client secret rotated": "Client secret rotated",
|
||||
@@ -900,7 +908,6 @@
|
||||
"Restricted scope": "Restricted scope",
|
||||
"API key copied to clipboard": "API key copied to clipboard",
|
||||
"Copied": "Copied",
|
||||
"Revoking": "Revoking",
|
||||
"Are you sure you want to revoke the {{ tokenName }} token?": "Are you sure you want to revoke the {{ tokenName }} token?",
|
||||
"Disconnect integration": "Disconnect integration",
|
||||
"Connected": "Connected",
|
||||
@@ -964,7 +971,7 @@
|
||||
"Drag and drop the zip file from the Markdown export option in {{appName}}, or click to upload": "Drag and drop the zip file from the Markdown export option in {{appName}}, or click to upload",
|
||||
"Last active": "Last active",
|
||||
"Guest": "Guest",
|
||||
"Accessed data": "Accessed data",
|
||||
"Never used": "Never used",
|
||||
"Are you sure you want to delete the {{ appName }} application? This cannot be undone.": "Are you sure you want to delete the {{ appName }} application? This cannot be undone.",
|
||||
"Shared by": "Shared by",
|
||||
"Date shared": "Date shared",
|
||||
@@ -1050,9 +1057,6 @@
|
||||
"Unsubscription successful. Your notification settings were updated": "Unsubscription successful. Your notification settings were updated",
|
||||
"Manage when and where you receive email notifications.": "Manage when and where you receive email notifications.",
|
||||
"The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.": "The email integration is currently disabled. Please set the associated environment variables and restart the server to enable notifications.",
|
||||
"Create personal API keys to authenticate with the API and programatically control\n your workspace's data. API keys have the same permissions as your user account.\n For more details see the <em>developer documentation</em>.": "Create personal API keys to authenticate with the API and programatically control\n your workspace's data. API keys have the same permissions as your user account.\n For more details see the <em>developer documentation</em>.",
|
||||
"Personal keys": "Personal keys",
|
||||
"Authentications": "Authentications",
|
||||
"Preferences saved": "Preferences saved",
|
||||
"Delete account": "Delete account",
|
||||
"Manage settings that affect your personal experience.": "Manage settings that affect your personal experience.",
|
||||
|
||||
Reference in new issue
Block a user