1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00

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

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

View File

@@ -16,6 +16,7 @@ interface Options {
userContentBaseUrl(): string;
username(): string;
password(): string;
session(): Session | null;
env?: Env;
}
@@ -36,7 +37,7 @@ export interface ExecOptions {
source?: string;
}
interface Session {
export interface Session {
id: string;
user_id: string;
}
@@ -76,6 +77,12 @@ export default class JoplinServerApi {
}
private async session() {
const optionSession = this.options_.session();
if (optionSession) {
return optionSession;
}
if (this.session_) return this.session_;
const clientInfo = await this.getClientInfo();