mirror of
https://github.com/outline/outline.git
synced 2026-11-22 14:01:41 +03:00
wip
This commit is contained in:
16 files changed
+113
-15
No files matched your search
@@ -3,7 +3,7 @@ import * as React from "react";
|
||||
import { Controller, useForm } from "react-hook-form";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { OAuthClientValidation } from "@shared/validations";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import ImageInput from "~/scenes/Settings/components/ImageInput";
|
||||
import Button from "~/components/Button";
|
||||
import Flex from "~/components/Flex";
|
||||
|
||||
@@ -90,8 +90,8 @@ const useSettingsConfig = () => {
|
||||
icon: EmailIcon,
|
||||
},
|
||||
{
|
||||
name: t("API Keys"),
|
||||
path: settingsPath("personal-api-keys"),
|
||||
name: t("Authorizations"),
|
||||
path: settingsPath("authorizations"),
|
||||
component: PersonalApiKeys,
|
||||
enabled: can.createApiKey && !can.listApiKeys,
|
||||
group: t("Account"),
|
||||
|
||||
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
|
||||
import * as React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useMenuState } from "reakit/Menu";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import OAuthClientDeleteDialog from "~/scenes/Settings/components/OAuthClientDeleteDialog";
|
||||
import ContextMenu from "~/components/ContextMenu";
|
||||
import OverflowMenuButton from "~/components/ContextMenu/OverflowMenuButton";
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
import { observable } from "mobx";
|
||||
import User from "../User";
|
||||
import ParanoidModel from "../base/ParanoidModel";
|
||||
import Field from "../decorators/Field";
|
||||
import Relation from "../decorators/Relation";
|
||||
import OAuthClient from "./OAuthClient";
|
||||
|
||||
class OAuthAuthentication extends ParanoidModel {
|
||||
static modelName = "OAuthAuthentication";
|
||||
|
||||
/** A list of scopes that this authentication has access to */
|
||||
@Field
|
||||
@observable
|
||||
scope: string[];
|
||||
|
||||
@Relation(() => User)
|
||||
user: User;
|
||||
|
||||
userId: string;
|
||||
|
||||
@Relation(() => OAuthClient)
|
||||
oauthClient: OAuthClient;
|
||||
|
||||
oauthClientId: string;
|
||||
|
||||
lastActiveAt: string;
|
||||
}
|
||||
|
||||
export default OAuthAuthentication;
|
||||
@@ -3,10 +3,10 @@ import { observable, runInAction } from "mobx";
|
||||
import queryString from "query-string";
|
||||
import env from "~/env";
|
||||
import { client } from "~/utils/ApiClient";
|
||||
import User from "./User";
|
||||
import ParanoidModel from "./base/ParanoidModel";
|
||||
import Field from "./decorators/Field";
|
||||
import Relation from "./decorators/Relation";
|
||||
import User from "../User";
|
||||
import ParanoidModel from "../base/ParanoidModel";
|
||||
import Field from "../decorators/Field";
|
||||
import Relation from "../decorators/Relation";
|
||||
|
||||
class OAuthClient extends ParanoidModel {
|
||||
static modelName = "OAuthClient";
|
||||
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { useParams } from "react-router-dom";
|
||||
import { toast } from "sonner";
|
||||
import { OAuthClientValidation } from "@shared/validations";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import Breadcrumb from "~/components/Breadcrumb";
|
||||
import Button from "~/components/Button";
|
||||
import ConfirmationDialog from "~/components/ConfirmationDialog";
|
||||
|
||||
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
|
||||
import { InternetIcon } from "outline-icons";
|
||||
import * as React from "react";
|
||||
import { useTranslation, Trans } from "react-i18next";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import { Action } from "~/components/Actions";
|
||||
import Button from "~/components/Button";
|
||||
import Heading from "~/components/Heading";
|
||||
|
||||
@@ -3,6 +3,7 @@ import { CodeIcon } from "outline-icons";
|
||||
import * as React from "react";
|
||||
import { useTranslation, Trans } from "react-i18next";
|
||||
import ApiKey from "~/models/ApiKey";
|
||||
import OAuthAuthentication from "~/models/oauth/OAuthAuthentication";
|
||||
import { Action } from "~/components/Actions";
|
||||
import Button from "~/components/Button";
|
||||
import Heading from "~/components/Heading";
|
||||
@@ -16,12 +17,13 @@ import useCurrentUser from "~/hooks/useCurrentUser";
|
||||
import usePolicy from "~/hooks/usePolicy";
|
||||
import useStores from "~/hooks/useStores";
|
||||
import ApiKeyListItem from "./components/ApiKeyListItem";
|
||||
import OAuthAuthenticationListItem from "./components/OAuthAuthenticationListItem";
|
||||
|
||||
function PersonalApiKeys() {
|
||||
const team = useCurrentTeam();
|
||||
const user = useCurrentUser();
|
||||
const { t } = useTranslation();
|
||||
const { apiKeys } = useStores();
|
||||
const { apiKeys, oauthAuthentications } = useStores();
|
||||
const can = usePolicy(team);
|
||||
const context = useActionContext();
|
||||
|
||||
@@ -70,6 +72,17 @@ function PersonalApiKeys() {
|
||||
<ApiKeyListItem key={apiKey.id} apiKey={apiKey} />
|
||||
)}
|
||||
/>
|
||||
<PaginatedList
|
||||
fetch={oauthAuthentications.fetchPage}
|
||||
items={oauthAuthentications.orderedData}
|
||||
heading={<h2>{t("Authentications")}</h2>}
|
||||
renderItem={(oauthAuthentication: OAuthAuthentication) => (
|
||||
<OAuthAuthenticationListItem
|
||||
key={oauthAuthentication.id}
|
||||
oauthAuthentication={oauthAuthentication}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
</Scene>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import { observer } from "mobx-react";
|
||||
import * as React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import OAuthAuthentication from "~/models/oauth/OAuthAuthentication";
|
||||
import ListItem from "~/components/List/Item";
|
||||
import Text from "~/components/Text";
|
||||
import Time from "~/components/Time";
|
||||
|
||||
type Props = {
|
||||
/** The OAuthAuthentication to display */
|
||||
oauthAuthentication: OAuthAuthentication;
|
||||
};
|
||||
|
||||
const OAuthAuthenticationListItem = ({ oauthAuthentication }: Props) => {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const subtitle = (
|
||||
<>
|
||||
{oauthAuthentication.lastActiveAt && (
|
||||
<Text type="tertiary">
|
||||
{t("Last accessed")}{" "}
|
||||
<Time dateTime={oauthAuthentication.lastActiveAt} addSuffix />{" "}
|
||||
·{" "}
|
||||
</Text>
|
||||
)}
|
||||
{oauthAuthentication.scope.join(", ")}
|
||||
</>
|
||||
);
|
||||
|
||||
return (
|
||||
<ListItem
|
||||
key={oauthAuthentication.id}
|
||||
title={oauthAuthentication.oauthClient.name}
|
||||
subtitle={subtitle}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default observer(OAuthAuthenticationListItem);
|
||||
@@ -1,6 +1,6 @@
|
||||
import * as React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import ConfirmationDialog from "~/components/ConfirmationDialog";
|
||||
|
||||
type Props = {
|
||||
|
||||
@@ -2,7 +2,7 @@ import { observer } from "mobx-react";
|
||||
import * as React from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Link } from "react-router-dom";
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import { Avatar, AvatarSize } from "~/components/Avatar";
|
||||
import { AvatarVariant } from "~/components/Avatar/Avatar";
|
||||
import ListItem from "~/components/List/Item";
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
import OAuthAuthentication from "~/models/oauth/OAuthAuthentication";
|
||||
import RootStore from "./RootStore";
|
||||
import Store from "./base/Store";
|
||||
|
||||
export default class OAuthAuthenticationsStore extends Store<OAuthAuthentication> {
|
||||
apiEndpoint = "oauthAuthentications";
|
||||
|
||||
constructor(rootStore: RootStore) {
|
||||
super(rootStore, OAuthAuthentication);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
import OAuthClient from "~/models/OAuthClient";
|
||||
import OAuthClient from "~/models/oauth/OAuthClient";
|
||||
import RootStore from "./RootStore";
|
||||
import Store from "./base/Store";
|
||||
|
||||
export default class OAuthClientsStore extends Store<OAuthClient> {
|
||||
apiEndpoint = "oauthClients";
|
||||
|
||||
constructor(rootStore: RootStore) {
|
||||
super(rootStore, OAuthClient);
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ import ImportsStore from "./ImportsStore";
|
||||
import IntegrationsStore from "./IntegrationsStore";
|
||||
import MembershipsStore from "./MembershipsStore";
|
||||
import NotificationsStore from "./NotificationsStore";
|
||||
import OAuthAuthenticationsStore from "./OAuthAuthenticationsStore";
|
||||
import OAuthClientsStore from "./OAuthClientsStore";
|
||||
import PinsStore from "./PinsStore";
|
||||
import PoliciesStore from "./PoliciesStore";
|
||||
@@ -49,6 +50,7 @@ export default class RootStore {
|
||||
integrations: IntegrationsStore;
|
||||
memberships: MembershipsStore;
|
||||
notifications: NotificationsStore;
|
||||
oauthAuthentications: OAuthAuthenticationsStore;
|
||||
oauthClients: OAuthClientsStore;
|
||||
presence: DocumentPresenceStore;
|
||||
pins: PinsStore;
|
||||
@@ -80,6 +82,7 @@ export default class RootStore {
|
||||
this.registerStore(IntegrationsStore);
|
||||
this.registerStore(MembershipsStore);
|
||||
this.registerStore(NotificationsStore);
|
||||
this.registerStore(OAuthAuthenticationsStore, "oauthAuthentications");
|
||||
this.registerStore(OAuthClientsStore, "oauthClients");
|
||||
this.registerStore(PinsStore);
|
||||
this.registerStore(PoliciesStore);
|
||||
|
||||
@@ -31,6 +31,7 @@ export default function presentOAuthClient(oauthClient: OAuthClient) {
|
||||
*/
|
||||
export function presentPublishedOAuthClient(oauthClient: OAuthClient) {
|
||||
return {
|
||||
id: oauthClient.id,
|
||||
name: oauthClient.name,
|
||||
description: oauthClient.description,
|
||||
developerName: oauthClient.developerName,
|
||||
|
||||
@@ -34,7 +34,7 @@ router.post(
|
||||
FROM oauth_authentications oa
|
||||
INNER JOIN oauth_clients oc ON oc.id = oa."oauthClientId"
|
||||
WHERE oa."userId" = :userId
|
||||
ORDER BY oa."oauthClientId", oa."scope", oa."createdAt" DESC
|
||||
ORDER BY oa."oauthClientId", oa."scope", oa."lastActiveAt", oa."createdAt" DESC
|
||||
LIMIT :limit OFFSET :offset
|
||||
`,
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user