self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-26 22:41:17 +02:00
Code Issues Releases Activity

Desktop, Cli, Mobile, Server: Add Joplin Server SAML support (#11865)

Browse Source
This commit is contained in:
Tom Chedmail
2025-06-02 17:34:08 +02:00
committed by GitHub
parent 4f826c045a
commit bdbd16240b
46 changed files with 1039 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/lib/models/settings/builtInMetadata.ts
View File

@@ -349,6 +349,37 @@ const builtInMetadata = (Setting: typeof SettingType) => {
label: () => _('Joplin Server password'),
secure: true,
},
'sync.11.path': {
value: '',
type: SettingItemType.String,
section: 'sync',
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
show: (settings: any) => {
return settings['sync.target'] === SyncTargetRegistry.nameToId('joplinServerSaml');
},
public: true,
label: () => _('Joplin Server URL'),
description: () => emptyDirWarning,
storage: SettingStorage.File,
},
'sync.11.userContentPath': {
value: '',
type: SettingItemType.String,
public: false,
storage: SettingStorage.Database,
},
'sync.11.id': {
value: '',
type: SettingItemType.String,
public: false,
storage: SettingStorage.Database,
},
'sync.11.userId': {
value: '',
type: SettingItemType.String,
public: false,
storage: SettingStorage.Database,
},
// Although sync.10.path is essentially a constant, we still define
// it here so that both Joplin Server and Joplin Cloud can be
@@ -433,6 +464,7 @@ const builtInMetadata = (Setting: typeof SettingType) => {
'sync.8.context': { value: '', type: SettingItemType.String, public: false },
'sync.9.context': { value: '', type: SettingItemType.String, public: false },
'sync.10.context': { value: '', type: SettingItemType.String, public: false },
'sync.11.context': { value: '', type: SettingItemType.String, public: false },
'sync.maxConcurrentConnections': { value: 5, type: SettingItemType.Int, storage: SettingStorage.File, isGlobal: true, public: true, advanced: true, section: 'sync', label: () => _('Max concurrent connections'), minimum: 1, maximum: 20, step: 1 },
@@ -1447,6 +1479,7 @@ const builtInMetadata = (Setting: typeof SettingType) => {
SyncTargetRegistry.nameToId('nextcloud'),
SyncTargetRegistry.nameToId('webdav'),
SyncTargetRegistry.nameToId('joplinServer'),
SyncTargetRegistry.nameToId('joplinServerSaml'),
// Needs to be enabled for Joplin Cloud too because
// some companies filter all traffic and swap TLS
// certificates, which result in error