Skip to content

Request edit token just when needed (use token multiple times) #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: devel
Choose a base branch
from
Open

Request edit token just when needed (use token multiple times) #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b2730b
Request edit token just when needed (use token multiple times)
anysite Oct 10, 2018
2559a9d
add ;. add comment of explantion
anysite Oct 10, 2018
41bd590
before fixing
anysite Oct 14, 2018
021d249
fix for exlint
anysite Oct 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 39 additions & 15 deletions lib/bot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,21 +479,23 @@ module.exports = ( function () {
// this should only be used internally (see #84)
doEdit( type, title, summary, params, callback ) {
const self = this;

if ( this.dryRun ) {
callback( new Error( 'In dry-run mode' ) );
return;
}

// @see http://www.mediawiki.org/wiki/API:Edit
this.getToken( title, 'edit', function ( err, token ) {
if ( err ) {
callback( err );
return;
}

let doWithToken, doAfterToken;
doWithToken = function () {
self.obtainigToken = true;
self.getToken( title, 'edit', function ( err, token ) {
self.obtainigToken = false;
if ( err ) {
callback( err );
return;
}
self.editToken = token;
doAfterToken();
} );
};
doAfterToken = function () {
self.log( `Editing '${title}' with a summary '${summary}' (${type})...` );

let token = self.editToken;
const editParams = _.extend( {
action: 'edit',
bot: '',
Expand All @@ -503,14 +505,36 @@ module.exports = ( function () {
}, params );

self.api.call( editParams, function ( err, data ) {
if ( !err && data.result && data.result === 'Success' ) {
// check if token expired
if ( err === 'Error returned by API: Invalid CSRF token' ) {
doWithToken();
} else if ( !err && data.result && data.result === 'Success' ) {
self.log( 'Rev #%d created for \'%s\'', data.newrevid, data.title );
callback( null, data );
} else {
callback( err || data );
}
}, 'POST' );
} );
};
if ( this.dryRun ) {
callback( new Error( 'In dry-run mode' ) );
return;
}
if ( !self.editToken ) {
doWithToken();
} else if ( self.obtainigToken ) {
// waint to some else to set token
let waitingToken = setInterval( () => {
if ( !self.obtainigToken ) {
if ( self.editToken ) {
clearInterval( waitingToken );
doAfterToken();
}
}
}, 20 );
} else {
doAfterToken();
}
},

edit( title, content, summary, minor, callback ) {
Expand Down
Loading