2 files changed, 15 insertions, 3 deletions

diff --git a/src/app/identity-list/identity-list.component.ts b/src/app/identity-list/identity-list.component.ts
index 909b5d6..aada8b2 100644
--- a/src/app/identity-list/identity-list.component.ts
+++ b/src/app/identity-list/identity-list.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, Router, UrlHandlingStrategy } from '@angular/router';
 
 import { Attribute } from '../attribute';
 import { Credential } from '../credential';
@@ -71,7 +71,7 @@ export class IdentityListComponent implements OnInit {
       var user = localStorage.getItem('userForCredential');
       this.router.navigate(['/edit-credentials', user]);
     }
-    if (!this.oidcService.inOpenIdFlow()) {
+    if (!this.oidcService.inOpenIdFlow() && undefined == this.route.snapshot.queryParams["authz_request"]) {
       this.oidcService.parseRouteParams(this.route.snapshot.queryParams);
       if (this.oidcService.inOpenIdFlow()) {
         this.router.navigate(['/authorization-request']);
@@ -379,11 +379,23 @@ export class IdentityListComponent implements OnInit {
         this.closeModal('GnunetInfo');
       }
       this.connected = true;
+
+      if(undefined !== this.route.snapshot.queryParams["authz_request"]){
+        var url = "http://localhost:7776" + this.route.snapshot.queryParams["pathname"] + "?";
+        var params = this.route.snapshot.queryParams;
+        Object.keys(params).forEach(param =>{
+          if (param != "authz_request" && param != "pathname"){
+            url = url + param + "=" + params[param] + "&";
+          }
+        })
+        window.location.href = url;
+      }
     },
       error => {
         console.log(error);
         this.openModal('GnunetInfo');
         this.connected = false;
+        setTimeout(() => this.updateIdentities(), 20000);
       });
   }
 
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index f345eb8..49cd933 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -5,7 +5,7 @@
     "Revoke": "Revoke",
     "Cancel": "Cancel",
     "Back": "Back",
-    "SaveAndBack": "SaveAndBack",
+    "SaveAndBack": "Save and back",
     "Delete": "Delete",
     "Save": "Save",
     "Note": "Note: ",