Download as
Browse Code »

Commit c054d6fc73641a3801eba2c1f7f731d090096538

Authored by Victor Costa
1 parent 285efda0
Exists in session_cookie

Session cookie

Showing 1 changed file with 15 additions and 7 deletions   Show diff stats
js/main.js
  Diff comments   View file @c054d6f
... ... @@ -17,7 +17,7 @@ var logged_in = false;
17 17  
18 18 var loginButton;
19 19  
20   -var participa = true;
  20 +var participa = false;
21 21 if(participa){
22 22 var host = 'http://www.participa.br';
23 23 var private_token = '375bee7e17d0021af7160ce664874618'; //participa
... ... @@ -25,12 +25,12 @@ if(participa){
25 25 }else{
26 26 var host = 'http://noosfero.com:3000';
27 27 //var private_token = 'bd8996155f5ea4354e42fee50b4b6891'; //casa
28   - var private_token = '04c9b36cf0afba52915fe86f182e741c'; //local serpro
  28 + var private_token = '8f7e60ce3208897d61c4bc49fc1f2bf5'; //local serpro
29 29 var proposal_discussion = '632'; //local serpro
30 30 //var proposal_discussion = '401'; //casa
31 31 }
32 32  
33   -var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,body,title,image,url';
  33 +var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + private_token_param() + '&fields=id,children,categories,abstract,body,title,image,url';
34 34  
35 35 $.getJSON(noosferoAPI)
36 36 .done(function( data ) {
... ... @@ -205,11 +205,11 @@ function loadRandomProposal(topic_id, private_token) {
205 205 }
206 206  
207 207 jQuery(document).ready(function($) {
208   - if($.cookie('_dialoga_session')) {
209   - var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
  208 + if(!logged_in) {
  209 + var url = host + '/api/v1/users/me';
210 210 $.getJSON(url).done(function( data ) {
211 211 logged_in = true;
212   - private_token = $.cookie('_dialoga_session');
  212 + private_token = data.private_token;
213 213 });
214 214 }
215 215 });
... ... @@ -241,7 +241,7 @@ jQuery(document).ready(function($) {
241 241 url: host + '/api/v1/login',
242 242 data: $(this).parents('.login').serialize(),
243 243 xhrFields: {
244   - //withCredentials: true
  244 + withCredentials: true
245 245 }
246 246 }).done(function(data) {
247 247 loginCallback(true, data.private_token);
... ... @@ -301,3 +301,11 @@ function display_proposal_detail(){
301 301 event.preventDefault();
302 302  
303 303 }
  304 +
  305 +function private_token_param() {
  306 + if(!logged_in) {
  307 + return "?private_token="+private_token;
  308 + } else {
  309 + return '?';
  310 + }
  311 +}
... ...