masq/glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imgur: factor out & deduplicate authentication logic

Browse Source
This commit is contained in:
Lorenz Hübschle-Schneider 2020-05-05 10:08:37 +02:00
parent 2a5d7cf0f4
commit 67a19c3bab
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/imgur.js
View File

@ -24,20 +24,23 @@ weechat.factory('imgur', ['$rootScope', 'settings', function($rootScope, setting
}; };
// Upload image to imgur from base64
var upload = function( base64img, callback ) {
var authenticate = function(xhr) {
// API authorization, either via Client ID (anonymous) or access token // API authorization, either via Client ID (anonymous) or access token
// (add to user's imgur account), see also: // (add to user's imgur account), see also:
// https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash // https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash
var accessToken = "164efef8979cd4b"; var accessToken = "164efef8979cd4b";
var isClientID = true;
// Check whether the user has provided an access token // Check whether the user has provided an access token
if (settings.iToken.length > 37){ if (settings.iToken.length > 37){
accessToken = settings.iToken; xhr.setRequestHeader("Authorization", "Bearer " + settings.iToken);
isClientID = false; } else {
xhr.setRequestHeader("Authorization", "Client-ID " + accessToken);
} }
};
// Upload image to imgur from base64
var upload = function( base64img, callback ) {
// Progress bars container // Progress bars container
var progressBars = document.getElementById("imgur-upload-progress"), var progressBars = document.getElementById("imgur-upload-progress"),
@ -65,13 +68,7 @@ weechat.factory('imgur', ['$rootScope', 'settings', function($rootScope, setting
// Post request to imgur api // Post request to imgur api
xhttp.open("POST", "https://api.imgur.com/3/image", true); xhttp.open("POST", "https://api.imgur.com/3/image", true);
authenticate(xhttp);
// Set headers
if (isClientID) {
xhttp.setRequestHeader("Authorization", "Client-ID " + accessToken);
} else {
xhttp.setRequestHeader("Authorization", "Bearer " + accessToken);
}
xhttp.setRequestHeader("Accept", "application/json"); xhttp.setRequestHeader("Accept", "application/json");
// Handler for response // Handler for response
@ -123,30 +120,12 @@ weechat.factory('imgur', ['$rootScope', 'settings', function($rootScope, setting
// Delete an image from imgur with the deletion link // Delete an image from imgur with the deletion link
var deleteImage = function( deletehash, callback ) { var deleteImage = function( deletehash, callback ) {
// API authorization, either via Client ID (anonymous) or access token
// (add to user's imgur account), see also:
// https://github.com/glowing-bear/glowing-bear/wiki/Getting-an-imgur-token-&-album-hash
var accessToken = "164efef8979cd4b";
var isClientID = true;
// Check whether the user has provided an access token
if (settings.iToken.length > 37){
accessToken = settings.iToken;
isClientID = false;
}
// Create new XMLHttpRequest // Create new XMLHttpRequest
var xhttp = new XMLHttpRequest(); var xhttp = new XMLHttpRequest();
// Post request to imgur api // Post request to imgur api
xhttp.open("DELETE", "https://api.imgur.com/3/image/" + deletehash, true); xhttp.open("DELETE", "https://api.imgur.com/3/image/" + deletehash, true);
authenticate(xhttp);
// Set headers
if (isClientID) {
xhttp.setRequestHeader("Authorization", "Client-ID " + accessToken);
} else {
xhttp.setRequestHeader("Authorization", "Bearer " + accessToken);
}
xhttp.setRequestHeader("Accept", "application/json"); xhttp.setRequestHeader("Accept", "application/json");
// Handler for response // Handler for response