From 04519388ce1bf3acc9997b35748762a7380e5954 Mon Sep 17 00:00:00 2001
From: skiingwiz <skiingwiz@gmail.com>
Date: Sat, 27 Mar 2021 22:15:10 -0400
Subject: Allow directly adding a feed without going through the discovery
 process

Signed-off-by: skiingwiz <skiingwiz@gmail.com>
---
 js/controller/NavigationController.js                | 5 ++++-
 js/service/FeedResource.js                           | 5 +++--
 js/tests/unit/controller/NavigationControllerSpec.js | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js
index 1b183cbdf..68a46900e 100644
--- a/js/controller/NavigationController.js
+++ b/js/controller/NavigationController.js
@@ -210,7 +210,9 @@ app.controller('NavigationController', function ($route, FEED_TYPE, FeedResource
                 feed.url += regResult[2];
             }
 
-            FeedResource.create(feed.url, existingFolder.id, undefined, feed.user, feed.password).then(function (data) {
+            var autoDiscover = feed.autoDiscover ? true : false;
+            FeedResource.create(feed.url, existingFolder.id, undefined, feed.user, feed.password, autoDiscover)
+            .then(function (data) {
                 Publisher.publishAll(data);
 
                 // set folder as default
@@ -220,6 +222,7 @@ app.controller('NavigationController', function ($route, FEED_TYPE, FeedResource
                 feed.url = '';
                 feed.user = '';
                 feed.password = '';
+                feed.autoDiscover = true;
                 self.addingFeed = false;
             });
 
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js
index 0ae7d2ad4..275bb1936 100644
--- a/js/service/FeedResource.js
+++ b/js/service/FeedResource.js
@@ -163,7 +163,7 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
     };
 
 
-    FeedResource.prototype.create = function (url, folderId, title, user, password) {
+    FeedResource.prototype.create = function (url, folderId, title, user, password, fullDiscover) {
         url = url.trim();
         if (!url.startsWith('http')) {
             url = 'https://' + url;
@@ -191,7 +191,8 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
                 parentFolderId: folderId || 0,
                 title: title,
                 user: user || null,
-                password: password || null
+                password: password || null,
+                fullDiscover: fullDiscover
             }
         }).then(function (response) {
             return response.data;
diff --git a/js/tests/unit/controller/NavigationControllerSpec.js b/js/tests/unit/controller/NavigationControllerSpec.js
index 8329348a7..17aee7e22 100644
--- a/js/tests/unit/controller/NavigationControllerSpec.js
+++ b/js/tests/unit/controller/NavigationControllerSpec.js
@@ -361,7 +361,7 @@ describe('NavigationController', function () {
 
         expect(ctrl.showNewFolder).toBe(false);
         expect(FeedResource.create).toHaveBeenCalledWith('test', 3,
-            undefined, undefined, undefined);
+            undefined, undefined, undefined, false);
         expect(Publisher.publishAll).toHaveBeenCalledWith({feeds: [{
             id: 3,
             url: 'test',
@@ -441,7 +441,7 @@ describe('NavigationController', function () {
 
         expect(ctrl.showNewFolder).toBe(false);
         expect(FeedResource.create).toHaveBeenCalledWith('test', 19,
-            undefined, 'user', 'password');
+            undefined, 'user', 'password', false);
         expect(FolderResource.create).toHaveBeenCalledWith('john');
         expect(Publisher.publishAll).toHaveBeenCalledWith({
             folders: [{
-- 
cgit v1.2.3