[reclaim-ui] 220/459: attestation name duplication prevented + trying to logout on serverside

[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 9371f519c40b568fa55891781f1188d79bc07dcb
Author: anna wimbauer <anna.wibauer@gmx.de>
AuthorDate: Mon Jun 22 09:45:40 2020 +0200

    attestation name duplication prevented + trying to logout on serverside
---
 src/app/attestation.service.ts                     |  6 +++++-
 src/app/edit-identity/edit-identity.component.html |  5 ++++-
 src/app/edit-identity/edit-identity.component.ts   | 25 +++++++++++++++++++---
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/app/attestation.service.ts b/src/app/attestation.service.ts
index 09038fb..920f2ad 100644
--- a/src/app/attestation.service.ts
+++ b/src/app/attestation.service.ts
@@ -44,6 +44,10 @@ export class AttestationService {
         };
     
         return authCodeFlowConfig;
-      }
+    }
+
+    serversideLogout(idProvider: string){
+      return this.http.get<any>(idProvider + '/logout');
+    }
 
 }
\ No newline at end of file
diff --git a/src/app/edit-identity/edit-identity.component.html 
b/src/app/edit-identity/edit-identity.component.html
index 1a7bba4..eefd100 100644
--- a/src/app/edit-identity/edit-identity.component.html
+++ b/src/app/edit-identity/edit-identity.component.html
@@ -174,7 +174,10 @@
       </div>
       <input placeholder="Attestation Name" class="form-control"  
[(ngModel)]="newAttestation.name">
     </div>
-    <button *ngIf="isExperimental() && newIdProviderDiscovered() && 
grantedAccessToIdProvider()" [disabled]="newAttestation.name==''" class="btn 
btn-primary mb-4 fhg-link" (click)="saveIdProvider()">
+    <div *ngIf="newIdProviderDiscovered() && grantedAccessToIdProvider() && 
attestationNameDuplicate()" class="alert alert-danger alert-dismissible fade 
show my-2" role="alert">
+      <span class="fa fa-warning"></span> You already have an attestation with 
this name.
+    </div>
+    <button *ngIf="isExperimental() && newIdProviderDiscovered() && 
grantedAccessToIdProvider()" [disabled]="attestationNameDuplicate() || 
newAttestation.name==''" class="btn btn-primary mb-4 fhg-link" 
(click)="saveIdProvider()">
       <span class="fa fa-user"></span> Save {{getNewIdProviderName()}} Account
     </button>
     <button *ngIf="isExperimental() && newIdProviderDiscovered()" class="btn 
btn-primary mb-4 fhg-link" (click)="cancleLinking()">
diff --git a/src/app/edit-identity/edit-identity.component.ts 
b/src/app/edit-identity/edit-identity.component.ts
index b9586ab..6c7ed24 100644
--- a/src/app/edit-identity/edit-identity.component.ts
+++ b/src/app/edit-identity/edit-identity.component.ts
@@ -723,7 +723,21 @@ export class EditIdentityComponent implements OnInit {
     this.logOutFromOauthService
   }
 
+  attestationNameDuplicate(){
+    let i;
+    for (i = 0; i < this.attestations.length; i++) {
+      if (this.newAttestation.name === this.attestations[i].name) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   saveIdProvider(){
+    if (this.attestationNameDuplicate()){
+      console.log("name duplicate");
+      return;
+    }
     this.saveIdProviderinLocalStorage();
     this.addAttestation();
   }
@@ -775,16 +789,21 @@ export class EditIdentityComponent implements OnInit {
     if (!this.oauthService.hasValidAccessToken()){
       return;
     }
+    const idProvider = this.oauthService.issuer;
     this.oauthService.logOut();
+    this.attestationService.serversideLogout(idProvider).subscribe(res => {
+      console.log("logged out on server")},
+      error => {
+        console.log("serverside logout gone wrong");
+        console.log(error);}
+    );
     if (!this.oauthService.hasValidAccessToken()){
       console.log("logged out from outhService");
     }
   }
 
   cancleLinking(){
-    if (this.oauthService.hasValidAccessToken()){
-      this.oauthService.logOut();
-    }
+    this.logOutFromOauthService();
     this.newIdProvider = '';
     localStorage.removeItem('newIdProvider');
     this.webfingerEmail = '';

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