Merge branch 'master' of gitlab.com:reclaimid/ui

2 files changed, 7 insertions, 7 deletions

diff --git a/src/app/edit-credentials/edit-credentials.component.ts b/src/app/edit-credentials/edit-credentials.component.ts
index 790a5db..c19a0f9 100644
--- a/src/app/edit-credentials/edit-credentials.component.ts
+++ b/src/app/edit-credentials/edit-credentials.component.ts
@@ -96,7 +96,7 @@ export class EditCredentialsComponent implements OnInit {
       console.log("No AccessToken");
       return;
     }
-    this.newCredential.value = this.oauthService.getAccessToken();
+    this.newCredential.value = this.oauthService.getIdToken();
     this.reclaimService.addCredential(this.identity, this.newCredential).subscribe(res => {
       console.log("Saved Credential");
       this.resetNewIdProvider();
@@ -118,7 +118,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());
+    localStorage.setItem('Authorization: ' + this.newCredential.name, 'idProvider: ' + this.newIdProvider.url + ';redirectUri: ' +  this.oauthService.redirectUri + ';clientId: ' + this.oauthService.clientId + ';accessToken: ' + this.oauthService.getIdToken() + ';idToken: ' + this.oauthService.getIdToken());
   }
 
   private storeCredential() {
diff --git a/src/app/edit-identity/edit-identity.component.html b/src/app/edit-identity/edit-identity.component.html
index ba4a1f3..ad71ec5 100644
--- a/src/app/edit-identity/edit-identity.component.html
+++ b/src/app/edit-identity/edit-identity.component.html
@@ -29,7 +29,7 @@
             </div>
             <div class="col-sm">
               <input *ngIf="!isClaimCred(claim)" placeholder="{{ getMessage('Value') }}" [(ngModel)]="claim.value">
-              <span *ngIf="isClaimCred(claim)"  >{{getMessage("edit_identity_html@claimAsAttribute", {CREDVALUE: getCredValue(claim), ISSUER: getIssuer(claim), CLAIMVALUE: claim.value})}}</span>
+              <span *ngIf="isClaimCred(claim)"  >{{getMessage("edit_identity_html@claimAsAttribute", {CREDVALUE: getCredValue(claim), ISSUER: getIssuer(claim), CLAIMVALUE: claim.value, interpolation: { escapeValue: false } }) }}</span>
             </div>
             <div class="col-sm">
               <button class="btn btn-primary" (click)="deleteAttribute(claim)" *ngIf="!isClaimCred(claim)">
@@ -70,7 +70,7 @@
                 <i *ngIf="isClaimRequested(claim)" class="fa fa-openid"></i><b> {{ getDescription(claim) }}</b></div></div>
             <div class="col-sm">
               <input *ngIf="!isClaimCred(claim)" placeholder="{{ getMessage('Value') }}" [(ngModel)]="claim.value">
-              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", [getCredValue(claim), getIssuer(claim), claim.value])}}</span>
+              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", {CREDVALUE: getCredValue(claim), ISSUER: getIssuer(claim), CLAIMVALUE: claim.value, interpolation: { escapeValue: false } }) }}</span>
             </div>
             <div class="col-sm">
               <button class="btn btn-primary" (click)="deleteAttribute(claim)" *ngIf="!isClaimCred(claim)">
@@ -113,7 +113,7 @@
                 <i *ngIf="isClaimRequested(claim)" class="fa fa-openid"></i><b> {{ getDescription(claim) }}</b></div></div>
             <div class="col-sm">
               <input *ngIf="!isClaimCred(claim)" placeholder="{{ getMessage('Value') }}" [(ngModel)]="claim.value">
-              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", [getCredValue(claim), getIssuer(claim), claim.value])}}</span>
+              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", { CREDVALUE: getCredValue(claim), ISSUER: getIssuer(claim), CLAIMVALUE: claim.value, interpolation: { escapeValue: false } }) }}</span>
             </div>
             <div class="col-sm">
               <button class="btn btn-primary" (click)="deleteAttribute(claim)" *ngIf="!isClaimCred(claim)">
@@ -155,7 +155,7 @@
                 <i *ngIf="isClaimRequested(claim)" class="fa fa-openid"></i><b> {{ getDescription(claim) }}</b></div></div>
             <div class="col-sm">
               <input *ngIf="!isClaimCred(claim)" placeholder="{{ getMessage('Value') }}" [(ngModel)]="claim.value">
-              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", [getCredValue(claim), getIssuer(claim), claim.value])}}</span>
+              <span *ngIf="isClaimCred(claim)" >{{getMessage("edit_identity_html@claimAsAttribute", { CREDVALUE: getCredValue(claim), ISSUER: getIssuer(claim), CLAIMVALUE: claim.value, interpolation: { escapeValue: false } }) }}</span>
             </div>
             <div class="col-sm">
               <button class="btn btn-primary" (click)="deleteAttribute(claim)" *ngIf="!isClaimCred(claim)">
@@ -252,7 +252,7 @@
             </div>
             <div class="col-sm">
               <input *ngIf="!isClaimCred(attribute)" placeholder="{{ getMessage('Value') }}" [(ngModel)]="attribute.value">
-              <span *ngIf="isClaimCred(attribute)" >{{getMessage("edit_identity_html@claimAsAttribute", [getCredValue(claim), getIssuer(claim), claim.value])}}</span>
+              <span *ngIf="isClaimCred(attribute)" >{{getMessage("edit_identity_html@claimAsAttribute", {CREDVALUE: getCredValue(attribute), ISSUER: getIssuer(attribute), CLAIMVALUE: attribute.value, interpolation: { escapeValue: false } }) }}</span>
             </div>
             <div class="col-sm">
               <button class="btn btn-primary" (click)="deleteAttribute(attribute)" *ngIf="!isClaimCred(attribute)">