From c0b279c010da455e4d38580c0302a25ef50466f1 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 22 May 2015 18:53:39 -0300 Subject: [PATCH] Fix private_token usage --- js/main.js | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/js/main.js b/js/main.js index 9698410..8b74aa0 100644 --- a/js/main.js +++ b/js/main.js @@ -20,14 +20,10 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F var participa = true; if(participa){ var host = 'http://www.participa.br'; - var private_token = '375bee7e17d0021af7160ce664874618'; //participa var proposal_discussion = '92856'; //participa }else{ var host = 'http://noosfero.com:3000'; - //var private_token = 'bd8996155f5ea4354e42fee50b4b6891'; //casa - var private_token = 'aae32bf5031e895b00a20a529d763b31'; //local serpro var proposal_discussion = '632'; //local serpro - //var proposal_discussion = '401'; //casa } var BARRA_ADDED = false; @@ -36,7 +32,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F Main = (function(){ return { - loadRandomProposal: function (topic_id, private_token) { + private_token: '375bee7e17d0021af7160ce664874618', + loadRandomProposal: function (topic_id) { + var private_token = Main.private_token; var $noProposals = $('.no-proposals'); var $loading = $('.loading'); var $randomProposal = $('.random-proposal'); @@ -48,7 +46,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $loading.show(); $randomProposal.html(''); - var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal'; + var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + Main.private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal'; $.getJSON(url).done(function( data ) { $loading.hide(); @@ -63,7 +61,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $randomProposal.html(supportProposalTemplate(article)); $body.off('click', '.vote-actions .skip'); $body.on('click', '.vote-actions .skip', function(e) { - contextMain.loadRandomProposal(topic_id, private_token); + contextMain.loadRandomProposal(topic_id); e.preventDefault(); }); $body.off('click', '.vote-actions .like'); @@ -71,7 +69,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F //Helps to prevent more than one vote per proposal if(ProposalApp.hasProposalbeenVoted(article.id)){ console.log("Proposta " + article.id + " já havia sido votada"); - contextMain.loadRandomProposal(topic_id, private_token); + contextMain.loadRandomProposal(topic_id); e.preventDefault(); return; } @@ -87,11 +85,11 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F url: host + '/api/v1/articles/' + article.id + '/vote', data: { value: $(this).data('vote-value'), - private_token: private_token + private_token: Main.private_token } }).done(function( /*data*/ ) { ProposalApp.addVotedProposal(article.id); - contextMain.loadRandomProposal(topic_id, private_token); + contextMain.loadRandomProposal(topic_id); }); e.preventDefault(); }); @@ -119,7 +117,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $resultsContainer.find('.results-content').hide(); var per_page = 10; - var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + private_token + '&per_page='+per_page+'&page='+page; + var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + Main.private_token + '&per_page='+per_page+'&page='+page; $.getJSON(url).done(function( data, stats, xhr ) { data.pagination = { total: parseInt(xhr.getResponseHeader('Total')), @@ -163,12 +161,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F if(logged_in) { if(token){ - private_token = token; + Main.private_token = token; } loginButton.siblings('.require-login').show(); loginButton.siblings('.require-login .message').show(); loginButton.siblings('.login-container').hide(); - $.cookie('_dialoga_session', private_token); + $.cookie('_dialoga_session', Main.private_token); } else { loginButton.siblings('.require-login').hide(); loginButton.siblings('.login-container').show(); @@ -225,7 +223,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $proposal.find('.calendar').slick(); var topic_id = proposal_id.split('-').pop(); - this.loadRandomProposal(topic_id, private_token); + this.loadRandomProposal(topic_id); }, display_proposal_detail: function(proposal_id){ $('#proposal-categories').hide(); @@ -243,7 +241,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $proposal.find('.body').show(); $proposal.show(); - var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic'; + var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + Main.private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic'; $.getJSON(url).done(function( data ) { $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body); }) @@ -442,12 +440,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F })(); // Load data from localhost when it is dev env. - var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position'; + var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + Main.private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position'; $.getJSON(noosferoAPI) .done(function( data ) { data.host = host; - data.private_token = private_token; + data.private_token = Main.private_token; resultsPlaceholder.innerHTML = template(data); $('.login-container').html(loginTemplate()); $('.countdown').maxlength({text: '%left caracteres restantes'}); @@ -590,7 +588,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $.ajax({ type: 'post', url: host + $form.attr('action'), - data: $('#'+this.id).serialize() + '&private_token=' + private_token + '&fields=id&article[name]=article_' + Main.guid() + data: $('#'+this.id).serialize() + '&private_token=' + Main.private_token + '&fields=id&article[name]=article_' + Main.guid() }) .done(function( /*data*/ ) { form.reset(); @@ -619,14 +617,14 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F $(document).ready(function($) { - + FastClick.attach(document.body); if($.cookie('_dialoga_session')) { var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session'); $.getJSON(url).done(function( /*data*/ ) { logged_in = true; - private_token = $.cookie('_dialoga_session'); + Main.private_token = $.cookie('_dialoga_session'); }); } -- libgit2 0.21.2