Merge branch 'release/2.1.1'

CHANGELOG.md

@@ -1,3 +1,19 @@
+## 2.1.1
+Changes on the registration page. 
+
+- inline JS logic converted to typescript.
+- Stop polling for status when an error or session is expired.
+
+## 2.1.0
+
+- Show styled error page for routes authentication, registration, cancel page when no AuthNRequest is active.
+
+Changes on the authentication page. 
+
+- Stop polling for status when an error or authentication token is expired.  
+- Disabled automatic page refresh when authentication token is expired.
+- Move logic for authentication request to client-side (fixes timeouts on push notification name resolvers).
+
 ## 2.0.1
 The most notable changes are
 - A user agent pattern can be set to ensure the users tiqr app is of the correct vendor. 

README.md

@@ -148,25 +148,6 @@ Authentication can also be done in 'offline' mode, so you need to fill in your '
 
 ``` ./bin/console test:authentication --offline=true ./<qr_file.png>```  
 
-Release instructions project
-============================
-
-The projects follow semantic versioning. To create a new release perform the following steps:
-
-1. Merge feature branch in development branch.
-
-2. Merge development branch in master branch.
-
-3. Checkout and update (pull) master branch
-
-4. Create version with RMT
-
-```bash 
-    ./RMT release
-```
-
-5. Release the new version on Github [Releases](https://github.com/OpenConext/Stepup-gssp-example/releases)
-
 User storage
 ============
 Currently we support three user storage solutions. Which are file system storage, ldap and database storage. The 
@@ -232,6 +213,9 @@ tiqr_library_options:
                 attributes: null
 ```
 
+# Release strategy
+Please read: https://github.com/OpenConext/Stepup-Deploy/wiki/Release-Management fro more information on the release strategy used in Stepup projects.
+
 Other resources
 ======================
 

ansible/files/xdebug.ini

@@ -4,7 +4,7 @@ xdebug.coverage_enable=1
 xdebug.default_enable=1
 xdebug.remote_enable=1
 xdebug.remote_connect_back=0
-xdebug.remote_host=192.168.17.1
+xdebug.remote_host=192.168.18.1
 xdebug.remote_port=9000
 xdebug.remote_handler=dbgp
 xdebug.remote_log=/tmp/xdebug.log

ansible/requirements.yml

@@ -1,4 +1,5 @@
 - name: openmicroscopy.ssl-certificate
 - name: reallyenglish.ntpd
 - name: geerlingguy.nodejs
-- name: geerlingguy.java
+- name: geerlingguy.java
+- name: openmicroscopy.nginx-ssl-selfsigned

app/Resources/translations/messages.en.yml

@@ -5,6 +5,9 @@ stepup.error.support_page.text: Please try again or visit <a href="%support_url%
 stepup.error.generic_error:
     title: Oops!
     description: Something went wrong. Please try again.
+stepup.error.no_active_authentrequest:
+  title: Oops!
+  description: No active authentication request.
 
 stepup.error.timestamp: Time
 stepup.error.hostname: Application

app/Resources/translations/messages.nl.yml

@@ -5,6 +5,9 @@ stepup.error.support_page.text: Bezoek <a href="%support_url%" target="_blank">d
 stepup.error.generic_error:
     title: Oeps!
     description: Er is iets mis gegaan. Probeer het opnieuw.
+stepup.error.no_active_authentrequest:
+  title: Oeps!
+  description: Geen active authenticatie aanvraag.
 
 stepup.error.timestamp: Tijd
 stepup.error.hostname: Applicatie

app/config/config.yml

@@ -26,8 +26,7 @@ framework:
     trusted_hosts: ~
     session:
         # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
-        handler_id: session.handler.native_file
-        save_path: null
+        handler_id: ~
     fragments: ~
     http_method_override: true
     assets: ~

composer.json

@@ -34,7 +34,6 @@
         "php": ">=5.5.9",
         "incenteev/composer-parameter-handler": "^2.0",
         "kairos/phpqrcode": "^1.0",
-        "liip/rmt": "^1.2",
         "openconext/monitor-bundle": "^1.0",
         "sensio/distribution-bundle": "^5.0.19",
         "sensio/framework-extra-bundle": "^3.0.2",
@@ -73,12 +72,14 @@
             "@lint",
             "@static-analysis",
             "@phpunit",
-            "@security-tests"
+            "@security-tests",
+            "@jest"
         ],
 
-        "lint": ["@lint-php", "@lint-yml", "@lint-composer"],
+        "lint": ["@lint-php", "@lint-yml", "@lint-composer", "@lint-ts"],
         "lint-php": "vendor/bin/parallel-lint app src",
         "lint-yml": "bin/console lint:yaml app/config",
+        "lint-ts": "yarn tslint --project tsconfig.json",
         "lint-composer": "composer validate",
 
         "static-analysis": ["@license-headers", "@phpmd", "@phpcs", "@phpcpd"],
@@ -106,6 +107,10 @@
             "./node_modules/.bin/encore"
         ],
 
+        "jest": [
+            "./node_modules/.bin/jest"
+        ],
+
         "frontend-install": [
             "yarn install"
         ],