Remove scheme from burger menu (#220)

* Remove scheme from burger menu

* Remove scheme from burger menu

* Label update

* Label update

Author: gdimtsas

src/app/core/constants/general.ts

@@ -2,8 +2,7 @@ import { Profile, RequestUriMethod } from "../models/TransactionInitializationRe
 
 export const ACTIVE_TRANSACTION = 'ACTIVE_TRANSACTION';
 export const SCHEME = 'scheme';
-export const DEFAULT_SCHEME = 'haip-vp://';
 export const ISSUER_CHAIN = 'ISSUER_CHAIN';
 
 export const DefaultRequestUriMethod: RequestUriMethod = 'get';
-export const DefaultProfile: Profile = 'openid4vp';
+export const DefaultProfile: Profile = 'haip';

src/app/core/layout/wallet-layout/wallet-layout-header/wallet-layout-header.component.html

@@ -8,9 +8,6 @@
     <a id="inspectLogs" mat-menu-item (click)="inspectLogs()"
       >Inspect transaction logs</a
     >
-    <a id="customScheme" mat-menu-item (click)="changeCustomScheme()"
-      >Change default scheme</a
-    >
     <a id="issuerChain" mat-menu-item (click)="changeIssuerChain()"
       >Configure issuer chain</a
     >

src/app/core/layout/wallet-layout/wallet-layout-header/wallet-layout-header.component.ts

@@ -6,7 +6,6 @@ import { MatMenuModule } from "@angular/material/menu";
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { OpenLogsComponent } from "@shared/elements/open-logs/open-logs.component";
 import { MatDialog, MatDialogModule } from "@angular/material/dialog";
-import {InputSchemeComponent} from "@shared/elements/input-scheme/input-scheme.component";
 import { IssuerChainComponent } from '@app/shared/elements/trusted-issuer/issuer-chain.component';
 
 @Component({
@@ -40,16 +39,6 @@ export class WalletLayoutHeaderComponent {
     });
   }
 
-  changeCustomScheme () {
-    this.dialog.open(InputSchemeComponent, {
-      data: {
-        transactionId: '',
-        label: 'Inspect transaction logs',
-        isInspectLogs: true
-      },
-    });
-  }
-
   changeIssuerChain () {
     this.dialog.open(IssuerChainComponent, {
       data: {

src/app/core/models/TransactionInitializationRequest.ts

@@ -2,6 +2,17 @@ import { DCQL } from './dcql/DCQL';
 
 export type RequestUriMethod = 'get' | 'post';
 export type Profile = 'haip' | 'openid4vp';
+export type ProfileOptions = {
+  endpoint: string;
+}
+export const profileOptions: Record<Profile, ProfileOptions> = {
+  haip: {
+    endpoint: 'haip-vp://',
+  },
+  openid4vp: {
+    endpoint: 'openid4vp://',
+  },
+};
 
 export type TransactionInitializationRequest = {
   nonce: string;

src/app/features/presentation-request-preparation/components/presentation-options/presentation-options.component.html

@@ -21,8 +21,8 @@
             (valueChange)="profileChange.emit($event)"
             aria-label="Presentation Profile"
           >
+          <mat-button-toggle value="haip">HAIP</mat-button-toggle>
             <mat-button-toggle value="openid4vp">OpenID4VP</mat-button-toggle>
-            <mat-button-toggle value="haip">HAIP</mat-button-toggle>
           </mat-button-toggle-group>
         </div>
       </div>
@@ -48,14 +48,14 @@
 
       <div class="request-options-row">
         <div class="request-options-label">
-          <span>Authorization URI Scheme</span>
+          <span>Authorization Endpoint</span>
           <p class="request-options-helper">
-            Specify a custom URI for the authorization request
+            Specify an endpoint URI for the authorization request
           </p>
         </div>
         <div class="request-options-control">
           <mat-form-field appearance="outline" class="config-option-field">
-            <mat-label>Authorization URI Scheme</mat-label>
+            <mat-label>Authorization Endpoint</mat-label>
             <input
               matInput
               placeholder="scheme://"

src/app/features/presentation-request-preparation/home/home.component.ts

@@ -24,6 +24,7 @@ import {
 import { AttributeSelectionComponent } from '@features/presentation-request-preparation/components/attribute-selection/attribute-selection.component';
 import {
   Profile,
+  profileOptions,
   RequestUriMethod,
   TransactionInitializationRequest,
 } from '@core/models/TransactionInitializationRequest';
@@ -38,11 +39,9 @@ import { DCQLService } from '@app/core/services/dcql-service';
 import { Subject } from 'rxjs';
 import { SessionStorageService } from '@app/core/services/session-storage.service';
 import {
-  DEFAULT_SCHEME,
   DefaultProfile,
   DefaultRequestUriMethod,
   ISSUER_CHAIN,
-  SCHEME,
 } from '@app/core/constants/general';
 import { SUPPORTED_ATTESTATIONS } from '@app/core/constants/attestation-definitions';
 import { PresentationOptionsComponent } from '../components/presentation-options/presentation-options.component';
@@ -87,7 +86,7 @@ export class HomeComponent implements OnDestroy {
     nonNullable: true,
   });
   authorizationSchemeControl = new FormControl<string>(
-    this.getStoredAuthorizationScheme(),
+    profileOptions[DefaultProfile].endpoint,
     { nonNullable: true }
   );
   presentationProfileControl = new FormControl<Profile>(DefaultProfile, {
@@ -103,7 +102,7 @@ export class HomeComponent implements OnDestroy {
   selectedAttributes: { [id: string]: string[] } | null = {};
   selectedRequestUriMethod: RequestUriMethod = DefaultRequestUriMethod;
   selectedProfile: Profile = DefaultProfile;
-  authorizationRequestUri: string = DEFAULT_SCHEME;
+  authorizationRequestUri: string = profileOptions[DefaultProfile].endpoint;
 
   initializationRequest: TransactionInitializationRequest | null = null;
 
@@ -167,6 +166,8 @@ export class HomeComponent implements OnDestroy {
 
   handleProfileChangedEvent($event: string) {
     this.selectedProfile = $event as Profile;
+    this.authorizationSchemeControl.setValue(profileOptions[this.selectedProfile].endpoint);
+    this.authorizationRequestUri = profileOptions[this.selectedProfile].endpoint;
     if (this.selectedAttestations && this.selectedAttributes) {
       this.initializationRequest = this.prepareInitializationRequest(
         this.selectedAttestations,
@@ -257,12 +258,4 @@ export class HomeComponent implements OnDestroy {
   canProceed() {
     return this.initializationRequest !== null;
   }
-
-  private getStoredAuthorizationScheme(): string {
-    if (typeof window === 'undefined' || !window.localStorage) {
-      return DEFAULT_SCHEME;
-    }
-
-    return window.localStorage.getItem(SCHEME) ?? DEFAULT_SCHEME;
-  }
 }