Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update auth callback messages
Steven58ae3217ffcb
diff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsxindex 257122238..788c7e154 100644--- a/web/src/components/CreateIdentityProviderDialog.tsx+++ b/web/src/components/CreateIdentityProviderDialog.tsx@@ -236,7 +236,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {return (<><div className="dialog-header-container">- <p className="title-text ml-auto">{t(isCreating ? "setting.sso-section.create-sso" : "setting.sso-section.update-sso")}</p>+ <p>{t(isCreating ? "setting.sso-section.create-sso" : "setting.sso-section.update-sso")}</p><IconButton size="sm" onClick={handleCloseBtnClick}><Icon.X className="w-5 h-auto" /></IconButton>diff --git a/web/src/components/HomeSidebar/TagsSection.tsx b/web/src/components/HomeSidebar/TagsSection.tsxindex a45c8d35a..946c3dd76 100644--- a/web/src/components/HomeSidebar/TagsSection.tsx+++ b/web/src/components/HomeSidebar/TagsSection.tsx@@ -90,8 +90,9 @@ const TagsSection = () => {))}</div>) : (- <div>- <p className="text-sm leading-snug italic text-gray-400 dark:text-gray-500">+ <div className="p-2 border rounded-md flex flex-row justify-start items-start gap-1 text-gray-400 dark:text-gray-500">+ <Icon.ThumbsUp />+ <p className="mt-0.5 text-sm leading-snug italic">You can create tags by inputting <code>`#tag`</code>.</p></div>diff --git a/web/src/pages/AuthCallback.tsx b/web/src/pages/AuthCallback.tsxindex c4756bca0..515538f9a 100644--- a/web/src/pages/AuthCallback.tsx+++ b/web/src/pages/AuthCallback.tsx@@ -1,4 +1,5 @@import { last } from "lodash-es";+import { ClientError } from "nice-grpc-web";import { useEffect, useState } from "react";import { toast } from "react-hot-toast";import { useSearchParams } from "react-router-dom";@@ -28,46 +29,55 @@ const AuthCallback = () => {const code = searchParams.get("code");const state = searchParams.get("state");- if (code && state) {- const redirectUri = absolutifyLink("/auth/callback");- const identityProviderId = Number(last(state.split("-")));- if (identityProviderId) {- authServiceClient- .signInWithSSO({- idpId: identityProviderId,- code,- redirectUri,- })- .then(async ({ user }) => {- setState({- loading: false,- errorMessage: "",- });- if (user) {- await userStore.fetchCurrentUser();- navigateTo("/");- } else {- toast.error(t("message.login-failed"));- }- })- .catch((error: any) => {- console.error(error);- setState({- loading: false,- errorMessage: JSON.stringify(error.response.data, null, 2),- });- });- }- } else {+ if (!code || !state) {setState({loading: false,errorMessage: "Failed to authorize. Invalid state passed to the auth callback.",});+ return;+ }++ const identityProviderId = Number(last(state.split("-")));+ if (!identityProviderId) {+ setState({+ loading: false,+ errorMessage: "No identity provider ID found in the state parameter.",+ });+ return;}++ const redirectUri = absolutifyLink("/auth/callback");+ (async () => {+ try {+ const { user } = await authServiceClient.signInWithSSO({+ idpId: identityProviderId,+ code,+ redirectUri,+ });++ setState({+ loading: false,+ errorMessage: "",+ });+ if (!user) {+ toast.error(t("message.login-failed"));+ return;+ }++ await userStore.fetchCurrentUser();+ navigateTo("/");+ } catch (error: any) {+ console.error(error);+ setState({+ loading: false,+ errorMessage: (error as ClientError).details,+ });+ }+ })();}, [searchParams]);return (- <div className="p-4 w-full h-full flex justify-center items-center">+ <div className="p-4 py-24 w-full h-full flex justify-center items-center">{state.loading ? (<Icon.Loader className="animate-spin dark:text-gray-200" />) : (