New: Added CAPTCHA support to Rarbg.

This commit is contained in:
Taloth Saldono
2016-08-10 20:45:48 +02:00
parent e9eab0ae48
commit 73fb216e6f
36 changed files with 458 additions and 130 deletions

View File

@@ -1,3 +1,5 @@
var _ = require('underscore');
var $ = require('jquery');
var vent = require('vent');
var Marionette = require('marionette');
var DeleteView = require('../Delete/IndexerDeleteView');
@@ -12,7 +14,8 @@ var view = Marionette.ItemView.extend({
template : 'Settings/Indexers/Edit/IndexerEditViewTemplate',
events : {
'click .x-back' : '_back'
'click .x-back' : '_back',
'click .x-captcha-refresh' : '_onRefreshCaptcha'
},
_deleteView : DeleteView,
@@ -38,6 +41,77 @@ var view = Marionette.ItemView.extend({
}
require('../Add/IndexerSchemaModal').open(this.targetCollection);
},
_onRefreshCaptcha : function(event) {
var self = this;
var target = $(event.target).parents('.input-group');
this.ui.indicator.show();
this.model.requestAction("checkCaptcha")
.then(function(result) {
if (!result.captchaRequest) {
self.model.setFieldValue('CaptchaToken', '');
return result;
}
return self._showCaptcha(target, result.captchaRequest);
})
.always(function() {
self.ui.indicator.hide();
});
},
_showCaptcha : function(target, captchaRequest) {
var self = this;
var widget = $('<div class="g-recaptcha"></div>').insertAfter(target);
return this._loadRecaptchaWidget(widget[0], captchaRequest.siteKey, captchaRequest.secretToken)
.then(function(captchaResponse) {
target.parents('.form-group').removeAllErrors();
widget.remove();
var queryParams = {
responseUrl : captchaRequest.responseUrl,
ray : captchaRequest.ray,
captchaResponse: captchaResponse
};
return self.model.requestAction("getCaptchaCookie", queryParams);
})
.then(function(response) {
self.model.setFieldValue('CaptchaToken', response.captchaToken);
});
},
_loadRecaptchaWidget : function(widget, sitekey, stoken) {
var promise = $.Deferred();
var renderWidget = function() {
window.grecaptcha.render(widget, {
'sitekey' : sitekey,
'stoken' : stoken,
'callback' : promise.resolve
});
};
if (window.grecaptcha) {
renderWidget();
} else {
window.grecaptchaLoadCallback = function() {
delete window.grecaptchaLoadCallback;
renderWidget();
};
$.getScript('https://www.google.com/recaptcha/api.js?onload=grecaptchaLoadCallback&render=explicit')
.fail(function() { promise.reject(); });
}
return promise;
}
});

View File

@@ -1,4 +1,5 @@
var _ = require('underscore');
var $ = require('jquery');
var vent = require('vent');
var Marionette = require('marionette');
var DeleteView = require('../Delete/NotificationDeleteView');
@@ -90,21 +91,45 @@ var view = Marionette.ItemView.extend({
this.ui.indicator.show();
var self = this;
var callbackUrl = window.location.origin + '/oauth.html';
var fields = this.model.get('fields');
var consumerKeyObj = _.findWhere(fields, { name: 'ConsumerKey' });
var consumerSecretObj = _.findWhere(fields, { name: 'ConsumerSecret' });
var queryParams = {
callbackUrl: callbackUrl,
consumerKey: (consumerKeyObj ? consumerKeyObj.value : ''),
consumerSecret: (consumerSecretObj ? consumerSecretObj.value : '')
};
var promise = this.model.connectData(this.ui.authorizedNotificationButton.data('value'), queryParams);
var promise = this.model.requestAction('startOAuth', { callbackUrl: window.location.origin + '/oauth.html' })
.then(function(response) {
return self._showOAuthWindow(response.oauthUrl);
})
.then(function(responseQueryParams) {
return self.model.requestAction('getOAuthToken', responseQueryParams);
})
.then(function(response) {
self.model.setFieldValue('AccessToken', response.accessToken);
self.model.setFieldValue('AccessTokenSecret', response.accessTokenSecret);
});
promise.always(function() {
self.ui.indicator.hide();
});
self.ui.indicator.hide();
});
},
_showOAuthWindow : function(oauthUrl) {
var promise = $.Deferred();
window.open(oauthUrl);
var selfWindow = window;
selfWindow.onCompleteOauth = function(query, callback) {
delete selfWindow.onCompleteOauth;
var queryParams = {};
var splitQuery = query.substring(1).split('&');
_.each(splitQuery, function (param) {
var paramSplit = param.split('=');
queryParams[paramSplit[0]] = paramSplit[1];
});
callback();
promise.resolve(queryParams);
};
return promise;
}
});

View File

@@ -4,93 +4,38 @@ var DeepModel = require('backbone.deepmodel');
var Messenger = require('../Shared/Messenger');
module.exports = DeepModel.extend({
connectData : function(action, initialQueryParams) {
getFieldValue : function(name) {
var index = _.indexOf(_.pluck(this.get('fields'), 'name'), name);
return this.get('fields.' + index + '.value');
},
setFieldValue : function(name, value) {
var index = _.indexOf(_.pluck(this.get('fields'), 'name'), name);
return this.set('fields.' + index + '.value', value);
},
requestAction : function(action, queryParams) {
var self = this;
this.trigger('connect:sync');
this.trigger('validation:sync');
var promise = $.Deferred();
var callAction = function(action, queryParams) {
if (queryParams) {
action = action + '?' + $.param(queryParams, true);
}
var params = {
url : self.collection.url + '/connectData/' + action,
contentType : 'application/json',
data : JSON.stringify(self.toJSON()),
type : 'POST',
isValidatedCall : true
};
var ajaxPromise = $.ajax(params);
ajaxPromise.fail(promise.reject);
ajaxPromise.success(function(response) {
if (response.action)
{
if (response.action === 'openWindow')
{
window.open(response.url);
var selfWindow = window;
selfWindow.onCompleteOauth = function(query, callback) {
delete selfWindow.onCompleteOauth;
if (response.nextStep) {
var queryParams = {};
var splitQuery = query.substring(1).split('&');
_.each(splitQuery, function (param) {
var paramSplit = param.split('=');
queryParams[paramSplit[0]] = paramSplit[1];
});
callAction(response.nextStep, _.extend(initialQueryParams, queryParams));
}
else {
promise.resolve(response);
}
callback();
};
return;
}
else if (response.action === 'updateFields')
{
_.each(self.get('fields'), function (value, index) {
var fieldValue = _.find(response.fields, function (field, key) {
return key === value.name;
});
if (fieldValue) {
self.set('fields.' + index + '.value', fieldValue);
}
});
}
}
if (response.nextStep) {
callAction(response.nextStep, initialQueryParams);
}
else {
promise.resolve(response);
}
});
var params = {
url : this.collection.url + '/action/' + action,
contentType : 'application/json',
data : JSON.stringify(this.toJSON()),
type : 'POST',
isValidatedCall : true
};
callAction(action, initialQueryParams);
if (queryParams) {
params.url += '?' + $.param(queryParams, true);
}
Messenger.monitor({
promise : promise,
successMessage : 'Connecting for \'{0}\' succeeded'.format(this.get('name')),
errorMessage : 'Connecting for \'{0}\' failed'.format(this.get('name'))
});
var promise = $.ajax(params);
promise.fail(function(response) {
self.trigger('connect:failed', response);
self.trigger('validation:failed', response);
});
return promise;