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
fix: list idp
Steven2317204c508f
diff --git a/server/router/api/v1/idp_service.go b/server/router/api/v1/idp_service.goindex d2cef0c51..70996672e 100644--- a/server/router/api/v1/idp_service.go+++ b/server/router/api/v1/idp_service.go@@ -78,6 +78,8 @@ func (s *APIV1Service) UpdateIdentityProvider(ctx context.Context, request *v1pbswitch field {case "title":update.Name = &request.IdentityProvider.Title+ case "identifier_filter":+ update.IdentifierFilter = &request.IdentityProvider.IdentifierFiltercase "config":update.Config = convertIdentityProviderConfigToStore(request.IdentityProvider.Type, request.IdentityProvider.Config)}diff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.goindex c3ec13945..f813d5098 100644--- a/server/router/api/v1/memo_service.go+++ b/server/router/api/v1/memo_service.go@@ -1057,23 +1057,6 @@ func getMemoPropertyFromContent(content string) (*storepb.MemoPayload_Property,return property, nil}-func ExtractTagsFromContent(content string) ([]string, error) {- nodes, err := parser.Parse(tokenizer.Tokenize(content))- if err != nil {- return nil, errors.Wrap(err, "failed to parse content")- }- tags := []string{}- TraverseASTNodes(nodes, func(node ast.Node) {- if tagNode, ok := node.(*ast.Tag); ok {- tag := tagNode.Content- if !slices.Contains(tags, tag) {- tags = append(tags, tag)- }- }- })- return tags, nil-}-func TraverseASTNodes(nodes []ast.Node, fn func(ast.Node)) {for _, node := range nodes {fn(node)diff --git a/store/idp.go b/store/idp.goindex e5608e577..6aed4bbf4 100644--- a/store/idp.go+++ b/store/idp.go@@ -62,6 +62,7 @@ func (s *Store) ListIdentityProviders(ctx context.Context, find *FindIdentityProif err != nil {return nil, err}+ identityProviders = append(identityProviders, identityProvider)s.idpCache.Store(identityProvider.Id, identityProvider)}return identityProviders, nildiff --git a/web/src/components/CreateIdentityProviderDialog.tsx b/web/src/components/CreateIdentityProviderDialog.tsxindex ee6c88b0a..603387cdb 100644--- a/web/src/components/CreateIdentityProviderDialog.tsx+++ b/web/src/components/CreateIdentityProviderDialog.tsx@@ -105,7 +105,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {const identityProviderTypes = [...new Set(templateList.map((t) => t.type))];const { confirmCallback, destroy, identityProvider } = props;const [basicInfo, setBasicInfo] = useState({- name: "",+ title: "",identifierFilter: "",});const [type, setType] = useState<IdentityProvider_Type>(IdentityProvider_Type.OAUTH2);@@ -129,7 +129,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {useEffect(() => {if (identityProvider) {setBasicInfo({- name: identityProvider.name,+ title: identityProvider.title,identifierFilter: identityProvider.identifierFilter,});setType(identityProvider.type);@@ -149,7 +149,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {const template = templateList.find((t) => t.title === selectedTemplate);if (template) {setBasicInfo({- name: template.name,+ title: template.title,identifierFilter: template.identifierFilter,});setType(template.type);@@ -166,7 +166,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {};const allowConfirmAction = () => {- if (basicInfo.name === "") {+ if (basicInfo.title === "") {return false;}if (type === "OAUTH2") {@@ -205,11 +205,12 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {},},});- toast.success(t("setting.sso-section.sso-created", { name: basicInfo.name }));+ toast.success(t("setting.sso-section.sso-created", { name: basicInfo.title }));} else {await identityProviderServiceClient.updateIdentityProvider({identityProvider: {...basicInfo,+ name: identityProvider!.name,type: type,config: {oauth2Config: {@@ -218,9 +219,9 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {},},},- updateMask: ["title", "identifierFilter", "config"],+ updateMask: ["title", "identifier_filter", "config"],});- toast.success(t("setting.sso-section.sso-updated", { name: basicInfo.name }));+ toast.success(t("setting.sso-section.sso-updated", { name: basicInfo.title }));}} catch (error: any) {console.error(error);@@ -280,11 +281,11 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {<InputclassName="mb-2"placeholder={t("common.name")}- value={basicInfo.name}+ value={basicInfo.title}onChange={(e) =>setBasicInfo({...basicInfo,- name: e.target.value,+ title: e.target.value,})}fullWidthdiff --git a/web/src/components/Settings/SSOSection.tsx b/web/src/components/Settings/SSOSection.tsxindex 8470f2cdf..0a45a538e 100644--- a/web/src/components/Settings/SSOSection.tsx+++ b/web/src/components/Settings/SSOSection.tsx@@ -24,7 +24,7 @@ const SSOSection = () => {};const handleDeleteIdentityProvider = async (identityProvider: IdentityProvider) => {- const content = t("setting.sso-section.confirm-delete", { name: identityProvider.name });+ const content = t("setting.sso-section.confirm-delete", { name: identityProvider.title });showCommonDialog({title: t("setting.sso-section.delete-sso"),diff --git a/web/src/pages/SignIn.tsx b/web/src/pages/SignIn.tsxindex 19434d3c2..4b9cd3729 100644--- a/web/src/pages/SignIn.tsx+++ b/web/src/pages/SignIn.tsx@@ -191,7 +191,7 @@ const SignIn = () => {size="md"onClick={() => handleSignInWithIdentityProvider(identityProvider)}>- {t("common.sign-in-with", { provider: identityProvider.name })}+ {t("common.sign-in-with", { provider: identityProvider.title })}</Button>))}</div>