[reclaim-ui] 302/459: better info

[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 45351f66dcc7ab355637e03d6f14a83b9884fee3
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Thu Aug 13 17:08:29 2020 +0200

    better info
---
 src/app/identity-list/identity-list.component.html | 14 ++++++++++----
 src/app/identity-list/identity-list.component.ts   | 11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/app/identity-list/identity-list.component.html 
b/src/app/identity-list/identity-list.component.html
index 46f2d08..87fe6d4 100644
--- a/src/app/identity-list/identity-list.component.html
+++ b/src/app/identity-list/identity-list.component.html
@@ -81,17 +81,21 @@
     <div class="alert alert-secondary fade show" 
[hidden]="hasAttributes(identity)">
       This identity has no attributes. Maybe try <a class="buttonlink" 
[routerLink]="['/edit-identity', identity.name]">adding some?</a>
     </div>
-    <div [hidden]="!isAnyRequestedClaimMissing(identity)" class="alert 
alert-danger alert-dismissible fade show" role="alert">
+    <div [hidden]="!isAnyRequestedClaimMissing(identity)"
+      class="alert alert-warning alert-dismissible fade show"
+      [class.alert-warning]="!isAnyRequiredClaimMissing(identity)"
+      [class.alert-danger]="isAnyRequiredClaimMissing(identity)"
+      role="alert">
       <span class="fa fa-openid"></span> This identity is missing some 
requested information:
       <ul>
         <li *ngIf="isProfileRequested() && 
isProfileMissing(identity)">getProfileDescription()</li>
         <li *ngIf="isEmailRequested() && 
isEmailMissing(identity)">getEmailDescription()</li>
         <li *ngIf="isPhoneRequested() && 
isPhoneMissing(identity)">getPhoneDescription()</li>
         <li *ngIf="isAddressRequested() && 
isAddressMissing(identity)">getAddressDescription()</li>
-        <li *ngFor="let attr of getMissingClaims(identity)">{{attr.name}}<i 
*ngIf="isOptional(attr)"> (optional)</i></li>
+        <li *ngFor="let attr of getMissingClaims(identity)">{{attr.name}}<i 
*ngIf="!isOptional(attr)"> (required)</i></li>
       </ul>
       <button class="btn btn-primary" [routerLink]="['/edit-identity', 
identity.name]">
-        <span class="fa fa-plus"></span> Edit identity
+        <span class="fa fa-edit"></span> Edit identity
       </button>
     </div>
 
@@ -129,7 +133,9 @@
       </div>
     </div>
     <div *ngIf="inOpenIdFlow()">
-      <button [disabled]="!isClientVerified()" 
(click)="loginIdentity(identity)" class="btn btn-primary mr-1 openid-login">
+      <button [disabled]="!isClientVerified() && 
!isAnyRequiredClaimMissing(identity)"
+        (click)="loginIdentity(identity)"
+        class="btn btn-primary mr-1 openid-login">
         <span *ngIf="isClientVerified()">Share information marked with <i 
class="fa fa-openid text-primary"></i> from this identity.</span>
         <span *ngIf="!isClientVerified()"><i class="fa 
fa-exclamation-circle"></i> Sharing disabled</span>
       </button>
diff --git a/src/app/identity-list/identity-list.component.ts 
b/src/app/identity-list/identity-list.component.ts
index 5397243..6b935e1 100644
--- a/src/app/identity-list/identity-list.component.ts
+++ b/src/app/identity-list/identity-list.component.ts
@@ -411,6 +411,17 @@ export class IdentityListComponent implements OnInit {
     return false;
   }
 
+  isAnyRequiredClaimMissing(identity: Identity) {
+    var claims = this.oidcService.getRequestedClaims();
+    for (var claim of claims) {
+      let found = false;
+      for (let attr of this.missingClaims[identity.pubkey]) {
+        if ((claim[0] === attr.name) && claim[1]) { return true; }
+      }
+    }
+    return false;
+  }
+
   isClaimAttested(attribute: Attribute): boolean {
     if (undefined === attribute) { return false; }
     return attribute.flag === '1';

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