[reclaim-ui] 421/459: import fix

[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 933809d297402ed3525fcc966e2f737845a04a78
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Jan 6 12:33:30 2021 +0900

    import fix
---
 src/app/edit-identity/edit-identity.component.html | 6 +++---
 src/app/edit-identity/edit-identity.component.ts   | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/edit-identity/edit-identity.component.html 
b/src/app/edit-identity/edit-identity.component.html
index 478a226..d0bbb75 100644
--- a/src/app/edit-identity/edit-identity.component.html
+++ b/src/app/edit-identity/edit-identity.component.html
@@ -14,7 +14,7 @@
     </div>
   </div>
 
-  <div class="card-body" *ngIf="attributesToOverwriteOnImport.length > 0">
+  <div class="card-body" *ngIf="overwriteRequiresDecision">
     <div class="alert alert-warning">{{ 
getMessage("edit_identity_html@importOverwriteInfo") }}</div>
     <div class="table">
       <div class="row">
@@ -78,7 +78,7 @@
   </div>
 
   <!-- Attribute table -->
-  <div class="card-body">
+  <div class="card-body" *ngIf="!overwriteRequiresDecision">
     <div>
       <h3 class="mb-2"> {{getMessage("edit_identity_html@addAttributes")}}</h3>
       <p *ngIf="getMissingClaims().length > 0"> 
{{getMessage("edit_identity_html@addRequestedMissingClaim")}} <span 
(click)="showMissingInfo = !showMissingInfo" class="fa 
fa-question-circle"></span></p>
@@ -315,7 +315,7 @@
     <hr/>
 
     <!-- Edit card buttons -->
-    <div>
+    <div *ngIf="!overwriteRequiresDecision">
       <button class="btn btn-primary" (click)="goBack()">
         <span class="fa fa-arrow-left"></span> {{ 
getMessage("edit_identity_html@identitySelection") }}
       </button>
diff --git a/src/app/edit-identity/edit-identity.component.ts 
b/src/app/edit-identity/edit-identity.component.ts
index ac1fc49..92fbf78 100644
--- a/src/app/edit-identity/edit-identity.component.ts
+++ b/src/app/edit-identity/edit-identity.component.ts
@@ -54,6 +54,7 @@ export class EditIdentityComponent implements OnInit {
   importIdProvider: IdProvider;
   attributesToImport: Attribute[] = [];
   attributesToOverwriteOnImport: any[] = [];
+  overwriteRequiresDecision: boolean = false;
   validImportEmail: boolean = false;
   scopes: Scope[];
   newCredential: Credential;
@@ -629,6 +630,7 @@ export class EditIdentityComponent implements OnInit {
     this.importIdProvider.name = '';
     this.attributesToImport = [];
     this.attributesToOverwriteOnImport = [];
+    this.overwriteRequiresDecision = false;
     localStorage.removeItem('importIdProviderURL');
     localStorage.removeItem('emailForCredential');
     localStorage.removeItem('credentialCode');
@@ -659,6 +661,7 @@ export class EditIdentityComponent implements OnInit {
         this.importIdProvider.name = '';
         this.attributesToImport = [];
         this.attributesToOverwriteOnImport = [];
+        this.overwriteRequiresDecision = false;
         localStorage.removeItem('importIdProviderURL');
         localStorage.removeItem('emailForCredential');
         localStorage.removeItem('credentialCode');
@@ -717,7 +720,6 @@ export class EditIdentityComponent implements OnInit {
           }
           console.log("Trying to import " + cred.attributes.length + " 
attributes");
 
-          var needsUserInteraction = false;
           for (let attr of cred.attributes) {
             if ((attr.name == "sub") ||
                 (attr.name == "nonce") ||
@@ -740,14 +742,14 @@ export class EditIdentityComponent implements OnInit {
                * make a decision
                */
               if (this.isClaimCred(existAttr)) {
-                needsUserInteraction = true;
+                this.overwriteRequiresDecision = true;
               }
               break;
             }
             this.attributesToImport.push(attestation);
           }
           if ((this.attributesToOverwriteOnImport.length > 0) &&
-              needsUserInteraction) {
+              this.overwriteRequiresDecision) {
             console.log("Wait for user input");
             return;
           }

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