Update package version to 1.28.1

| datasource      | package           | from   | to     |
| --------------- | ----------------- | ------ | ------ |
| github-releases | FreshRSS/FreshRSS | 1.29.0 | 1.29.1 |

CHANGELOG

@@ -1,49 +0,0 @@
-[0.1.0]
-* Initial version
-
-[0.2.0]
-* Updated to base image 0.10.0
-* Supporting extensions
-
-[0.3.0]
-* No longer overwriting all config changes
-* Using cli scripts
-* Using scheduler for periodic task
-* Removed update menu item
-
-[0.4.0]
-* Updated to FreshRSS 1.6.3
-* Removed most custom patches (FreshRSS includes those now)
-
-[0.4.1]
-* Add parameter to allow for encoded slashes (thanks @Richard)
-* Updated description (thanks @Girish)
-
-[0.5.0]
-* Not using mysql port as this causes an error
-* Storing sessions in /run
-* Storing api logs in /tmp
-* Set some php options
-
-[0.6.0]
-* Updated to FreshRSS 1.7.0
-
-[0.7.0]
-* Updated to FreshRSS 1.8.0
-
-[0.8.0]
-* Update to FreshRSS 1.9.0
-
-[0.9.0]
-* Update to FreshRSS 1.10.2
-
-[0.10.0]
-* Better apache configs
-* Update extensions
-
-[1.0.0]
-* Fix issue where static extension assets were not served
-
-[1.1.0]
-* Update FreshRSS to 1.11.0
-

CHANGELOG.md

@@ -0,0 +1,497 @@
+[0.1.0]
+* Initial version
+
+[0.2.0]
+* Updated to base image 0.10.0
+* Supporting extensions
+
+[0.3.0]
+* No longer overwriting all config changes
+* Using cli scripts
+* Using scheduler for periodic task
+* Removed update menu item
+
+[0.4.0]
+* Updated to FreshRSS 1.6.3
+* Removed most custom patches (FreshRSS includes those now)
+
+[0.4.1]
+* Add parameter to allow for encoded slashes (thanks @Richard)
+* Updated description (thanks @Girish)
+
+[0.5.0]
+* Not using mysql port as this causes an error
+* Storing sessions in /run
+* Storing api logs in /tmp
+* Set some php options
+
+[0.6.0]
+* Updated to FreshRSS 1.7.0
+
+[0.7.0]
+* Updated to FreshRSS 1.8.0
+
+[0.8.0]
+* Update to FreshRSS 1.9.0
+
+[0.9.0]
+* Update to FreshRSS 1.10.2
+
+[0.10.0]
+* Better apache configs
+* Update extensions
+
+[1.0.0]
+* Fix issue where static extension assets were not served
+
+[1.1.0]
+* Update FreshRSS to 1.11.0
+
+[1.1.1]
+* Update FreshRSS to to 1.11.1
+
+[1.1.2]
+* Update FreshRSS to 1.11.2
+
+[1.2.0]
+* Use latest base image
+
+[1.3.0]
+* Update FreshRSS to 1.12.0
+* Features
+  * Ability to add labels (custom tags) to articles #928
+  * Handle article tags containing spaces, as well as comma-separated tags #2023
+  * Handle authors containing spaces, as well as comma or semi-colon separated authors #2025
+  * Searches by tag, author, etc. accept Unicode characters #2025
+  * New option to disable cache for feeds with invalid HTTP caching #2052
+* UI
+  * New theme Swage #2069
+  * Click on authors to initiate a search by author #2025
+  * Fix CSS for button alignments in older Chrome versions #2020
+* Security
+  * Improved flow for password change (avoid error 403) #2056
+  * Allow dot . in username (best to avoid, though) #2061
+* Performance
+  * Remove some counterproductive preload / prefetch rules #2040
+  * Improved fast flush (earlier transfer, fetching of resources, and rendering) #2045
+
+[1.4.0]
+* Update FreshRSS to 1.13.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/blob/1.13.0/CHANGELOG.md)
+* Improvements to the Google Reader API #2093
+* Support for Vienna RSS (client for Mac OS X) #2091
+* Ability to import XML files exported from Tiny-Tiny-RSS #2079
+* Ability to show all the feeds that have a warning #2146
+* Share with Pinboard #1972
+
+[1.5.0]
+* Fix security issue where root directory was exposed
+* Enable mod rewrite for mobile apps like FeedMe to work
+
+[1.5.1]
+* Update FreshRSS to 1.13.1
+
+[1.6.0]
+* Update FreshRSS to 1.14.0
+* Update extensions to 0812ee05c24c
+
+[1.6.1]
+* Update FreshRSS to 1.14.1
+* Fix load more articles when using ascending order #2314
+* Fix the use of arrow keyboard keys for shortcuts #2316
+* Fix control+click or middle-click for opening articles in a background tab #2310
+* Fix the naming of the option to unfold categories #2307
+* Fix shortcut problem when using unfolded articles #2328
+* Fix auto-hiding articles #2323
+* Fix scroll functions with Edge #2337
+* Fix drop-down menu warning #2353
+* Fix delay for individual mark-as-read actions #2332
+* Fix scroll functions in Edge #2337
+
+[1.6.2]
+* Update FreshRSS to 1.14.2
+* Fix minor code syntax warning in API #2362
+
+[1.6.3]
+* Update FreshRSS to 1.14.3
+* New configuration page for each category #2369
+* Update shortcut configuration page #2405
+* CSS style for printing #2149
+* Do not hide multiple <br /> tags #2437
+* Updated to jQuery 3.4.1 (only for statistics page) #2424
+
+[1.7.0]
+* Update FreshRSS to 1.15.0
+* New archiving method, including maximum number of articles per feed, and settings at feed, category, global levels #2335
+* New option to control category sort order #2592
+* New option to display article authors underneath the article title #2487
+* Add e-mail capability #2476, #2481
+* Ability to define default user settings in data/config-user.custom.php #2490
+* Including default feeds #2515
+* Allow recreating users if they still exist in database #2555
+* Add optional database connection URI parameters #2549, #2559
+* Allow longer articles with MySQL / MariaDB (up to 16MB compressed instead of 64kB) #2448
+* Add support for terms of service #2520
+* Add sharing with Lemmy #2510
+
+[1.7.1]
+* Update FreshRSS to 1.15.1
+
+[1.7.2]
+* Update FreshRSS to 1.15.2
+
+[1.7.3]
+* Update FreshRSS to 1.15.3
+
+[1.8.0]
+* Update FreshRSS to 1.16.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.0)
+* Allow multiple users to have administration rights #2096
+* Preview the CSS rule to retrieve full article content #2778
+* Improve CSS selector ordering in the full-text retrieval (lib_phpQuery) #2874
+* New search option !date: allowing to exclude any date interval #2869
+* New option to show all articles in the favourites view #2434
+* Allow feed to be actualized just after being truncated #2862
+* Fallback to showing a GUID when an article title is empty #2813
+
+[1.9.0]
+* Use latest base image 2.0.0
+
+[1.9.1]
+* Update FreshRSS to 1.16.2
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.16.1)
+* Add the possibility to filter by feed IDs #2892
+  * like f:123 more-search or multiple feed IDs like f:123,234,345 more-search or an exclusion like !f:456,789 more-search
+* Show users last activity date #2936
+* Ability to follow HTML redirections when retrieving full article content #2985
+
+[1.10.0]
+* Add forum url and update screenshot links
+
+[1.11.0]
+* Update FreshRSS to 1.17.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.17.0)
+* New tag management page #3121
+* New page to add feeds and categories #3027
+* Add a way to disable/enable users #3056
+* Fix special characters in user queries #3037
+* Hide feed credentials when adding a new feed #3099
+* Trim whitespace for feed passwords #3158
+* Updated PHPMailer library to 6.1.6 #3024
+* Add blogger.com to the default list of forced HTTPS #3088
+
+[1.12.0]
+* Update base image to v3
+* Update PHP to 7.4
+
+[1.13.0]
+* Update FreshRSS to 1.18.0
+* [Full changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.18.0)
+* Allow parallel requests #3096 - Much faster manual feeds refresh
+* Reload full article content when an article has changed #3506
+* New share article link to clipboard #3330
+* Improved OPML import of feeds with multiple categories #3286
+* Add a content action parameter to work with CSS selector #3453
+* New cURL options per feed: proxy, cookie, user-agent #3367, #3494, #3516
+* Do not import feeds causing database errors (e.g. due to conflicting HTTP redirections) ##3347
+
+[1.13.1]
+* Fix apache config to log the client IP
+
+[1.13.2]
+* Update FreshRSS to 1.18.1
+* Support standard HTTP 410 Gone by disabling (muting) gone feeds #3561
+* Supported by Newsboat 2.24+ #3574
+* 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
+
+[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
+
+[1.24.1]
+* Update FreshRSS to 1.26.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.1)
+* Fix back-compatibility with cURL 7.51 (we require cURL 7.52+ for `CURLPROXY_HTTPS`)
+* Add cURL version to page about system information
+* Fix regression with cURL HTTP headers breaking conditional HTTP requests
+* Fix regression with saving states of user queries
+* Fix regression with dynamic OPML
+* Fix update of the users last activity on login action
+* Fix setting category option *Maximum number of articles to keep per feed*
+* Fix priority field when processing a new feed from an extension
+* Use case-insensitive sort for categories
+* Improve dark mode of *Origine* theme
+
+[1.25.0]
+* Update base image to 5.0.0
+
+[1.25.1]
+* Update FreshRSS to 1.26.2
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.2)
+* Implement JSON string concatenation with & operator [#7414](https://github.com/FreshRSS/FreshRSS/pull/7414)
+* Support multiple JSON fragments in HTML+XPath+JSON mode [#7369](https://github.com/FreshRSS/FreshRSS/pull/7369)
+* Fix escaping of tag search [#7468](https://github.com/FreshRSS/FreshRSS/pull/7468)
+* Fix CLI parsing of Boolean flags [#7430](https://github.com/FreshRSS/FreshRSS/pull/7430)
+* Fix API for labels with slash [#7437](https://github.com/FreshRSS/FreshRSS/pull/7437)
+* Fix support for feeds with XML preamble + DTD [#7515](https://github.com/FreshRSS/FreshRSS/pull/7515), [simplepie#914](https://github.com/simplepie/simplepie/pull/914)
+* Disallow `<iframe srcdoc="">` [#7494](https://github.com/FreshRSS/FreshRSS/pull/7494), [CVE-2025-32015](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-wgrq-mcwc-8f8v)
+* Disallow `<button formaction="">` [#7506](https://github.com/FreshRSS/FreshRSS/pull/7506)
+* Improve favicons hash to avoid favicon pollution [#7505](https://github.com/FreshRSS/FreshRSS/pull/7505), [CVE-2025-46339](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-8f79-3q3w-43c4)
+* Add `Content-Security-Policy` HTTP headers to favicons [#7471](https://github.com/FreshRSS/FreshRSS/pull/7471), [CVE-2025-31136](https://github.com/FreshRSS/FreshRSS/security/advisories/GHSA-f6r4-jrvc-cfmr)
+
+[1.25.2]
+* Update FreshRSS to 1.26.3
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.26.3)
+* Keep sort and order criteria during navigation [#&#8203;7585](https://github.com/FreshRSS/FreshRSS/pull/7585)
+* Add info about `PDO::ATTR_CLIENT_VERSION` (relevant for MySQL / MariaDB with obsolete driver) [#&#8203;7591](https://github.com/FreshRSS/FreshRSS/pull/7591)
+* Fix SQL request for user labels with custom sort (affecting PostgreSQL) [#&#8203;7588](https://github.com/FreshRSS/FreshRSS/pull/7588)
+* Fix regression for favicon in GReader and Fever APIs [#&#8203;7573](https://github.com/FreshRSS/FreshRSS/pull/7573)
+* Fix newest articles (within last second) not shown [#&#8203;7577](https://github.com/FreshRSS/FreshRSS/pull/7577)
+* Fix duplicate HTTP header for POST [#&#8203;7556](https://github.com/FreshRSS/FreshRSS/pull/7556)
+* Fix important articles on reader view [#&#8203;7602](https://github.com/FreshRSS/FreshRSS/pull/7602)
+* Fix remove last share method [#&#8203;7613](https://github.com/FreshRSS/FreshRSS/pull/7613)
+* Fix API handling of default category [#&#8203;7610](https://github.com/FreshRSS/FreshRSS/pull/7610)
+* Fix user self-deletion [#&#8203;7626](https://github.com/FreshRSS/FreshRSS/pull/7626)
+
+[1.26.0]
+* Update FreshRSS to 1.27.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.27.0)
+* Implement support for HTTP `429 Too Many Requests` and `503 Service Unavailable`, obey `Retry-After` [#&#8203;7760](https://github.com/FreshRSS/FreshRSS/pull/7760)  
+* Add sort by category title, or by feed title [#&#8203;7702](https://github.com/FreshRSS/FreshRSS/pull/7702)  
+* Add search operator `c:` for categories like `c:23,34` or `!c:45,56` [#&#8203;7696](https://github.com/FreshRSS/FreshRSS/pull/7696)  
+* Custom feed favicons [#&#8203;7646](https://github.com/FreshRSS/FreshRSS/pull/7646), [#&#8203;7704](https://github.com/FreshRSS/FreshRSS/pull/7704), [#&#8203;7717](https://github.com/FreshRSS/FreshRSS/pull/7717), [#&#8203;7792](https://github.com/FreshRSS/FreshRSS/pull/7792)  
+* Rework fetch favicons for fewer HTTP requests [#&#8203;7767](https://github.com/FreshRSS/FreshRSS/pull/7767)  
+* Add more unicity criteria based on title and/or content [#&#8203;7789](https://github.com/FreshRSS/FreshRSS/pull/7789)  
+* Automatically restore user configuration from backup [#&#8203;7682](https://github.com/FreshRSS/FreshRSS/pull/7682)  
+* API add support for states in `s` parameter of `streamId` [#&#8203;7695](https://github.com/FreshRSS/FreshRSS/pull/7695)  
+* Improve sharing via Print [#&#8203;7728](https://github.com/FreshRSS/FreshRSS/pull/7728)  
+* Redirect to the login page from bookmarklet instead of 403 [#&#8203;7782](https://github.com/FreshRSS/FreshRSS/pull/7782)
+
+[1.26.1]
+* Update FreshRSS to 1.27.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.27.1)
+* Automatic database recovery: skip broken entries during CLI export/import [#&#8203;7949](https://github.com/FreshRSS/FreshRSS/pull/7949)  
+* Add security option for CSP `frame-ancestors` [#&#8203;7857](https://github.com/FreshRSS/FreshRSS/pull/7857), [#&#8203;8021](https://github.com/FreshRSS/FreshRSS/pull/8021)  
+* Lazy-load `<track src>` [#&#8203;7997](https://github.com/FreshRSS/FreshRSS/pull/7997)  
+* Regenerate session ID on login [#&#8203;7829](https://github.com/FreshRSS/FreshRSS/pull/7829)  
+* Disallow setting non-existent language [#&#8203;7878](https://github.com/FreshRSS/FreshRSS/pull/7878), [#&#8203;7934](https://github.com/FreshRSS/FreshRSS/pull/7934)  
+* Safer calling of `install.php` [#&#8203;7971](https://github.com/FreshRSS/FreshRSS/pull/7971)  
+* Prevent log CR/LF injection [#&#8203;7883](https://github.com/FreshRSS/FreshRSS/pull/7883)  
+* Restrict allowed cURL parameters [#&#8203;7979](https://github.com/FreshRSS/FreshRSS/pull/7979), [#&#8203;8009](https://github.com/FreshRSS/FreshRSS/pull/8009)  
+* Fix reauthentication while updating [#&#8203;7989](https://github.com/FreshRSS/FreshRSS/pull/7989)  
+* Fix some CSRFs [#&#8203;8000](https://github.com/FreshRSS/FreshRSS/pull/8000)
+
+[1.27.0]
+* Update FreshRSS to 1.28.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.28.0)
+* Move unsafe autologin to an extension [#7958](https://github.com/FreshRSS/FreshRSS/pull/7958)
+* Housekeeping of `lib_rss.php` with potential breaking changes for some extensions [#8193](https://github.com/FreshRSS/FreshRSS/pull/8193)
+* New sorting and filtering by date of *User modified* [#7886](https://github.com/FreshRSS/FreshRSS/pull/7886), [#8090](https://github.com/FreshRSS/FreshRSS/pull/8090), [#8105](https://github.com/FreshRSS/FreshRSS/pull/8105), [#8118](https://github.com/FreshRSS/FreshRSS/pull/8118), [#8130](https://github.com/FreshRSS/FreshRSS/pull/8130)
+* New sorting by article length [#8119](https://github.com/FreshRSS/FreshRSS/pull/8119)
+* New advanced search form [#8103](https://github.com/FreshRSS/FreshRSS/pull/8103), [#8122](https://github.com/FreshRSS/FreshRSS/pull/8122), [#8226](https://github.com/FreshRSS/FreshRSS/pull/8226)
+* Add compatibility with PCRE word boundary `\b` and `\B` for regex search using PostgreSQL [#8141](https://github.com/FreshRSS/FreshRSS/pull/8141)
+* More uniform SQL search and PHP search for accents and case-sensitivity (e.g. for automatically marking as read) [#8329](https://github.com/FreshRSS/FreshRSS/pull/8329)
+* New overview of dates with most unread articles [#8089](https://github.com/FreshRSS/FreshRSS/pull/8089)
+* Exclude local networks for domain-wide HTTP `Retry-After` [#8195](https://github.com/FreshRSS/FreshRSS/pull/8195)
+* Fix OpenID Connect with Debian 13 [#8032](https://github.com/FreshRSS/FreshRSS/pull/8032)
+
+[1.27.1]
+* Update FreshRSS to 1.28.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.28.1)
+* Handle Web scraping of `text/plain` as `<pre class="text-plain">` [#&#8203;8340](https://github.com/FreshRSS/FreshRSS/pull/8340)
+* New customisable message for closed registrations [#&#8203;8462](https://github.com/FreshRSS/FreshRSS/pull/8462)
+* Fix unwanted expansion of user queries (saved searches) applied to filters [#&#8203;8395](https://github.com/FreshRSS/FreshRSS/pull/8395)
+* Fix encoding of filter actions for labels [#&#8203;8368](https://github.com/FreshRSS/FreshRSS/pull/8368)
+* Fix searching of tags [#&#8203;8425](https://github.com/FreshRSS/FreshRSS/pull/8425)
+* Fix refreshing feeds with token while anonymous refresh is disabled [#&#8203;8371](https://github.com/FreshRSS/FreshRSS/pull/8371)
+* Fix RSS and OPML access by token [#&#8203;8434](https://github.com/FreshRSS/FreshRSS/pull/8434)
+* Fix MySQL/MariaDB `transliterator_transliterate` fallback (when the `php-intl` extension is unavailable) [#&#8203;8427](https://github.com/FreshRSS/FreshRSS/pull/8427)
+* Fix regression with MySQL/MariaDB index hint [#&#8203;8460](https://github.com/FreshRSS/FreshRSS/pull/8460)
+* Auto-add `lastUserModified` database column also during mark-as-read action [#&#8203;8346](https://github.com/FreshRSS/FreshRSS/pull/8346)
+
+[1.28.0]
+* Update FreshRSS to 1.29.0
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.29.0)
+* New sort order preferences at global, category, and feed levels [#8234](https://github.com/FreshRSS/FreshRSS/pull/8234)
+* New filtering by date of *Server modification date* [#8131](https://github.com/FreshRSS/FreshRSS/pull/8131), [#8576](https://github.com/FreshRSS/FreshRSS/pull/8576)
+* New option to automatically mark new articles as read if an identical GUID already exists in the same category [#8673](https://github.com/FreshRSS/FreshRSS/pull/8673)
+* Add option to enable/disable notifications, also for PWA [#8458](https://github.com/FreshRSS/FreshRSS/pull/8458)
+* Fix wrong search `toString` in case of regex-looking string [#8479](https://github.com/FreshRSS/FreshRSS/pull/8479)
+* Fix redirect to wrong view after mark as read in *reader* and *global* views [#8552](https://github.com/FreshRSS/FreshRSS/pull/8552)
+* Fix do not include hidden feeds when counting total number of unread articles [#8715](https://github.com/FreshRSS/FreshRSS/pull/8715)
+* Limit cURL to protocols HTTP, HTTPS [#8713](https://github.com/FreshRSS/FreshRSS/pull/8713)
+* New Webhook extension for automated RSS notifications [Extensions#456](https://github.com/FreshRSS/Extensions/pull/456)
+* New `cli/purge.php` to apply purge policy [#8740](https://github.com/FreshRSS/FreshRSS/pull/8740)
+
+[1.28.1]
+* Update FreshRSS to 1.29.1
+* [Full Changelog](https://github.com/FreshRSS/FreshRSS/releases/tag/1.29.1)
+* Accept `.txt` import of feed URLs in additional to e.g. OPML [#8818](https://github.com/FreshRSS/FreshRSS/pull/8818), [#8837](https://github.com/FreshRSS/FreshRSS/pull/8837)
+* New CLI for automatic periodic SQLite export with retention [#8819](https://github.com/FreshRSS/FreshRSS/pull/8819)
+* More feed info: last received date, publication date [#8799](https://github.com/FreshRSS/FreshRSS/pull/8799)
+* Fix cookies with some browsers [#8867](https://github.com/FreshRSS/FreshRSS/pull/8867)
+* Fix search in shared user queries with empty results [#8863](https://github.com/FreshRSS/FreshRSS/pull/8863)
+* Fix XML errors with loading invalid OPML in `lib_opml` library [#8652](https://github.com/FreshRSS/FreshRSS/pull/8652), [#8853](https://github.com/FreshRSS/FreshRSS/pull/8853), [lib_opml#48](https://framagit.org/marienfressinaud/lib_opml/-/merge_requests/48), [lib_opml#51](https://framagit.org/marienfressinaud/lib_opml/-/merge_requests/51)
+* Fix ensure maximum number of feeds also with Dynamic OPML [#8832](https://github.com/FreshRSS/FreshRSS/pull/8832)
+* Fix click mark as read [#8817](https://github.com/FreshRSS/FreshRSS/pull/8817)
+

CloudronManifest.json

@@ -3,22 +3,36 @@
   "title": "FreshRSS",
   "author": "FreshRSS Developers",
   "description": "file://DESCRIPTION.md",
-  "changelog": "file://CHANGELOG",
+  "changelog": "file://CHANGELOG.md",
   "tagline": "RSS feed reader",
-  "version": "1.1.0",
+  "version": "1.28.1",
+  "upstreamVersion": "1.29.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "addons": {
     "localstorage": {},
     "mysql": {},
+    "oidc": {
+      "loginRedirectUri": "/i/oidc/"
+    },
     "scheduler": {
       "update_feeds": {
         "schedule": "*/1 * * * *",
-        "command": "/usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
+        "command": "echo '==> Run actualize script' && /usr/local/bin/gosu www-data:www-data php /app/code/app/actualize_script.php"
       }
     }
   },
-  "manifestVersion": 1,
+  "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",
@@ -28,12 +42,15 @@
     "greader",
     "reader",
     "news",
-    "feeds"
+    "feeds",
+    "feedly"
   ],
   "mediaLinks": [
-    "https://s3.amazonaws.com/cloudron-app-screenshots/org.freshrss.cloudronapp/7d731e71a6faa3791e19b7d7daf468a9486349cc/1.png"
+    "https://screenshots.cloudron.io/org.freshrss.cloudronapp/1.png"
   ],
   "postInstallMessage": "file://POSTINSTALL.md",
-  "minBoxVersion": "2.0.0",
-  "documentationUrl": "https://cloudron.io/documentation/apps/freshrss/"
+  "minBoxVersion": "8.1.0",
+  "forumUrl": "https://forum.cloudron.io/category/27/freshrss",
+  "documentationUrl": "https://cloudron.io/documentation/packages/freshrss/",
+  "optionalSso": true
 }

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages FreshRSS <upstream>1.11.0</upstream>.
+## About
 
 FreshRSS is a self-hosted RSS feed aggregator such as Leed or Kriss Feed.
 
@@ -6,12 +6,13 @@ It is at the same time lightweight, easy to work with, powerful and customizable
 
 It is a multi-user application with an anonymous reading mode. It supports PubSubHubbub for instant notifications from compatible Web sites. There is an API for (mobile) clients, and a Command-Line Interface. Finally, it supports extensions for further tuning.
 
-### Extensions
+## Extensions
+
 FreshRSS supports further customizations by adding extensions on top of its core functionality.
 See the [repository dedicated to those extensions](https://github.com/FreshRSS/Extensions).
 
 
-### Compatible clients
+## Compatible clients
 Any client supporting a Google Reader-like API. Selection:
 
 * Android
@@ -19,3 +20,6 @@ Any client supporting a Google Reader-like API. Selection:
 	* [EasyRSS](https://github.com/Alkarex/EasyRSS) (Open source, F-Droid)
 * Linux
 	* [FeedReader 2.0+](https://jangernert.github.io/FeedReader/) (Open source)
+* Mac/iOS
+    * [Reeder](https://reederapp.com/)
+

Dockerfile

@@ -1,21 +1,18 @@
-FROM cloudron/base:0.10.0
+FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
 
-RUN apt-get update \
-    && apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
-       libapache2-mod-php mysql-client php-mysql
-
-ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
+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
 
-# contains fix for extensions_path (see #2)
-RUN curl -L https://github.com/FreshRSS/FreshRSS/archive/1.11.0.tar.gz | tar -zxvf - --strip-components=1
+# renovate: datasource=github-releases depName=FreshRSS/FreshRSS versioning=semver
+ARG FRESHRSS_VERSION=1.29.1
 
-RUN mv data data-orig && ln -s /app/data data
+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
-RUN wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - | tar -xz --strip-components=1 -C /app/code/extensions && \
+# official extensions (https://github.com/FreshRSS/Extensions/commits/master)
+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
 
@@ -28,18 +25,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
+RUN a2enmod headers expires deflate mime dir rewrite setenvif auth_openidc
 
-RUN rm -rf /var/lib/php \
-    && ln -s /run/php /var/lib/php \
-    && mkdir -p /run/php/session
+RUN rm -rf /var/lib/php && ln -s /run/php /var/lib/php
 
-RUN crudini --set /etc/php/7.0/apache2/php.ini PHP upload_max_filesize 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini PHP post_max_size 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini PHP memory_limit 64M && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.save_path /run/php/session && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_probability 1 && \
-    crudini --set /etc/php/7.0/apache2/php.ini Session session.gc_divisor 100
+RUN crudini --set /etc/php/8.3/apache2/php.ini PHP upload_max_filesize 64M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP post_max_size 64M && \
+    crudini --set /etc/php/8.3/apache2/php.ini PHP memory_limit 64M && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.save_path /run/php/session && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_probability 1 && \
+    crudini --set /etc/php/8.3/apache2/php.ini Session session.gc_divisor 100
+
+RUN ln -s /app/data/php.ini /etc/php/8.3/apache2/conf.d/99-cloudron.ini && \
+    ln -s /app/data/php.ini /etc/php/8.3/cli/conf.d/99-cloudron.ini
 
 ADD start.sh /app/code/start.sh
 

POSTINSTALL.md

@@ -1,10 +1,7 @@
-This application does not integrate with Cloudron authentication.
+<nosso>
+This app is pre-setup with an admin account. The initial credentials are:
   
-There is a preconfigured administrator account with the following credentials:
+**Username**: admin<br/>
+**Password**: changeme<br/>
 
-* Username: `admin`
-* Password: `password`
-
-(Please change that password on first login)
-
-You can create more accounts withing the app when logged in as administrator.
+</nosso>

README.md

@@ -34,3 +34,18 @@ npm install
 PATH=$PATH:node_modules/.bin mocha --bail test.js
 ```
 
+## Debugging
+
+
+* Update your data/config.php with the following, to get more debugging information:
+
+```
+'environment' => 'development',
+
+```
+
+* Check your logs:
+  * Web server / PHP logs
+  * FreshRSS API log in ./data/users/_/log_api.txt
+  * FreshRSS logs in ./data/users/you/log.txt
+

apache/freshrss.conf

@@ -1,18 +1,60 @@
+# https://github.com/FreshRSS/FreshRSS/blob/edge/Docker/FreshRSS.Apache.conf
+
+ServerName localhost
+
 <VirtualHost *:8000>
-    DocumentRoot /app/code  
+    ServerName localhost
+    UseCanonicalName Off
+    DocumentRoot /app/code/p
     AllowEncodedSlashes On
 
-    ErrorLog /dev/stderr 
-    CustomLog /dev/stdout combined
+    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
+    CustomLog "|/bin/cat" proxy
+    ErrorLog "|/bin/cat"
 
-    <Directory /app/code/>
+    <Directory /app/code/p/>
         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>
+
+        # CLOUDRON_OIDC_PROVIDER_NAME is not supported
+
+        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>

apache/mpm_prefork.conf

@@ -9,7 +9,7 @@
 	MaxSpareServers 3
 
     # Maximum number of servers at any given instant. Requests will be queued after this
-	MaxRequestWorkers	  6
+	MaxRequestWorkers	  10
 
     # Recycle process after handling these many requests. This protected against accidental memory leaks
 	MaxConnectionsPerChild   100

renovate.json5

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

start.sh

@@ -2,51 +2,61 @@
 
 set -eu
 
-mkdir -p /run/php/sessions
+mkdir -p /run/php/session /app/data/extensions
 
 if ! [ -f /app/data/.installed ]; then
-  echo "Fresh installation, setting up..."
+    echo "==> Fresh installation, setting up..."
     rsync -a /app/code/data-orig/ /app/data/
     php cli/do-install.php \
       --environment production --default_user admin \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+      --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 "" \
       --disable_update
-  php cli/create-user.php --user admin --password password --language en
-  php cli/actualize-user.php --user admin
-  touch /app/data/.installed
-  echo "Done."
+
+    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
 
-echo "Symlinking log file"
+if [[ ! -f /app/data/php.ini ]]; then
+    echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
+fi
+
+echo "==> Symlinking log file"
 rm -f /app/data/users/_/log_api.txt
 touch /tmp/log_api.txt
 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
+echo "==> Copying packaged 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"
+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
 
-echo "Updating config file"
-php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}/p" \
-    --db-type mysql --db-host "${MYSQL_HOST}" \
-    --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \
-    --db-base "${MYSQL_DATABASE}" --db-prefix "" \
+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 "" \
     --disable_update
 
+echo "==> Setting permissions"
+chown -R www-data:www-data /run/php /app/data /tmp/log_api.txt
 
-echo "Setting permissions"
-chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt
-
-
-echo "Starting apache"
+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-lock.json

@@ -1,984 +0,0 @@
-{
-  "name": "test",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "adm-zip": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz",
-      "integrity": "sha1-ph7VrmkFw66lizplfSUDMJEFJzY="
-    },
-    "ajv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "requires": {
-        "co": "4.6.0",
-        "fast-deep-equal": "1.1.0",
-        "fast-json-stable-stringify": "2.0.0",
-        "json-schema-traverse": "0.3.1"
-      }
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "requires": {
-        "array-uniq": "1.0.3"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
-    },
-    "asn1": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
-    },
-    "aws4": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "optional": true,
-      "requires": {
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.2.1"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "chromedriver": {
-      "version": "2.38.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.38.3.tgz",
-      "integrity": "sha512-tczy6RHl0LOVA4p+xezcu3NRjr9A1iLyyfjP9yPIUynvV28YSKH/Ll1iw0jMCjN9jwtaB2HB4aPjv0Uuw2VARw==",
-      "requires": {
-        "del": "3.0.0",
-        "extract-zip": "1.6.6",
-        "kew": "0.7.0",
-        "mkdirp": "0.5.1",
-        "request": "2.85.0"
-      }
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
-    },
-    "combined-stream": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
-      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "requires": {
-        "delayed-stream": "1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
-      "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM="
-    },
-    "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
-      "requires": {
-        "inherits": "2.0.3",
-        "readable-stream": "2.3.5",
-        "typedarray": "0.0.6"
-      }
-    },
-    "cookiejar": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.6.tgz",
-      "integrity": "sha1-Cr81atANHFohnYjURRgEbdAmrP4="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-          "requires": {
-            "hoek": "4.2.1"
-          }
-        }
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "requires": {
-        "globby": "6.1.0",
-        "is-path-cwd": "1.0.0",
-        "is-path-in-cwd": "1.0.0",
-        "p-map": "1.2.0",
-        "pify": "3.0.0",
-        "rimraf": "2.6.2"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "diff": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
-      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8="
-    },
-    "ecc-jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "optional": true,
-      "requires": {
-        "jsbn": "0.1.1"
-      }
-    },
-    "ejs": {
-      "version": "2.5.7",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
-      "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
-      "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE="
-    },
-    "expect.js": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
-      "integrity": "sha1-sKWaDS7/VDdUTr8M6qYBWEHQm1s="
-    },
-    "extend": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-    },
-    "extract-zip": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",
-      "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=",
-      "requires": {
-        "concat-stream": "1.6.0",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.0",
-        "yauzl": "2.4.1"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
-    },
-    "fast-deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
-    },
-    "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-      "requires": {
-        "pend": "1.2.0"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
-    },
-    "form-data": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
-      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.6",
-        "mime-types": "2.1.18"
-      }
-    },
-    "formidable": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz",
-      "integrity": "sha1-71SRSQ+UM7cF+qdyScmQKa40hVk="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "requires": {
-        "assert-plus": "1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.3",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
-      }
-    },
-    "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "requires": {
-        "array-union": "1.0.2",
-        "glob": "7.1.2",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
-        }
-      }
-    },
-    "growl": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8="
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
-    },
-    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "requires": {
-        "ajv": "5.5.2",
-        "har-schema": "2.0.0"
-      }
-    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "hoek": "4.2.1",
-        "sntp": "2.1.0"
-      }
-    },
-    "hoek": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "jsprim": "1.4.1",
-        "sshpk": "1.14.1"
-      }
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "requires": {
-        "once": "1.4.0",
-        "wrappy": "1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "requires": {
-        "is-path-inside": "1.0.1"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "requires": {
-        "path-is-inside": "1.0.2"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
-    },
-    "jade": {
-      "version": "0.26.3",
-      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
-      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
-      "requires": {
-        "commander": "0.6.1",
-        "mkdirp": "0.3.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
-          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY="
-        },
-        "mkdirp": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
-          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4="
-        }
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "optional": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
-    },
-    "json-schema-traverse": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "kew": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
-      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s="
-    },
-    "lru-cache": {
-      "version": "2.7.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz",
-      "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM="
-    },
-    "mime-db": {
-      "version": "1.33.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
-    },
-    "mime-types": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-      "requires": {
-        "mime-db": "1.33.0"
-      }
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "requires": {
-        "brace-expansion": "1.1.11"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "mocha": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
-      "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
-      "requires": {
-        "commander": "2.3.0",
-        "debug": "2.2.0",
-        "diff": "1.4.0",
-        "escape-string-regexp": "1.0.2",
-        "glob": "3.2.11",
-        "growl": "1.9.2",
-        "jade": "0.26.3",
-        "mkdirp": "0.5.1",
-        "supports-color": "1.2.0",
-        "to-iso-string": "0.0.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "requires": {
-            "ms": "0.7.1"
-          }
-        },
-        "glob": {
-          "version": "3.2.11",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
-          "requires": {
-            "inherits": "2.0.3",
-            "minimatch": "0.3.0"
-          }
-        },
-        "minimatch": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
-          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
-          "requires": {
-            "lru-cache": "2.7.3",
-            "sigmund": "1.0.1"
-          }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-        }
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "requires": {
-        "wrappy": "1.0.2"
-      }
-    },
-    "options": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
-    },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "requires": {
-        "pinkie": "2.0.4"
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
-    },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "readable-stream": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-      "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
-      "requires": {
-        "core-util-is": "1.0.2",
-        "inherits": "2.0.3",
-        "isarray": "1.0.0",
-        "process-nextick-args": "2.0.0",
-        "safe-buffer": "5.1.1",
-        "string_decoder": "1.0.3",
-        "util-deprecate": "1.0.2"
-      }
-    },
-    "reduce-component": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz",
-      "integrity": "sha1-4Mk1QsV0UhvqE98PlIjtgqt3xdo="
-    },
-    "request": {
-      "version": "2.85.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
-      "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
-      "requires": {
-        "aws-sign2": "0.7.0",
-        "aws4": "1.6.0",
-        "caseless": "0.12.0",
-        "combined-stream": "1.0.6",
-        "extend": "3.0.1",
-        "forever-agent": "0.6.1",
-        "form-data": "2.3.2",
-        "har-validator": "5.0.3",
-        "hawk": "6.0.2",
-        "http-signature": "1.2.0",
-        "is-typedarray": "1.0.0",
-        "isstream": "0.1.2",
-        "json-stringify-safe": "5.0.1",
-        "mime-types": "2.1.18",
-        "oauth-sign": "0.8.2",
-        "performance-now": "2.1.0",
-        "qs": "6.5.1",
-        "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
-        "tough-cookie": "2.3.4",
-        "tunnel-agent": "0.6.0",
-        "uuid": "3.2.1"
-      }
-    },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "requires": {
-        "glob": "7.1.2"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-    },
-    "sax": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz",
-      "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk="
-    },
-    "selenium-server-standalone-jar": {
-      "version": "2.53.1",
-      "resolved": "https://registry.npmjs.org/selenium-server-standalone-jar/-/selenium-server-standalone-jar-2.53.1.tgz",
-      "integrity": "sha1-T8P6+ktCaL2tDbst7KCwazT1SK4="
-    },
-    "selenium-webdriver": {
-      "version": "2.53.3",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.3.tgz",
-      "integrity": "sha1-0p/1qVff8aG0ncRXdW5OS/vc4IU=",
-      "requires": {
-        "adm-zip": "0.4.4",
-        "rimraf": "2.6.2",
-        "tmp": "0.0.24",
-        "ws": "1.1.5",
-        "xml2js": "0.4.4"
-      }
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA="
-    },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-      "requires": {
-        "hoek": "4.2.1"
-      }
-    },
-    "sshpk": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
-      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
-      "requires": {
-        "asn1": "0.2.3",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.1",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.1",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "tweetnacl": "0.14.5"
-      }
-    },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
-    },
-    "superagent": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-1.8.5.tgz",
-      "integrity": "sha1-HA3cOvMOgOuE68BcshItqP6UC1U=",
-      "requires": {
-        "component-emitter": "1.2.1",
-        "cookiejar": "2.0.6",
-        "debug": "2.6.9",
-        "extend": "3.0.0",
-        "form-data": "1.0.0-rc3",
-        "formidable": "1.0.17",
-        "methods": "1.1.2",
-        "mime": "1.3.4",
-        "qs": "2.3.3",
-        "readable-stream": "1.0.27-1",
-        "reduce-component": "1.0.1"
-      },
-      "dependencies": {
-        "extend": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
-          "integrity": "sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ="
-        },
-        "form-data": {
-          "version": "1.0.0-rc3",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz",
-          "integrity": "sha1-01vGLn+8KTeuePlIqqDTjZBgdXc=",
-          "requires": {
-            "async": "1.5.2",
-            "combined-stream": "1.0.6",
-            "mime-types": "2.1.18"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-        },
-        "qs": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
-          "integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ="
-        },
-        "readable-stream": {
-          "version": "1.0.27-1",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz",
-          "integrity": "sha1-a2eYPCA1fO/QfwFlABoW1xDZEHg=",
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-        }
-      }
-    },
-    "supports-color": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
-      "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4="
-    },
-    "tmp": {
-      "version": "0.0.24",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz",
-      "integrity": "sha1-1qXhmNFKmDXMby18PZ4wJCjIzxI="
-    },
-    "to-iso-string": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
-      "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE="
-    },
-    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
-      "requires": {
-        "punycode": "1.4.1"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "optional": true
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
-    },
-    "ultron": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA=="
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "1.3.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    },
-    "ws": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-      "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-      "requires": {
-        "options": "0.0.6",
-        "ultron": "1.0.2"
-      }
-    },
-    "xml2js": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz",
-      "integrity": "sha1-MREBAAMAiuGSQOuhdJe1fHKcVV0=",
-      "requires": {
-        "sax": "0.6.1",
-        "xmlbuilder": "9.0.7"
-      }
-    },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-    },
-    "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
-      "requires": {
-        "fd-slicer": "1.0.1"
-      }
-    }
-  }
-}

test/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "chromedriver": "^2.38.3",
-    "ejs": "^2.4.2",
-    "expect.js": "^0.3.1",
-    "mkdirp": "^0.5.1",
-    "mocha": "^2.5.3",
-    "rimraf": "^2.5.3",
-    "selenium-server-standalone-jar": "^2.53.1",
-    "selenium-webdriver": "^2.53.3",
-    "superagent": "^1.8.5"
-  }
-}

test/test.js

@@ -1,236 +1,131 @@
-#!/usr/bin/env node
 
-'use strict';
+import assert from 'node:assert/strict';
+import superagent from '@cloudron/superagent';
 
-require('chromedriver');
-
-var execSync = require('child_process').execSync,
-    expect = require('expect.js'),
-    path = require('path'),
-    superagent = require('superagent'),
-    webdriver = require('selenium-webdriver');
-
-var by = webdriver.By,
-    until = webdriver.until;
-
-var username = 'admin',
-    password = 'password';
-
-
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+import { app, clearCache, click, cloudronCli, press, goto, loginOIDC, password, sendKeys, setupBrowser, takeScreenshot, teardownBrowser, username, waitFor } from '@cloudron/charlie';
 
+/* global it, describe, before, after, afterEach */
 
 describe('Application life cycle test', function () {
-    this.timeout(0);
+    const admin_username = 'admin';
+    const admin_password = 'changeme';
 
-    var chrome = require('selenium-webdriver/chrome');
-    var server, browser = new chrome.Driver();
+    before(setupBrowser);
+    after(teardownBrowser);
 
-    before(function (done) {
-        var seleniumJar= require('selenium-server-standalone-jar');
-        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
-        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
-        server.start();
-
-        done();
+    afterEach(async function () {
+        await takeScreenshot(this.currentTest);
     });
 
-    after(function (done) {
-        browser.quit();
-        server.stop();
-        done();
-    });
-
-    var LOCATION = 'test';
-    var TEST_TIMEOUT = 10000;
-    var app;
-
-    function exists(selector, callback) {
-        return browser.wait(until.elementLocated(selector), TEST_TIMEOUT).then(function () {
-            callback();
-        });
+    function baseUrl() {
+        if (app.manifest.version === '1.4.0') return `https://${app.fqdn}/p`;
+        return `https://${app.fqdn}`;
     }
 
-    function visible(selector, callback) {
-        exists(selector, function () {
-            browser.wait(until.elementIsVisible(browser.findElement(selector)), TEST_TIMEOUT).then(function () {
-                callback();
-            });
-        });
+    async function login(uname, pass) {
+        await goto(`https://${app.fqdn}`, 'label=Username');
+        await sendKeys('label=Username', uname);
+        await sendKeys('label=Password', pass);
+        await click('Login', { role: 'button' }); // there is a link at the top
+        await waitFor('Subscription management');
     }
 
-    function login(callback) {
-        browser.manage().deleteAllCookies();
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('loginButton'), function () {
-            browser.findElement(by.id('username')).sendKeys(username);
-            browser.findElement(by.id('passwordPlain')).sendKeys(password);
-            browser.findElement(by.id('loginButton')).click();
-            browser.wait(until.elementLocated(by.id('dropdown-configure')), TEST_TIMEOUT).then(function () { callback(); });
-        });
+    async function loginViaOIDC() {
+        await goto(`https://${app.fqdn}/i/`);
+        await loginOIDC('css=#btn-subscription');
     }
 
-    function logout(callback) {
-        var logout_btn = by.xpath('//ul[@class="dropdown-menu"]/li/a[@class="signout"]');
-
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.className('dropdown-toggle')).click();
-            visible(logout_btn, function () {
-                browser.findElement(logout_btn).click();
-
-                browser.wait(until.elementLocated(by.id('loginButton')), TEST_TIMEOUT).then(function () { callback(); });
-            });
-        });
+    async function addSubscription() {
+        await goto(`${baseUrl()}/i/?c=subscription&a=add`, 'label=Feed URL');
+        await sendKeys('label=Feed URL', 'https://blog.cloudron.io/rss/');
+        await press('label=Feed URL', 'Enter'); // there are multiple "Add" buttons on that page
+        await waitFor('RSS feed Cloudron has been added');
     }
 
-    function addSubscription(callback) {
-        var url = "https://cloudron.io/blog/rss.xml";
+    async function enableApi({ relogin = true } = {}) {
+        await goto(`${baseUrl()}/i/?c=auth`);
 
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.xpath('//a[@href=".?c=subscription"]')).click();
-            visible(by.id('add_rss'), function () {
-                browser.findElement(by.xpath('//input[@name="url_rss"]')).sendKeys(url);
-                browser.findElement(by.xpath('//form[@id="add_rss"]/div/button[@type="submit"]')).click();
-                visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-            });
-        });
+        if (relogin) {
+            await sendKeys('label=Password', admin_password);
+            await click('Login');
         }
 
-    function addUser(callback) {
-        var test_username = 'test';
-        var manage_users_btn = by.xpath('//a[@href=".?c=user&a=manage"]');
-
-        browser.get('https://' + app.fqdn);
-
-        visible(by.id('stream'), function () {
-            browser.findElement(by.className('dropdown-toggle')).click();
-            visible(manage_users_btn, function () {
-                browser.findElement(manage_users_btn).click();
-                visible(by.id('new_user_name'), function () {
-                    browser.findElement(by.id('new_user_name')).sendKeys(test_username);
-                    browser.findElement(by.id('new_user_passwordPlain')).sendKeys(password);
-                    browser.findElement(by.xpath('//form[@action=".?c=user&a=create"]/div/div/button[@type="submit"]')).click();
-                    visible(by.xpath('//div[@id="notification" and @class="notification good"]'), function() { callback(); });
-                });
-            });
-        });
+        await click(/Allow API access/);
+        await click('Submit');
+        await waitFor(/Configuration has been updated/);
     }
 
-    function enableApi(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?c=auth').then(function () {
-            return browser.findElement(by.id('api_enabled')).click();
-        }).then(function () {
-            return browser.findElement(by.xpath('//form[@action=".?c=auth"]')).submit();
-        }).then(callback);
+    async function checkApiConfiguration() {
+        await goto(`${baseUrl()}/api/`, /PASS/);
+        await waitFor(/PASS/);
     }
 
-    function checkApiConfiguration(callback) {
-        browser.get('https://' + app.fqdn + '/p/api/greader.php/check%2Fcompatibility').then(function () {
-            exists(by.xpath('//pre[text()="PASS"]'), callback);
-        });
+    async function subscriptionExists() {
+        await goto(`${baseUrl()}/i/?get=c_1`, 'Cloudron');
     }
 
-    function getAppInfo() {
-        var inspect = JSON.parse(execSync('cloudron inspect'));
-        app = inspect.apps.filter(function (a) { return a.location === LOCATION || a.location === LOCATION + '2'; })[0];
-        expect(app).to.be.an('object');
+    async function getStaticExtensionFile() {
+        const url = `${baseUrl()}/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`;
+        const response = await superagent.get(url)
+            .set('Cache-Control', 'no-store')
+            .set('Pragma', 'no-cache')
+            .ok(() => true);
+        assert.strictEqual(response.status, 200);
+        assert.ok(response.body.toString('utf8').includes('sticky_feeds')); // content-type is application/javascript, so body is a buffer
     }
 
-    function subscriptionExists(callback) {
-        browser.get('https://' + app.fqdn + '/p/i/?get=c_1');
+    // No SSO
+    it('install app (no sso)', () => cloudronCli.install({ noSso: true }));
 
-        visible(by.xpath('//a[text()="Cloudron.io"]'), callback);
-    }
-
-    function getStaticExtensionFile(callback) {
-        superagent.get(`https://${app.fqdn}/p/ext.php?f=xExtension-StickyFeeds/static/script.js&t=js`)
-            .buffer(true)
-            .end(function (err, res) {
-                expect(err).to.be(null);
-                expect(res.status).to.be(200);
-                expect(res.text).to.contain('sticky_feeds'); // relies on the buffer flag above
-                callback();
-        });
-    }
-
-    xit('build app', function () {
-        execSync('cloudron build', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('install app', function () {
-        execSync('cloudron install --new --wait --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('can get app information', getAppInfo);
-
-    it('can login', login);
+    it('can login', login.bind(null, admin_username, admin_password));
     it('can subscribe', addSubscription);
-    it('can add users', addUser);
-    it('can enable API', enableApi);
+    it('can enable API', () => enableApi({ relogin: true }));
     it('can check configuration', checkApiConfiguration);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
-    it('can logout', logout);
+    it('can logout', clearCache);
+    it('uninstall app', cloudronCli.uninstall);
 
-    it('backup app', function () {
-        execSync('cloudron backup create --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    // SSO
+    it('install app (sso)', cloudronCli.install);
 
-    it('restore app', function () {
-        execSync('cloudron restore --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
-
-    it('can login', login);
+    it('can make user Administrator', () => cloudronCli.exec(`bash -c "php cli/reconfigure.php --default-user ${username}"`));
+    it('can login OIDC', () => loginViaOIDC(username, password));
+    it('can subscribe', addSubscription);
+    it('can enable API', () => enableApi({ relogin: false }));
     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 --wait --location ' + LOCATION + '2 --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        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('backup app', cloudronCli.createBackup);
+    it('restore app', cloudronCli.restoreFromLatestBackup);
 
-    it('can login', login);
+    it('can login OIDC', loginViaOIDC);
     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, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('move to different location', cloudronCli.changeLocation);
+
+    it('can login OIDC', loginViaOIDC);
+    it('can check configuration', checkApiConfiguration);
+    it('subscription exists', subscriptionExists);
+    it('can get static extension file', getStaticExtensionFile);
+
+    it('uninstall app', cloudronCli.uninstall);
 
     // test update
-    it('can install app', function () {
-        execSync('cloudron install --new --wait --appstore-id org.freshrss.cloudronapp --location ' + LOCATION, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('can install app for update', cloudronCli.appstoreInstall);
 
-    it('can get app information', getAppInfo);
-    it('can login', login);
+    it('can login OIDC', loginViaOIDC);
+    it('can make user Administrator', () => cloudronCli.exec(`bash -c "php cli/reconfigure.php --default-user ${username}"`));
     it('can subscribe', addSubscription);
-    it('can add users', addUser);
 
-    it('can update', function () {
-        execSync('cloudron install --wait --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-        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 update', cloudronCli.update);
 
-    it('can login', login);
+    it('can login OIDC', loginViaOIDC);
     it('subscription exists', subscriptionExists);
     it('can get static extension file', getStaticExtensionFile);
 
-    it('uninstall app', function () {
-        execSync('cloudron uninstall --app ' + app.id, { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' });
-    });
+    it('uninstall app', cloudronCli.uninstall);
 });