JGonera has submitted this change and it was merged.
Change subject: bug 45452: Ensure error message appears when a bad token is
visible
......................................................................
bug 45452: Ensure error message appears when a bad token is visible
Don't attempt an upload with a bad token EVER
Change-Id: I21d8a1e595b8e049d049dad8a8e07316022f190f
---
M javascripts/modules/mf-photo.js
1 file changed, 15 insertions(+), 2 deletions(-)
Approvals:
JGonera: Verified; Looks good to me, approved
diff --git a/javascripts/modules/mf-photo.js b/javascripts/modules/mf-photo.js
index 4f9ceb2..27c7c43 100644
--- a/javascripts/modules/mf-photo.js
+++ b/javascripts/modules/mf-photo.js
@@ -84,7 +84,7 @@
'mobile-frontend-photo-article-edit-comment' :
'mobile-frontend-photo-article-donate-comment';
- self.getToken( 'edit', function( tokenData ) {
+ function doUpload( token ) {
var formData = new FormData(), descTextToAppend;
options.fileName = generateFileName(
options.file, options.pageTitle );
descTextToAppend = M.getConfig(
'photoUploadAppendToDesc' );
@@ -101,7 +101,7 @@
formData.append( 'filename', options.fileName );
formData.append( 'comment', mw.msg(
options.editSummaryMessage ) );
formData.append( 'file', options.file );
- formData.append( 'token',
tokenData.tokens.edittoken );
+ formData.append( 'token', token );
formData.append( 'text',
'== {{int:filedesc}} ==\n' +
options.description +
descTextToAppend +
@@ -149,6 +149,19 @@
result.reject( status + ': ' +
error );
}
} );
+ }
+ self.getToken( 'edit', function( tokenData ) {
+ var token;
+ if ( tokenData && tokenData.tokens ) {
+ token = tokenData.tokens.edittoken;
+ if ( token && token !== '+\\' ) { //
ensure not anonymous..
+ doUpload( token );
+ } else {
+ result.reject( 'Anonymous or
absent token' );
+ }
+ } else {
+ result.reject( 'Missing token' );
+ }
}, endpoint );
return result;
--
To view, visit https://gerrit.wikimedia.org/r/51079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21d8a1e595b8e049d049dad8a8e07316022f190f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
