jeena/FeedMonkey
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #35 from mossroy/master

Browse source 
Issue #30 : Handle the NOT_LOGGED_IN errors that can come from tt-rss backends.
This commit is contained in:
Jeena Paradies 2014-08-09 17:39:57 +02:00
commit 2895e2749e
2 changed files with 63 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/App.js
View file

@ -162,13 +162,24 @@ App.prototype.reload = function() {
App.prototype.gotUnreadFeeds = function(new_articles) {
if(new_articles == null || !this.validate(new_articles)) { // on error load the saved unread articles.
if(new_articles == null || !this.validate(new_articles)) {
// Check if we did not get a NOT_LOGGED_IN error, and ask the
// user to login again if it is the case.
// This can happen with TT-RSS backend
if (new_articles.error && new_articles.error === "NOT_LOGGED_IN") {
alert("Your TinyTinyRSS session has expired. Please login again");
this.login.fillLoginFormFromLocalStorage();
this.login.log_in();
}
else {
// On other errors, load the saved unread articles.
var old_articles = localStorage.unread_articles;
if(old_articles) {
this.unread_articles = JSON.parse(old_articles);
}
this.populateList();
}
} else {

25
js/Login.js
View file

@ -67,6 +67,7 @@ Login.prototype.authenticate = function(e) {
if(data.version) {
var auth = btoa(user + ':' + password);
localStorage.server_url = server_url;
localStorage.username = user;
localStorage.session_id = auth;
localStorage.backend = "OwnCloud";
_this.app.after_login(localStorage.backend);
@ -83,6 +84,7 @@ Login.prototype.authenticate = function(e) {
Pond.login(server_url, user, password, function(data) {
if(data.session_token) {
localStorage.server_url = server_url;
localStorage.username = user;
localStorage.session_id = data.session_token;
localStorage.backend = "Pond";
_this.app.after_login(localStorage.backend);
@ -106,6 +108,7 @@ Login.prototype.authenticate = function(e) {
} else {
localStorage.server_url = server_url;
localStorage.username = user;
localStorage.session_id = data.session_id;
localStorage.backend = "TinyTinyRSS";
_this.app.after_login(localStorage.backend);
@ -120,7 +123,29 @@ Login.prototype.authenticate = function(e) {
return false;
};
Login.prototype.fillLoginFormFromLocalStorage = function() {
var serverUrl = localStorage.server_url;
if (serverUrl) {
$("#url").value = serverUrl;
}
var userName = localStorage.username;
if (userName) {
$("#un").value = userName;
}
var backendName = localStorage.backend;
if (backendName === "TinyTinyRSS") {
$("#login form").backend[0].checked = true;
}
else if (backendName === "OwnCloud") {
$("#login form").backend[1].checked = true;
}
else if (backendName === "Pond") {
$("#login form").backend[2].checked = true;
}
}
Login.prototype.log_out = function() {
this.fillLoginFormFromLocalStorage();
localStorage.removeItem("server_url");
localStorage.removeItem("session_id");
localStorage.removeItem("unread_articles");