2 files changed, 23 insertions, 0 deletions

diff --git a/src/app/edit-identity/edit-identity.component.ts b/src/app/edit-identity/edit-identity.component.ts
index 9e128bd..d9e011a 100644
--- a/src/app/edit-identity/edit-identity.component.ts
+++ b/src/app/edit-identity/edit-identity.component.ts
@@ -84,6 +84,10 @@ export class EditIdentityComponent implements OnInit {
     this.loadImportScopesFromLocalStorage()
     this.loadImportIdProviderFromLocalStorage();
     this.importInProgress = true;
+    let oidcState = localStorage.getItem('oidcRequestState');
+    if (oidcState) {
+      this.oidcService.loadState(oidcState);
+    }
     this.activatedRoute.params.subscribe(p => {
       if (p['id'] === undefined) {
         return;
@@ -623,6 +627,7 @@ export class EditIdentityComponent implements OnInit {
     this.attributesToOverwriteOnImport = [];
     localStorage.removeItem('importIdProviderURL');
     localStorage.removeItem('credentialCode');
+    localStorage.removeItem('oidcRequestState');
     localStorage.removeItem('importTargetComponent');
     this.importInProgress = false;
     this.oauthService.logOut();
@@ -653,6 +658,7 @@ export class EditIdentityComponent implements OnInit {
         this.attributesToOverwriteOnImport = [];
         localStorage.removeItem('importIdProviderURL');
         localStorage.removeItem('credentialCode');
+        localStorage.removeItem('oidcRequestState');
         localStorage.removeItem('importTargetComponent');
         this.importInProgress = false;
         this.oauthService.logOut();
@@ -810,6 +816,10 @@ export class EditIdentityComponent implements OnInit {
     this.configureOauthService();
     this.oauthService.logOut(); //Make sure we logout before login
     localStorage.setItem('importTargetComponent', 'edit-identity');
+    /**
+     * Save current openid request state (if any)
+     */
+    localStorage.setItem('oidcRequestState', this.oidcService.getState());
     this.oauthService.loadDiscoveryDocumentAndLogin();
   }
 
diff --git a/src/app/open-id.service.ts b/src/app/open-id.service.ts
index 723397e..50e6466 100644
--- a/src/app/open-id.service.ts
+++ b/src/app/open-id.service.ts
@@ -52,6 +52,19 @@ export class OpenIdService {
     this.inOidcFlow = this.params['redirect_uri'] !== undefined;
   }
 
+  getState() {
+    return JSON.stringify(this.params);
+  }
+
+  loadState(state_string: string) {
+    try {
+      let state = JSON.parse(state_string);
+      this.parseRouteParams(state);
+    } catch(e) {
+      console.log("ERROR: unable to load state " + state_string + " " + e);
+    }
+  }
+
   private buildAuthorizeRedirect(): any {
     var redirectUri = this.config.get().apiUrl + '/openid/authorize';
     redirectUri += '?client_id=' + this.params['client_id'];