[reclaim-ui] 313/459: open redirect removed

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit 5a3929503113282e831c9281d6a5b9c05521b615
Author: anna wimbauer <anna.wibauer@gmx.de>
AuthorDate: Wed Sep 16 14:42:26 2020 +0200

    open redirect removed
---
 src/app/credential.service.ts                          |  3 ---
 src/app/edit-credentials/edit-credentials.component.ts | 14 ++++----------
 src/app/edit-identity/edit-identity.component.ts       |  2 +-
 src/app/idProvider.ts                                  |  1 -
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/app/credential.service.ts b/src/app/credential.service.ts
index 531fd82..edeaae0 100644
--- a/src/app/credential.service.ts
+++ b/src/app/credential.service.ts
@@ -48,9 +48,6 @@ export class CredentialService {
           // URL of the SPA to redirect the user to after login
           redirectUri: redirectUri,
 
-          postLogoutRedirectUri: redirectUri + "?logout=true",
-
-          logoutUrl: idProvider.logoutURL + '/logout',
           // The SPA's id. The SPA is registerd with this id at the auth-server
           // clientId: 'server.code',
           clientId: 'reclaimid',
diff --git a/src/app/edit-credentials/edit-credentials.component.ts 
b/src/app/edit-credentials/edit-credentials.component.ts
index f97b357..39b32d6 100644
--- a/src/app/edit-credentials/edit-credentials.component.ts
+++ b/src/app/edit-credentials/edit-credentials.component.ts
@@ -38,7 +38,7 @@ export class EditCredentialsComponent implements OnInit {
   ngOnInit() {
     this.newCredential = new Credential('', '', '', 'JWT', '', 0, []);
     this.identity = new Identity('','');
-    this.newIdProvider = new IdProvider ('', '', '');
+    this.newIdProvider = new IdProvider ('', '');
     this.webfingerEmail = '';
     this.emailNotFoundAlertClosed = true;
     this.errorMassage = '';
@@ -116,7 +116,7 @@ export class EditCredentialsComponent implements OnInit {
   }
 
   saveIdProviderinLocalStorage(){
-    localStorage.setItem('Authorization: ' + this.newCredential.name, 
'idProvider: ' + this.newIdProvider.url + ';redirectUri: ' +  
this.oauthService.redirectUri + ';clientId: ' + this.oauthService.clientId + 
';accessToken: ' + this.oauthService.getAccessToken() + ';idToken: ' + 
this.oauthService.getIdToken() + ';logoutURL: ' + this.newIdProvider.logoutURL);
+    localStorage.setItem('Authorization: ' + this.newCredential.name, 
'idProvider: ' + this.newIdProvider.url + ';redirectUri: ' +  
this.oauthService.redirectUri + ';clientId: ' + this.oauthService.clientId + 
';accessToken: ' + this.oauthService.getAccessToken() + ';idToken: ' + 
this.oauthService.getIdToken());
   }
 
   private storeCredential() {
@@ -214,7 +214,6 @@ export class EditCredentialsComponent implements OnInit {
   loadIdProviderFromLocalStorage(){
     this.newIdProvider.url = localStorage.getItem("newIdProviderURL") || '';
     this.newIdProvider.name = 
this.getNewIdProviderName(this.newIdProvider.url);
-    this.newIdProvider.logoutURL = 
localStorage.getItem("newIdProviderLogoutURL") || '';
   }
 
   getNewIdProviderName(url: string){
@@ -229,17 +228,15 @@ export class EditCredentialsComponent implements OnInit {
 
   resetNewIdProvider(){
     this.newIdProvider.url = '';
-    this.newIdProvider.logoutURL = '';
     this.newIdProvider.name = '';
     localStorage.removeItem('newIdProviderURL');
-    localStorage.removeItem('newIdProviderLogoutURL')
   }
 
   logOutFromOauthService(){
     if (!this.oauthService.hasValidAccessToken()){
       return;
     }
-    this.oauthService.logOut(false);
+    this.oauthService.logOut();
   }
 
   loggedIn(){
@@ -258,17 +255,14 @@ export class EditCredentialsComponent implements OnInit {
   //Webfinger
 
   discoverIdProvider() {
-    if (this.webfingerEmail == ''){
+    if (!this.isValidEmailforDiscovery()){
       return;
     }
     localStorage.setItem('userForCredential', this.identity.name);
-    this.isValidEmailforDiscovery();
     this.credentialService.getLink(this.webfingerEmail).subscribe (idProvider 
=> {
       this.newIdProvider.url = (idProvider.links [0]).href; 
       localStorage.setItem('newIdProviderURL', this.newIdProvider.url);
       this.newIdProvider.name = 
this.getNewIdProviderName(this.newIdProvider.url);
-      (idProvider.links.length > 1)? this.newIdProvider.logoutURL = 
(idProvider.links [1]).href : this.newIdProvider.logoutURL = 
this.newIdProvider.url;
-       localStorage.setItem('newIdProviderLogoutURL', 
this.newIdProvider.logoutURL);
       console.log(this.newIdProvider.url);
       this.webfingerEmail == '';
       this.getScopes();
diff --git a/src/app/edit-identity/edit-identity.component.ts 
b/src/app/edit-identity/edit-identity.component.ts
index 8f9d1e8..c1f065b 100644
--- a/src/app/edit-identity/edit-identity.component.ts
+++ b/src/app/edit-identity/edit-identity.component.ts
@@ -61,7 +61,7 @@ export class EditIdentityComponent implements OnInit {
   ngOnInit() {
     this.credentialValues = {};
     this.webfingerEmail = '';
-    this.newIdProvider = new IdProvider ('', '', '');
+    this.newIdProvider = new IdProvider ('', '');
     this.loadAuthorizationsFromLocalStorage();
     this.identity = new Identity('','');
     this.newAttribute = new Attribute('', '', '', '', 'STRING', '0');
diff --git a/src/app/idProvider.ts b/src/app/idProvider.ts
index 1343d1a..4e100ef 100644
--- a/src/app/idProvider.ts
+++ b/src/app/idProvider.ts
@@ -1,6 +1,5 @@
 export class IdProvider {
     constructor(
         public url: string,
-        public logoutURL: string,
         public name: string){}
 }
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.