diff --git a/apps/client/public/locales/en-US/translation.json b/apps/client/public/locales/en-US/translation.json index 298340db4..86a97d352 100644 --- a/apps/client/public/locales/en-US/translation.json +++ b/apps/client/public/locales/en-US/translation.json @@ -1322,11 +1322,10 @@ "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.": "Are you sure you want to revoke access for {{name}}? The application will no longer be able to access your account.", "Something went wrong. Please try again.": "Something went wrong. Please try again.", "Remove {{name}}": "Remove {{name}}", - "I trust this application and want to continue": "I trust this application and want to continue", + "Make sure you trust this application before authorizing it.": "Make sure you trust this application before authorizing it.", "You will be redirected to": "You will be redirected to", "View content without making changes.": "View content without making changes.", "Create and modify content.": "Create and modify content.", - "Make sure you trust this application before authorizing it.": "Make sure you trust this application before authorizing it.", "Applications and AI assistants you have authorized to access your account.": "Applications and AI assistants you have authorized to access your account.", "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.": "Your workspace has MCP enabled. Connect AI assistants with your Docmost account via OAuth.", "Authorized apps": "Authorized apps", diff --git a/apps/client/src/ee/oauth/pages/oauth-consent.tsx b/apps/client/src/ee/oauth/pages/oauth-consent.tsx index c951785c7..a19b60829 100644 --- a/apps/client/src/ee/oauth/pages/oauth-consent.tsx +++ b/apps/client/src/ee/oauth/pages/oauth-consent.tsx @@ -20,7 +20,6 @@ import { notifications } from "@mantine/notifications"; import { IconAlertTriangle, IconEye, - IconInfoCircle, IconPencil, } from "@tabler/icons-react"; import { useQuery } from "@tanstack/react-query"; @@ -174,7 +173,6 @@ function ConsentCard({ info, currentUser, params }: ConsentCardProps) { info.scopes.filter((scope) => scope === "read" || scope === "write"), ); const [submitting, setSubmitting] = useState<"approve" | "deny" | null>(null); - const [acknowledged, setAcknowledged] = useState(false); const scopeRows = [ { @@ -306,24 +304,10 @@ function ConsentCard({ info, currentUser, params }: ConsentCardProps) { } + py="xs" + icon={} > - - - {t( - "Make sure you trust this application before authorizing it.", - )} - - - setAcknowledged(event.currentTarget.checked) - } - label={t("I trust this application and want to continue")} - /> - + {t("Make sure you trust this application before authorizing it.")} )} @@ -339,11 +323,7 @@ function ConsentCard({ info, currentUser, params }: ConsentCardProps) { diff --git a/apps/server/src/common/guards/jwt-auth.guard.ts b/apps/server/src/common/guards/jwt-auth.guard.ts index 36ec852d0..92a51402e 100644 --- a/apps/server/src/common/guards/jwt-auth.guard.ts +++ b/apps/server/src/common/guards/jwt-auth.guard.ts @@ -51,7 +51,7 @@ export class JwtAuthGuard extends AuthGuard('jwt') { [ctx.getHandler(), ctx.getClass()], ); if (requiresSession && user.authType !== JwtType.ACCESS) { - this.logger.warn( + this.logger.debug( `session-only endpoint ${ctx.getClass()?.name}.${ctx.getHandler()?.name} refused authType ${user.authType}`, ); throw new ForbiddenException( diff --git a/apps/server/src/core/auth/strategies/jwt.strategy.ts b/apps/server/src/core/auth/strategies/jwt.strategy.ts index f92f950a5..c74fa3e0c 100644 --- a/apps/server/src/core/auth/strategies/jwt.strategy.ts +++ b/apps/server/src/core/auth/strategies/jwt.strategy.ts @@ -92,7 +92,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') { this.sessionActivityService.trackActivity(sessionId, payload.sub, payload.workspaceId); } - return { user, workspace }; + return { user, workspace, authType: JwtType.ACCESS }; } private async validateApiKey(req: any, payload: JwtApiKeyPayload) { diff --git a/apps/server/src/ee b/apps/server/src/ee index 70fdfb993..acae98e81 160000 --- a/apps/server/src/ee +++ b/apps/server/src/ee @@ -1 +1 @@ -Subproject commit 70fdfb9933083b95d940b5b6df60c30c2e1039de +Subproject commit acae98e81903e0331ee5791bfeac044d582f3107