mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2025-02-28 17:00:01 +00:00
Add support for HTTP bearer authentication
This commit is contained in:
parent
48cbaa1ec7
commit
a51afc8b81
@ -52,7 +52,9 @@ exports.startup = function() {
|
|||||||
basicAuthUsername: params["basic-auth-username"],
|
basicAuthUsername: params["basic-auth-username"],
|
||||||
basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
|
basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
|
||||||
basicAuthPassword: params["basic-auth-password"],
|
basicAuthPassword: params["basic-auth-password"],
|
||||||
basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
|
basicAuthPasswordFromStore: params["basic-auth-password-from-store"],
|
||||||
|
bearerAuthToken: params["bearer-auth-token"],
|
||||||
|
bearerAuthTokenFromStore: params["bearer-auth-token-from-store"]
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
|
$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
|
||||||
|
@ -104,6 +104,8 @@ basicAuthUsername: plain username for basic authentication
|
|||||||
basicAuthUsernameFromStore: name of password store entry containing username
|
basicAuthUsernameFromStore: name of password store entry containing username
|
||||||
basicAuthPassword: plain password for basic authentication
|
basicAuthPassword: plain password for basic authentication
|
||||||
basicAuthPasswordFromStore: name of password store entry containing password
|
basicAuthPasswordFromStore: name of password store entry containing password
|
||||||
|
bearerAuthToken: plain text token for bearer authentication
|
||||||
|
bearerAuthTokenFromStore: name of password store entry contain bear authorization token
|
||||||
*/
|
*/
|
||||||
function HttpClientRequest(options) {
|
function HttpClientRequest(options) {
|
||||||
var self = this;
|
var self = this;
|
||||||
@ -135,8 +137,11 @@ function HttpClientRequest(options) {
|
|||||||
});
|
});
|
||||||
this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
|
this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
|
||||||
this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
|
this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
|
||||||
|
this.bearerAuthToken = options.bearerAuthToken || (options.bearerAuthTokenFromStore && $tw.utils.getPassword(options.bearerAuthTokenFromStore)) || "";
|
||||||
if(this.basicAuthUsername && this.basicAuthPassword) {
|
if(this.basicAuthUsername && this.basicAuthPassword) {
|
||||||
this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
|
this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
|
||||||
|
} else if(this.bearerAuthToken) {
|
||||||
|
this.requestHeaders.Authorization = "Bearer " + this.bearerAuthToken;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,6 +28,8 @@ The following parameters are used:
|
|||||||
|basic-auth-username-from-store |<<.from-version "5.3.4">> Optional username for HTTP basic authentication, specified as the name of the entry in the password store containing the username |
|
|basic-auth-username-from-store |<<.from-version "5.3.4">> Optional username for HTTP basic authentication, specified as the name of the entry in the password store containing the username |
|
||||||
|basic-auth-password |<<.from-version "5.3.4">> Optional password for HTTP basic authentication |
|
|basic-auth-password |<<.from-version "5.3.4">> Optional password for HTTP basic authentication |
|
||||||
|basic-auth-password-from-store |<<.from-version "5.3.4">> Optional password for HTTP basic authentication, specified as the name of the entry in the password store containing the password |
|
|basic-auth-password-from-store |<<.from-version "5.3.4">> Optional password for HTTP basic authentication, specified as the name of the entry in the password store containing the password |
|
||||||
|
|bearerAuthToken |<<.from-version "5.3.6">> Optional plain text token for HTTP bearer authentication |
|
||||||
|
|basic-auth-password-from-store |<<.from-version "5.3.6">> Optional token for HTTP bearer authentication, specified as the name of the entry in the password store containing the token |
|
||||||
|var-* |Variables to be passed to the completion and progress handlers (without the "var-" prefix) |
|
|var-* |Variables to be passed to the completion and progress handlers (without the "var-" prefix) |
|
||||||
|bind-status |Title of tiddler to which the status of the request ("pending", "complete", "error") should be bound |
|
|bind-status |Title of tiddler to which the status of the request ("pending", "complete", "error") should be bound |
|
||||||
|bind-progress |Title of tiddler to which the progress of the request (0 to 100) should be bound |
|
|bind-progress |Title of tiddler to which the progress of the request (0 to 100) should be bound |
|
||||||
|
Loading…
x
Reference in New Issue
Block a user