Update package version to 1.24.0

| datasource      | package           | from   | to     |
| --------------- | ----------------- | ------ | ------ |
| github-releases | FreshRSS/FreshRSS | 1.25.0 | 1.26.0 |

CHANGELOG.md

@@ -313,3 +313,58 @@
 * New option to automatically add labels to incoming articles
 * New button to download a feed configuration as OPML
 
+[1.21.1]
+* Update FreshRSS to 1.24.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.1)
+* New button to export OMPL of a category
+* Many bug fixes
+
+[1.21.2]
+* Update FreshRSS to 1.24.2
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.2)
+* New global option to automatically add articles to favourites
+* New option to share articles from the article title line
+* Add core extensions, shipped by default: UserCSS and UserJS
+* Security: Force log out of users when they are disabled
+* Last version supporting PHP 7.4 and initial support for PHP 8.4+
+* Many bug and regression fixes
+
+[1.21.3]
+* Update FreshRSS to 1.24.3
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.3)
+* Fix mark-as-read from user query #6738
+* Fix regression for shortcut to move between categories #6741
+* Fix feed title option #6771
+* Fix XPath for HTML documents with broken root (used by CSS selectors to fetch full content) #6774
+* Fix UI regression in Mapco/Ansum themes #6740
+* Fix minor style bug with some themes #6746
+* Fix export of OPML information for date format of JSON and HTML+XPath feeds #6779
+* OpenID Connect better definition of session parameters #6730
+
+[1.22.0]
+* checklist added to CloudronManifest
+
+[1.23.0]
+* Update FreshRSS to 1.25.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.25.0)
+* Features
+* Bug fixing
+* API
+* Compatibility
+* Deployment
+* SimplePie
+* Security
+* UI
+* Extensions
+* I18n
+* Misc.
+
+[1.24.0]
+* Update FreshRSS to 1.26.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.0)
+* Add order-by options to sort articles by received date (existing, default), publication date, title, link, random
+* Allow searching in all feeds, also feeds only visible at category level with &get=A, and also those archived with &get=Z
+* UI accessible from user-query view
+* New shortcuts for adding user labels to articles
+* Several improvements and bug fixes
+

CloudronManifest.json

@@ -5,14 +5,16 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.21.0",
-  "upstreamVersion": "1.24.0",
+  "version": "1.24.0",
+  "upstreamVersion": "1.26.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
     "localstorage": {},
     "mysql": {},
-    "oidc": { "loginRedirectUri": "/i/oidc/" },
+    "oidc": {
+      "loginRedirectUri": "/i/oidc/"
+    },
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
@@ -20,16 +22,34 @@
       }
     }
   },
+  "checklist": {
+    "change-default-password": {
+      "sso": false,
+      "message": "Change the default admin password"
+    },
+    "create-admin": {
+      "sso": true,
+      "message": "On first visit, sign in using the built-in Cloudron authentication and then make the user administrator by running: `php cli/reconfigure.php --default_user YOUR_USERNAME`"
+    }
+  },
   "manifestVersion": 2,
   "website": "http://www.freshrss.org",
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
-  "tags": [ "rss", "atom", "greader", "reader", "news", "feeds", "feedly" ],
+  "tags": [
+    "rss",
+    "atom",
+    "greader",
+    "reader",
+    "news",
+    "feeds",
+    "feedly"
+  ],
   "mediaLinks": [
     "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "7.5.1",
+  "minBoxVersion": "8.1.0",
   "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
   "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/",
   "optionalSso": true

Dockerfile

@@ -5,8 +5,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.24.0
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
+# renovate: datasource=github-releases depName=FreshRSS/FreshRSS versioning=semver
+ARG FRESHRSS_VERSION=1.26.0
+
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
     mv data data-orig && ln -s /app/data data
 
 # official extensions (https://github.com/FreshRSS/Extensions/commits/master)

POSTINSTALL.md

@@ -1,16 +1,7 @@
-<sso>
-On first visit, sign in using the built-in Cloudron authentication and then make the user administrator
-by running:
-```
-php cli/reconfigure.php --default_user YOUR_USERNAME
-```
-</sso>
-
 <nosso>
 This app is pre-setup with an admin account. The initial credentials are:
   
 **Username**: admin<br/>
 **Password**: changeme<br/>
 
-Please change the admin password immediately.
 </nosso>

apache/freshrss.conf

@@ -36,6 +36,9 @@ ServerName %{HTTP_HOST}
 
 
     <IfDefine OIDC_ENABLED>
+
+        # CLOUDRON_OIDC_PROVIDER_NAME is not supported
+
         OIDCProviderMetadataURL ${CLOUDRON_OIDC_DISCOVERY_URL}
         OIDCClientID ${CLOUDRON_OIDC_CLIENT_ID}
         OIDCClientSecret ${CLOUDRON_OIDC_CLIENT_SECRET}

renovate.json5

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": ["local>devops/renovator//default.renovate.json5"]
+}

test/package.json

@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^125.0.1",
+    "chromedriver": "^133.0.2",
     "expect.js": "^0.3.1",
-    "mocha": "^10.4.0",
-    "selenium-webdriver": "^4.21.0",
-    "superagent": "^9.0.2"
+    "mocha": "^11.1.0",
+    "selenium-webdriver": "^4.29.0",
+    "superagent": "^10.1.1"
   }
 }

test/test.js

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
 
-/* jshint esversion: 8 */
-/* global describe */
-/* global before */
-/* global after */
-/* global it */
-/* global xit */
+/* global it, xit, describe, before, after, afterEach */
 
 'use strict';
 
@@ -13,6 +8,7 @@ require('chromedriver');
 
 const execSync = require('child_process').execSync,
     expect = require('expect.js'),
+    fs = require('fs'),
     path = require('path'),
     superagent = require('superagent'),
     { Builder, By, Key, until } = require('selenium-webdriver'),
@@ -28,7 +24,7 @@ if (!process.env.USERNAME || !process.env.PASSWORD) {
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    const LOCATION = 'test';
+    const LOCATION = process.env.LOCATION || 'test';
     const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000;
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
@@ -39,16 +35,27 @@ describe('Application life cycle test', function () {
     let athenticated_by_oidc = false;
 
     before(function () {
-        const options = new Options().windowSize({ width: 1280, height: 1024 });
-        if (process.env.HEADLESS) options.addArguments('headless');
-
-        browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
+        const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
+        if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
+        browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
+        if (!fs.existsSync('./screenshots')) fs.mkdirSync('./screenshots');
     });
 
     after(function () {
         browser.quit();
     });
 
+    afterEach(async function () {
+        if (!process.env.CI || !app) return;
+
+        const currentUrl = await browser.getCurrentUrl();
+        if (!currentUrl.includes(app.domain)) return;
+        expect(this.currentTest.title).to.be.a('string');
+
+        const screenshotData = await browser.takeScreenshot();
+        fs.writeFileSync(`./screenshots/${new Date().getTime()}-${this.currentTest.title.replaceAll(' ', '_')}.png`, screenshotData, 'base64');
+    });
+
     function getAppInfo() {
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
@@ -77,15 +84,12 @@ describe('Application life cycle test', function () {
     async function loginOIDC(username, password) {
         browser.manage().deleteAllCookies();
         await browser.get(`https://${app.fqdn}/i/`);
-        await browser.sleep(6000);
 
         if (!athenticated_by_oidc) {
-            await waitForElement(By.xpath('//input[@name="username"]'));
-            await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
-            await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
-            await browser.sleep(2000);
-            await browser.findElement(By.xpath('//button[@type="submit" and contains(text(), "Sign in")]')).click();
-            await browser.sleep(2000);
+            await waitForElement(By.id('inputUsername'));
+            await browser.findElement(By.id('inputUsername')).sendKeys(username);
+            await browser.findElement(By.id('inputPassword')).sendKeys(password);
+            await browser.findElement(By.id('loginSubmitButton')).click();
 
             athenticated_by_oidc = true;
         }
@@ -112,7 +116,7 @@ describe('Application life cycle test', function () {
         await waitForElement(By.xpath('//input[@name="url_rss"]'));
         await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
         await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
-        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
+        await waitForElement(By.xpath('//div[@id="notification" and contains(@class, "good")]'));
     }
 
     async function addUser(username, password) {
@@ -121,7 +125,7 @@ describe('Application life cycle test', function () {
         await browser.findElement(By.id('new_user_name')).sendKeys(username);
         await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
         await browser.findElement(By.xpath('//button[text()="Create"]')).click();
-        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
+        await waitForElement(By.xpath('//div[@id="notification" and contains(@class, "good")]'));
     }
 
     async function enableApi() {
@@ -172,8 +176,8 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
 
+    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default-user ${USERNAME}"`); });
     it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
-    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default_user ${USERNAME}"`); });
     it('can subscribe', addSubscription);
     it('can enable API', enableApi);
     it('can check configuration', checkApiConfiguration);
@@ -215,9 +219,8 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
     it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
-    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default_user ${USERNAME}"`); });
+    it('can make user Administrator', function () { execSync(`cloudron exec --app ${app.id} -- bash -c "php cli/reconfigure.php --default-user ${USERNAME}"`); });
     it('can subscribe', addSubscription);
-    it('can add users', addUser.bind(null, 'test', admin_password));
 
     it('can update', function () {
         execSync('cloudron update --app ' + app.id, EXEC_ARGS);
@@ -226,6 +229,7 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     });
 
+    it('can add users', addUser.bind(null, 'test', admin_password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);