changed to not use a generic token to list proposals, events or any public endpo…

…ints. Noosfero API is updated now, so private_token is necessary only to authenticate user when they try to submit data or get private content

changed to not use a generic token to list proposals, events or any public endpo…
…ints. Noosfero API is updated now, so private_token is necessary only to authenticate user when they try to submit data or get private content
Ábner Silva de Oliveira
1 parent e946ea53
Showing 2 changed files with 17 additions and 9 deletions Show diff stats
index.html
js/main.js
@@ -440,6 +440,7 @@
           </div>
           <div class="oauth-providers">
             <input id="user_oauth_providers" name="oauth_providers" type="hidden">
+            <input id="user_oauth_signup_token" name="oauth_signup_token" type="hidden">
           </div>
           <div id="serpro_captcha" class="captcha col-sm-12">
           </div>
@@ -565,4 +566,4 @@
   </body>
-</html>
 \ No newline at end of file
+</html>
@@ -66,6 +66,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
     function fillSignupForm(signupForm, user) {
       signupForm.find('#signup-user_email').val(user.email);
       signupForm.find('#signup-user_name').val(user.login);
+      signupForm.find('#user_oauth_signup_token').val(user.oauth_signup_token);
       signupForm.find('#user_oauth_providers').val(user.oauth_providers);
       /*signupForm.find('div.password').hide();
       signupForm.find('div.password-confirmation').hide();
@@ -74,7 +75,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
     };
     return {
-      private_token: '375bee7e17d0021af7160ce664874618',
+      /*private_token: '375bee7e17d0021af7160ce664874618',*/
       getProposalId: function() {
         var regexProposals = /\d.*\/propostas\/*.*/;
         var proposalId = 0;
@@ -89,7 +90,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         return proposalId;
       },
       loadRandomProposal: function (topic_id, force) {
-          var private_token = window.Main.private_token;
+          /*var private_token = window.Main.private_token;*/
           var $noProposals = $('.no-proposals');
           var $loading = $('.loading');
           var $randomProposal = $('.random-proposal');
@@ -107,7 +108,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
           if(childId !== 0 && !force){
             url += '/' + childId;
           }
-          url += '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,slug,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+          //url += '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,slug,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+          url += '?limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,slug,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
           $.getJSON(url).done(function( data ) {
             $loading.hide();
@@ -220,7 +222,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         $resultsContainer.find('.results-content').hide();
         var per_page = 10;
-        var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + Main.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;
+        var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?per_page='+per_page+'&page='+page;
         $.getJSON(url).done(function( data, stats, xhr ) {
           data.pagination = {
             total: parseInt(xhr.getResponseHeader('Total')),
@@ -317,7 +320,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
       },
       display_article: function(article_id, backTo) {
-        var url = host + '/api/v1/articles/' + article_id + '?private_token=' + Main.private_token;
+        //var url = host + '/api/v1/articles/' + article_id + '?private_token=' + Main.private_token;
+        var url = host + '/api/v1/articles/' + article_id;
         $.getJSON(url).done(function( data ) {
           $('#article-container .article-content').html(articleTemplate(data.article));
           $('#article-container').show();
@@ -442,7 +446,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         $proposal.find('.body').show();
         $proposal.show();
-        var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + Main.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';
+        var url = host + '/api/v1/articles/' + proposal_id + '?fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
         $.getJSON(url).done(function( data ) {
           $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
         })
@@ -771,7 +776,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
         return msg;
       },
       display_events: function(cat_id, active_category) {
-        var url = host + '/api/v1/communities/' + dialoga_community + '/articles?categories_ids[]=' + cat_id + '&content_type=Event&private_token=' + '375bee7e17d0021af7160ce664874618';
+        //var url = host + '/api/v1/communities/' + dialoga_community + '/articles?categories_ids[]=' + cat_id + '&content_type=Event&private_token=' + '375bee7e17d0021af7160ce664874618';
+        var url = host + '/api/v1/communities/' + dialoga_community + '/articles?categories_ids[]=' + cat_id + '&content_type=Event';
         $.getJSON(url).done(function (data) {
           if(data.articles.length === 0){
@@ -791,7 +797,8 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;proposal_app&#39;, &#39;handlebars_helpers
           var dd = new Date(dt);
           var time = dd.getHours() + ':' + (dd.getMinutes()<10?'0':'') + dd.getMinutes();
           var params = {event: article, date: date, time: time, category: article.categories[0].name, category_class: active_category};
-          $.getJSON(host+'/api/v1/articles/'+article.id+'/followers?private_token=' + '375bee7e17d0021af7160ce664874618' + '&_='+new Date().getTime()).done(function (data) {
+          //$.getJSON(host+'/api/v1/articles/'+article.id+'/followers?private_token=' + '375bee7e17d0021af7160ce664874618' + '&_='+new Date().getTime()).done(function (data) {
+          $.getJSON(host+'/api/v1/articles/'+article.id+'/followers?_='+new Date().getTime()).done(function (data) {
             //FIXME do not depend on this request
             params.total_followers = data.total_followers;
             $('.calendar-container').html(calendarTemplate(params));