Bump version

CHANGELOG.md

@@ -205,3 +205,139 @@
 * Supported by RSS Guard #3627
 * Allow Unicode for shortcuts #3548
 
+[1.14.0]
+* Update FreshRSS to 1.19.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.0)
+
+[1.14.1]
+* Update FreshRSS to 1.19.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.1)
+
+[1.14.2]
+* Update apache configs
+
+[1.14.3]
+* Update FreshRSS to 1.19.2
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.19.2)
+* Improve dropdown menus on mobile view #4141, #4128
+* Fix regression regarding keeping read state after seeing favourites / labels #4178
+* Lots of code improvements, including improved support of PHP 8.1
+
+[1.15.0]
+* Update FreshRSS to 1.20.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.0)
+* New Web scraping feature HTML+XPath for Web pages without any RSS/ATOM feed #4220
+* Add support for Dynamic OPML #4407
+* New search engine supporting (nested) parentheses, also with negation #4378
+* Allow many (50k+) feeds #4347 and other performance improvements
+* New option to exclude some DOM elements with a CSS Selector when retrieving an article full content #4501
+* New option to automatically mark as read gone articles #4426
+* 2 new themes and plenty of UI improvements
+* Supported by Fluent Reader Lite client on Android and iOS #4595
+* Several bug fixes
+
+[1.15.1]
+* Update FreshRSS to 1.20.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.1)
+* Add support for custom XPath date/time format #4703
+* Add default redirect when authenticating #4778
+* Force default user before rendering login page #4620
+
+[1.15.2]
+* Update FreshRSS to 1.20.2
+* Update Cloudron base image to 4.0.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.20.2)
+* Fix security vulnerability in ext.php #4928 reported by @c3l3si4n
+
+[1.15.3]
+* Update FreshRSS extensions repo to f66efcf5f
+
+[1.16.0]
+* Update FreshRSS to 1.21.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.21.0)
+* New XML+XPath mode for fetching XML documents when there is no RSS/ATOM feed #5076
+* Better support of feed enclosures (image / audio / video attachments) #4944
+* User-defined time-zone #4906
+* New CLI script cli/sensitive-log.sh to help e.g. Apache clear logs for sensitive information such as credentials #5001
+* Mark some themes as tentatively deprecated: BlueLagoon, Flat, Screwdriver #4807
+* Many UI improvements
+
+[1.17.0]
+* Update base image to 4.2.0
+
+[1.18.0]
+* Update FreshRSS to 1.22.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.0)
+* Rework trusted proxies
+* Improve scaling with many feeds and long processes, reduce database locks
+* Fix many bugs and regressions
+* Improve themes Origine (also with automatic dark mode), Nord, etc.
+* Several UI / UX improvements
+* New languages Hungarian, Latvian, Persian
+
+[1.19.0]
+* Implement OIDC login
+
+[1.19.1]
+* Update FreshRSS to 1.22.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.22.1)
+* Fix regression in extensions translations (i18n)
+* Better identification of proxied client IP
+
+[1.20.0]
+* Update FreshRSS to 1.23.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.23.0)
+* New Important feeds group in the main view, with corresponding new priority level for feeds #5782
+* Entries from important feeds are not marked as read during scroll, during focus, nor during Mark all as read
+* Add filter actions (auto mark as read) at category level and at global levels #5942
+* Increase SQL fields length to maximum possible #5788, #5570
+* Many bug fixes
+* Soft require Apache 2.4+ (but repair minimal compatibility with Apache 2.2)
+* Upgraded extensions require FreshRSS 1.23.0+ Extensions#181
+
+[1.20.1]
+* Update FreshRSS to 1.23.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.23.0)
+* Fix crash regression with the option Max number of tags shown #5978
+* Fix crash regression when enabling extensions defined by old FreshRSS installations #5979
+* Fix crash regression during export when using MySQL #5988
+* More robust assignment of categories to feeds #5986
+
+[1.21.0]
+* Update FreshRSS to 1.24.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.24.0)
+* New shareable user query mechanism to share lists of articles by HTML, RSS, OPML
+* New CLI for database backup & restore
+* New JSON scraping mode to consume JSON data and JSON Feeds
+* New support for HTTP POST
+* 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
+

CloudronManifest.json

@@ -3,14 +3,16 @@
   "title": "FreshRSS",
   "author": "FreshRSS Developers",
   "description": "file://DESCRIPTION.md",
-  "changelog": "file://CHANGELOG",
+  "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.13.2",
+  "version": "1.21.3",
+  "upstreamVersion": "1.24.3",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
     "localstorage": {},
     "mysql": {},
+    "oidc": { "loginRedirectUri": "/i/oidc/" },
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
@@ -27,7 +29,8 @@
     "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "5.3.0",
+  "minBoxVersion": "7.5.1",
   "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
-  "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
+  "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/",
+  "optionalSso": true
 }

DESCRIPTION.md

@@ -1,5 +1,3 @@
-This app packages FreshRSS <upstream>1.18.1</upstream>.
-
 ## About
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.

Dockerfile

@@ -1,15 +1,17 @@
-FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
+
+RUN apt-get update && apt-get install --no-install-recommends -y libapache2-mod-auth-openidc && rm -rf /var/cache/apt /var/lib/apt/lists
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=1.18.1
+ARG VERSION=1.24.3
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1
 
-RUN mv data data-orig && ln -s /app/data data
+RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz | tar -zxvf - --strip-components=1 && \
+    mv data data-orig && ln -s /app/data data
 
-# official extensions
+# official extensions (https://github.com/FreshRSS/Extensions/commits/master)
-RUN wget https://github.com/FreshRSS/Extensions/archive/1784092164139dc6961ba5cc5b920331b586acbc.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+RUN wget https://github.com/FreshRSS/Extensions/archive/a82e080a1e68eb34539959a852fc5e800b7346dd.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
     mv /app/code/extensions /app/code/extensions-orig && \
     ln -s /app/data/extensions /app/code/extensions
 
@@ -22,19 +24,19 @@ RUN a2disconf other-vhosts-access-log
 ADD apache/freshrss.conf /etc/apache2/sites-enabled/freshrss.conf
 RUN echo "Listen 8000" > /etc/apache2/ports.conf
 
-RUN a2enmod headers expires deflate mime dir rewrite setenvif
+RUN a2enmod headers expires deflate mime dir rewrite setenvif auth_openidc
 
 RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.4/apache2/php.ini PHP upload_max_filesize 64M && \
+RUN crudini --set /etc/php/8.1/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/8.1/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/8.1/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.4/apache2/php.ini Session session.gc_divisor 100
+    crudini --set /etc/php/8.1/apache2/php.ini Session session.gc_divisor 100
 
-RUN ln -s /app/data/php.ini /etc/php/7.4/apache2/conf.d/99-cloudron.ini && \
+RUN ln -s /app/data/php.ini /etc/php/8.1/apache2/conf.d/99-cloudron.ini && \
-    ln -s /app/data/php.ini /etc/php/7.4/cli/conf.d/99-cloudron.ini
+    ln -s /app/data/php.ini /etc/php/8.1/cli/conf.d/99-cloudron.ini
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -1,7 +1,16 @@
+<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

@@ -1,3 +1,5 @@
+# https://github.com/FreshRSS/FreshRSS/blob/edge/Docker/FreshRSS.Apache.conf
+
 ServerName %{HTTP_HOST}
 
 <VirtualHost *:8000>
@@ -12,10 +14,42 @@ ServerName %{HTTP_HOST}
         Options +FollowSymLinks
         AllowOverride All
         Require all granted
-
-        <IfModule mod_php7.c>
-            php_value memory_limit 64m
-        </IfModule>
-
     </Directory>
+
+    <Directory /app/code/p/api>
+        Include /app/code/p/api/.htaccess
+    </Directory>
+
+    <Directory /app/code/p/i>
+        ExpiresActive Off
+
+        <IfDefine OIDC_ENABLED>
+            AuthType openid-connect
+            Require valid-user
+        </IfDefine>
+        IncludeOptional /app/code/p/i/.htaccess
+    </Directory>
+
+    <Directory /app/code/p/themes>
+        Include /app/code/p/themes/.htaccess
+    </Directory>
+
+
+    <IfDefine OIDC_ENABLED>
+        OIDCProviderMetadataURL ${CLOUDRON_OIDC_DISCOVERY_URL}
+        OIDCClientID ${CLOUDRON_OIDC_CLIENT_ID}
+        OIDCClientSecret ${CLOUDRON_OIDC_CLIENT_SECRET}
+
+        OIDCRedirectURI /i/oidc/
+
+        OIDCCryptoPassphrase ${OIDC_CRYPTO_PASSPHRASE}
+
+        OIDCRemoteUserClaim sub
+
+        OIDCScope "openid profile email"
+
+        OIDCRefreshAccessTokenBeforeExpiry 30
+        OIDCPassClaimsAs headers
+        OIDCXForwardedHeaders X-Forwarded-Proto
+    </IfDefine>
 </VirtualHost>

start.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-mkdir -p /run/php/session
+mkdir -p /run/php/session /app/data/extensions
 
 if ! [ -f /app/data/.installed ]; then
     echo "==> Fresh installation, setting up..."
@@ -13,7 +13,11 @@ if ! [ -f /app/data/.installed ]; then
       --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
       --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
       --disable_update
+
+    if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
         php cli/create-user.php --user admin --password changeme --language en
+    fi
+
     touch /app/data/.installed
     echo "==> Done."
 fi
@@ -29,14 +33,21 @@ ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
 
 # We have to copy instead of symlinking extensions (see #2)
 echo "==> Copying packaged extensions"
-mkdir -p /app/data/extensions
 for f in $(ls /app/code/extensions-orig); do
     rm -rf "/app/data/extensions/$f"
     cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
 done
 
 echo "==> Updating config file"
-php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \
+if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+    extra_args="--default_user admin"
+    [[ ! -f /app/data/.oauth_crypto_passphrase ]] && openssl rand -base64 42 > /app/data/.oauth_crypto_passphrase
+    export OIDC_CRYPTO_PASSPHRASE=$(</app/data/.oauth_crypto_passphrase) # used in apache config
+else
+    extra_args="--auth_type http_auth"
+fi
+
+php cli/reconfigure.php ${extra_args} --base_url "https://${CLOUDRON_APP_DOMAIN}" \
     --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
     --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
     --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
@@ -48,4 +59,4 @@ chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
 echo "==> Starting apache"
 APACHE_CONFDIR="" source /etc/apache2/envvars
 rm -f "${APACHE_PID_FILE}"
-exec /usr/sbin/apache2 -DFOREGROUND
+exec /usr/sbin/apache2 -D FOREGROUND $([[ -n "$CLOUDRON_OIDC_ISSUER" ]] && echo '-D OIDC_ENABLED')

test/package.json

@@ -9,14 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^91.0.1",
+    "chromedriver": "^128.0.1",
-    "ejs": "^3.1.6",
     "expect.js": "^0.3.1",
-    "mkdirp": "^1.0.4",
+    "mocha": "^10.7.3",
-    "mocha": "^9.0.0",
+    "selenium-webdriver": "^4.24.0",
-    "rimraf": "^3.0.2",
+    "superagent": "^10.1.0"
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^3.6.0",
-    "superagent": "^6.1.0"
   }
 }

test/test.js

@@ -1,55 +1,58 @@
 #!/usr/bin/env node
 
+/* jshint esversion: 8 */
+/* global describe */
+/* global before */
+/* global after */
+/* global it */
+/* global xit */
+
 'use strict';
 
 require('chromedriver');
 
-var execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
     superagent = require('superagent'),
-    webdriver = require('selenium-webdriver');
+    { Builder, By, Key, until } = require('selenium-webdriver'),
+    { Options } = require('selenium-webdriver/chrome');
 
-var by = webdriver.By,
+const admin_username = 'admin', admin_password = 'changeme';
-    Keys = webdriver.Key,
-    until = webdriver.until,
-    Builder = require('selenium-webdriver').Builder;
 
-var username = 'admin',
+if (!process.env.USERNAME || !process.env.PASSWORD) {
-    password = 'changeme';
+    console.log('USERNAME and PASSWORD env vars need to be set');
+    process.exit(1);
+}
 
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    var server, browser = new Builder().forBrowser('chrome').build();
+    const LOCATION = 'test';
+    const TEST_TIMEOUT = parseInt(process.env.TIMEOUT, 10) || 10000;
+    const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
 
-    before(function (done) {
+    const USERNAME = process.env.USERNAME;
-        var seleniumJar= require('selenium-server-standalone-jar');
+    const PASSWORD = process.env.PASSWORD;
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
 
-        done();
+    let browser, app;
+    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();
     });
 
-    after(function (done) {
+    after(function () {
         browser.quit();
-        server.stop();
-        done();
     });
 
-    var LOCATION = 'test';
+    function getAppInfo() {
-    var TEST_TIMEOUT = 10000;
+        var inspect = JSON.parse(execSync('cloudron inspect'));
-    var app;
+        app = inspect.apps.filter(function (a) { return a.location.indexOf(LOCATION) === 0; })[0];
-
+        expect(app).to.be.an('object');
-    function exists(selector) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT);
-    }
-
-    function visible(selector, callback) {
-        return exists(selector).then(function () {
-            return browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT);
-        });
     }
 
     function baseUrl() {
@@ -57,210 +60,171 @@ describe('Application life cycle test', function () {
         return `https://${app.fqdn}`;
     }
 
-    // we do this because it perm redirects to /p/ in old versions
+    async function waitForElement(elem) {
-    function clearCache() {
+        await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
-        // https://stackoverflow.com/questions/49614217/selenium-clear-chrome-cache
+        await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
-        // defaut clearance is 1 hour of cache
-        return browser.get('chrome://settings/clearBrowserData').then(function () {
-            return visible(by.css('* /deep/ #clearBrowsingDataConfirm'));
-        }).then(function () {
-            return browser.findElement(by.css('* /deep/ #clearBrowsingDataConfirm')).click();
-        }).then(function () {
-            return browser.sleep(5000);
-        });
     }
 
-    function login(password, callback) {
+    async function login(username, password) {
-        browser.get('https://' + app.fqdn).then(function () {
+        await browser.get('https://' + app.fqdn);
-            return visible(by.id('loginButton'));
+        await waitForElement(By.id('loginButton'));
-        }).then(function () {
+        await browser.findElement(By.id('username')).sendKeys(username);
-            return browser.findElement(by.id('username')).sendKeys(username);
+        await browser.findElement(By.id('passwordPlain')).sendKeys(password);
-        }).then(function () {
+        await browser.findElement(By.id('loginButton')).click();
-            return browser.findElement(by.id('passwordPlain')).sendKeys(password);
+        await waitForElement(By.id('btn-subscription'));
-        }).then(function () {
-            return browser.findElement(by.id('loginButton')).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
     }
 
-    function logout(callback) {
+    async function loginOIDC(username, password) {
-        var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
+        browser.manage().deleteAllCookies();
+        await browser.get(`https://${app.fqdn}/i/`);
 
-        browser.get('https://' + app.fqdn).then(function () {
+        if (!athenticated_by_oidc) {
-            return visible(by.id('stream'));
+            await waitForElement(By.id('inputUsername'));
-        }).then(function () {
+            await browser.findElement(By.id('inputUsername')).sendKeys(username);
-            return browser.findElement(by.className('dropdown-toggle')).click();
+            await browser.findElement(By.id('inputPassword')).sendKeys(password);
-        }).then(function () {
+            await browser.findElement(By.id('loginSubmitButton')).click();
-            return visible(logout_btn);
+
-        }).then(function () {
+            athenticated_by_oidc = true;
-            return browser.findElement(logout_btn).click();
-        }).then(function () {
-            return browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT);
-        }).then(function () {
-            callback();
-        });
         }
 
-    function addSubscription(callback) {
+        await waitForElement(By.id('btn-subscription'));
+    }
+
+    async function logout() {
+        var logout_btn = By.xpath('//li/a[@class="signout"]');
+
+        await browser.get('https://' + app.fqdn);
+        await waitForElement(By.id('stream'));
+        await browser.findElement(By.className('dropdown-toggle')).click();
+        await waitForElement(logout_btn);
+        await browser.findElement(logout_btn).click();
+        await waitForElement(By.id('loginButton'));
+    }
+
+    async function addSubscription() {
         var url = 'https://blog.cloudron.io/rss/';
         const addUrl = app.manifest.version === '1.10.0' ? `${baseUrl()}/i/?c=subscription` : `${baseUrl()}/i/?c=subscription&a=add`;
 
-        browser.get(addUrl).then(function () {
+        await browser.get(addUrl);
-            return visible(by.xpath('//input[@name="url_rss"]'));
+        await waitForElement(By.xpath('//input[@name="url_rss"]'));
-        }).then(function () {
+        await browser.findElement(By.xpath('//input[@name="url_rss"]')).sendKeys(url);
-            return browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
+        await browser.findElement(By.xpath('//form[@id="add_rss"]//button[text()="Add"]')).click();
-        }).then(function () {
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
-            return browser.findElement(by.xpath('//button[@type="submit"]/ancestor::form[@id="add_rss"]')).submit();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function addUser(password, callback) {
+    async function addUser(username, password) {
-        var test_username = 'test';
+        await browser.get(`${baseUrl()}/i/?c=user&a=manage`);
-
+        await waitForElement(By.id('new_user_name'));
-        browser.get(`${baseUrl()}/i/?c=user&a=manage`).then(function () {
+        await browser.findElement(By.id('new_user_name')).sendKeys(username);
-            return visible(by.id('new_user_name'));
+        await browser.findElement(By.id('new_user_passwordPlain')).sendKeys(password);
-        }).then(function () {
+        await browser.findElement(By.xpath('//button[text()="Create"]')).click();
-            return browser.findElement(by.id('new_user_name')).sendKeys(test_username);
+        await waitForElement(By.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            return browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
-        }).then(function () {
-            return browser.findElement(by.xpath('//button[text()="Create"]')).click();
-        }).then(function () {
-            return visible(by.xpath('//div[@id="notification" and @class="notification good"]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function enableApi(callback) {
+    async function enableApi() {
-        browser.get(`${baseUrl()}/i/?c=auth`).then(function () {
+        await browser.get(`${baseUrl()}/i/?c=auth`);
-            return browser.findElement(by.id('api_enabled')).click();
+        await waitForElement(By.id('api_enabled'));
-        }).then(function () {
+        await browser.findElement(By.id('api_enabled')).click();
-            return browser.findElement(by.xpath('//button[text()="Submit"]')).submit();
+        await browser.findElement(By.xpath('//button[text()="Submit"]')).click();
-        }).then(function () {
+        await browser.sleep(5000);
-            callback();
-        });
     }
 
-    function checkApiConfiguration(callback) {
+    async function checkApiConfiguration() {
-        browser.get(`${baseUrl()}/api/`).then(function () {
+        await browser.get(`${baseUrl()}/api/`);
-            return exists(by.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
+        await waitForElement(By.xpath('//dd[@id="greaderOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
+        await waitForElement(By.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
-            return exists(by.xpath('//dd[@id="feverOutput" and contains(text(), "PASS")]'));
-        }).then(function () {
-            callback();
-        });
     }
 
-    function getAppInfo() {
+    async function subscriptionExists() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
+        await browser.get(`${baseUrl()}/i/?get=c_1`);
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
+        return waitForElement(By.xpath('//span[text()="Cloudron"]'));
-        expect(app).to.be.an('object');
     }
 
-    function subscriptionExists(callback) {
+    async function getStaticExtensionFile() {
-        browser.get(`${baseUrl()}/i/?get=c_1`).then(function () {
+        const response = await superagent.get(`${baseUrl()}/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
-            return visible(by.xpath('//span[text()="Cloudron"]'));
-        }).then(function () {
-            callback();
-        });
-    }
-
-    function getStaticExtensionFile(callback) {
-        superagent.get(`${baseUrl()}/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
             .buffer(true)
-            .end(function (err, res) {
+            .ok(() => true);
-                expect(err).to.be(null);
+        expect(response.statusCode).to.be(200);
-                expect(res.status).to.be(200);
+        expect(response.text).to.contain('sticky_feeds'); // relies on the buffer flag above
-                expect(res.text).to.contain('sticky_feeds'); // relies on the buffer flag above
-                callback();
-        });
     }
 
-    xit('build app', function () {
+    xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    // No SSO
-    });
+    it('install app (no sso)', function () { execSync('cloudron install --no-sso --location ' + LOCATION, EXEC_ARGS); });
-
-    it('install app', function () {
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     it('can get app information', getAppInfo);
 
-    it('can login', login.bind(null, password));
+    it('can login', login.bind(null, admin_username, admin_password));
     it('can subscribe', addSubscription);
-    it('can add users', addUser.bind(null, password));
+    it('can add users', addUser.bind(null, 'test', admin_password));
     it('can enable API', enableApi);
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
     it('can logout', logout);
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
 
-    it('backup app', function () {
+    // SSO
-        execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+    it('install app (sso)', function () { execSync('cloudron install --location ' + LOCATION, EXEC_ARGS); });
-    });
 
-    it('restore app', function () {
+    it('can get app information', getAppInfo);
-        const backups = JSON.parse(execSync('cloudron backup list --raw'));
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        execSync('cloudron install --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        getAppInfo();
-        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
-    it('can login', login.bind(null, password));
+    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);
+    it('subscription exists', subscriptionExists);
+    it('can get static extension file', getStaticExtensionFile);
+
+    it('backup app', function () { execSync('cloudron backup create --app ' + app.id, EXEC_ARGS); });
+
+    it('restore app', function () {
+        const backups = JSON.parse(execSync(`cloudron backup list --raw --app ${app.id}`));
+        execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS);
+        execSync('cloudron install --location ' + LOCATION, EXEC_ARGS);
+        getAppInfo();
+        execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
+    });
+
+    it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
-    it('can logout', logout);
 
     it('move to different location', function () {
         browser.manage().deleteAllCookies();
-        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron configure --location ' + LOCATION + '2 --app ' + app.id, EXEC_ARGS);
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];
         expect(app).to.be.an('object');
     });
 
-    it('can login', login.bind(null, password));
+    it('can login OIDC', loginOIDC.bind(null, USERNAME, PASSWORD));
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
-    it('can logout', logout);
 
-    it('uninstall app', function () {
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     // test update
-    it('can install app', function () {
+    it('can install app for update', function () { execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, EXEC_ARGS); });
-        execSync('cloudron install --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 
     it('can get app information', getAppInfo);
-    it('can login', login.bind(null, password));
+    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 add users', addUser.bind(null, password));
 
     it('can update', function () {
-        execSync('cloudron update --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
+        execSync('cloudron update --app ' + app.id, EXEC_ARGS);
         var inspect = JSON.parse(execSync('cloudron inspect'));
         app = inspect.apps.filter(function (a) { return a.location === LOCATION; })[0];
         expect(app).to.be.an('object');
     });
 
-    it('can login', login.bind(null, password));
+    it('can add users', addUser.bind(null, 'test', admin_password));
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
 
-    it('uninstall app', function () {
+    it('uninstall app', function () { execSync('cloudron uninstall --app ' + app.id, EXEC_ARGS); });
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
 });