From 0654120275ccd80e5d27425a2434306762476d85 Mon Sep 17 00:00:00 2001 From: vafeini <129304399+vafeini@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:22:38 +0200 Subject: [PATCH] Feature issue 28 (#30) * DEV: add the mobile flow * DEV: finishing flow for the mobile --------- Co-authored-by: Apostolos GALANOPOULOS --- src/app/app-routing.module.ts | 13 ++++- src/app/core/constants/constants.ts | 1 + .../core/services/device-detector.service.ts | 27 ++++++++++ .../core/services/local-storage.service.ts | 17 +++++++ .../online-authentication-siop.service.ts | 28 +++++++++-- .../presentation-definition.service.ts | 24 +++++++-- src/app/core/utils/uuid.ts | 3 ++ .../home/components/home/home.component.ts | 6 ++- .../create-a-scenario.component.ts | 15 ++++-- .../features/test-qr/test-qr.component.scss | 13 ++--- .../components/qr-code/qr-code.component.scss | 3 +- .../components/qr-code/qr-code.component.ts | 50 ++++++++++++------- .../resolver/wallet-redirect-resolver.ts | 44 ++++++++++++++++ .../wallet-redirect.component.html | 8 +++ .../wallet-redirect.component.scss | 15 ++++++ .../wallet-redirect.component.spec.ts | 23 +++++++++ .../wallet-redirect.component.ts | 24 +++++++++ src/proxy.conf.json | 4 +- src/reset.scss | 4 -- 19 files changed, 278 insertions(+), 44 deletions(-) create mode 100644 src/app/core/constants/constants.ts create mode 100644 src/app/core/services/device-detector.service.ts create mode 100644 src/app/core/services/local-storage.service.ts create mode 100644 src/app/core/utils/uuid.ts create mode 100644 src/app/features/wallet-redirect/resolver/wallet-redirect-resolver.ts create mode 100644 src/app/features/wallet-redirect/wallet-redirect.component.html create mode 100644 src/app/features/wallet-redirect/wallet-redirect.component.scss create mode 100644 src/app/features/wallet-redirect/wallet-redirect.component.spec.ts create mode 100644 src/app/features/wallet-redirect/wallet-redirect.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d3a1633..7807f2f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,5 +1,10 @@ import { NgModule } from '@angular/core'; import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { WalletRedirectResolver } from './features/wallet-redirect/resolver/wallet-redirect-resolver'; +import { PresentationDefinitionService } from './core/services/presentation-definition.service'; +import { CborDecodeService } from './core/services/cbor/cbor-decode.service'; +import { JWTService } from './core/services/jwt.service'; +import { NavigateService } from './core/services/navigate.service'; const routes: Routes = [ { path: '', redirectTo: 'home', pathMatch: 'full' }, @@ -17,8 +22,12 @@ const routes: Routes = [ loadChildren: () => import('./features/siop-custom/cbor-selectable.module'). then(m => m.SiopCustomModule )}, { - path: 'test-qr', - loadComponent: () => import('./features/test-qr/test-qr.component').then(m => m.TestQrComponent ) + path: 'get-wallet-code', + loadComponent: () => import('./features/wallet-redirect/wallet-redirect.component').then(c => c.WalletRedirectComponent), + providers: [PresentationDefinitionService, CborDecodeService, JWTService, NavigateService], + resolve: { + data: WalletRedirectResolver + } } ]; diff --git a/src/app/core/constants/constants.ts b/src/app/core/constants/constants.ts new file mode 100644 index 0000000..8407169 --- /dev/null +++ b/src/app/core/constants/constants.ts @@ -0,0 +1 @@ +export const UI_PRESENTATION = 'UI_PRESENTATION'; diff --git a/src/app/core/services/device-detector.service.ts b/src/app/core/services/device-detector.service.ts new file mode 100644 index 0000000..b8fe4f2 --- /dev/null +++ b/src/app/core/services/device-detector.service.ts @@ -0,0 +1,27 @@ +import { PLATFORM_ID, Inject, Injectable } from '@angular/core'; +import { isPlatformBrowser } from '@angular/common'; + +@Injectable({ + providedIn: 'root', +}) +export class DeviceDetectorService { + userAgent = ''; + + constructor (@Inject(PLATFORM_ID) private platformId: object) { + if (isPlatformBrowser(this.platformId) && typeof window !== 'undefined') { + this.userAgent = window.navigator.userAgent; + } + } + + public isMobile (userAgent = this.userAgent): boolean { + const regexs = [/(Android)(.+)(Mobile)/i, /BlackBerry/i, /iPhone|iPod/i, /Opera Mini/i, /IEMobile/i]; + return regexs.some((b) => userAgent.match(b)); + } + + public isTablet (userAgent = this.userAgent): boolean { + const regex = /(ipad|tablet|(android(?!.*mobile))|(windows(?!.*phone)(.*touch))|kindle|playbook|silk|(puffin(?!.*(IP|AP|WP))))/; + return regex.test(userAgent.toLowerCase()); + } + + isDesktop = (): boolean => !this.isMobile() && !this.isMobile(); +} diff --git a/src/app/core/services/local-storage.service.ts b/src/app/core/services/local-storage.service.ts new file mode 100644 index 0000000..73512b3 --- /dev/null +++ b/src/app/core/services/local-storage.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class LocalStorageService { + + get (key: string): string | null { + return localStorage.getItem(key); + } + set (key: string, value: string): void { + localStorage.setItem(key,value); + } + remove (key: string) { + localStorage.removeItem(key); + } +} diff --git a/src/app/core/services/online-authentication-siop.service.ts b/src/app/core/services/online-authentication-siop.service.ts index 6ccb42e..d630993 100644 --- a/src/app/core/services/online-authentication-siop.service.ts +++ b/src/app/core/services/online-authentication-siop.service.ts @@ -1,26 +1,46 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { tap } from 'rxjs/operators'; import { HttpService } from '../network/http/http.service'; import { PresentationDefinitionResponse } from '../models/presentation-definition-response'; import { PID_PRESENTATION_DEFINITION } from '../data/pid_presentation_definition'; +import { LocalStorageService } from './local-storage.service'; +import * as constants from '@core/constants/constants'; +import { DeviceDetectorService } from './device-detector.service'; +import { environment } from '@environments/environment'; @Injectable() export class OnlineAuthenticationSIOPService { constructor ( - private readonly httpService: HttpService + private readonly httpService: HttpService, + private readonly localStorageService: LocalStorageService, + private readonly deviceDetectorService: DeviceDetectorService ) { } initTransaction (): Observable { - const dataRequest = { + const dataRequest: any = { 'type': 'id_token', 'id_token_type': 'subject_signed_id_token', 'nonce': 'nonce' }; + if (!this.deviceDetectorService.isDesktop()) { + dataRequest['wallet_response_redirect_uri_template'] = environment.apiUrl+'/get-wallet-code/?response_code={RESPONSE_CODE}'; + } return this.httpService.post - ('ui/presentations', dataRequest); + ('ui/presentations', dataRequest) + .pipe( + tap((res) => { this.localStorageService.set(constants.UI_PRESENTATION, JSON.stringify(res));}) + ); } initCborTransaction (): Observable { - return this.httpService.post('ui/presentations', PID_PRESENTATION_DEFINITION); + const payload: any = PID_PRESENTATION_DEFINITION; + if (!this.deviceDetectorService.isDesktop()) { + payload['wallet_response_redirect_uri_template'] = environment.apiUrl+'/get-wallet-code?response_code={RESPONSE_CODE}'; + } + return this.httpService.post('ui/presentations', payload) + .pipe( + tap((res) => { this.localStorageService.set(constants.UI_PRESENTATION, JSON.stringify(res));}) + ); } } diff --git a/src/app/core/services/presentation-definition.service.ts b/src/app/core/services/presentation-definition.service.ts index f39de49..f13b9b2 100644 --- a/src/app/core/services/presentation-definition.service.ts +++ b/src/app/core/services/presentation-definition.service.ts @@ -1,24 +1,42 @@ import { Injectable } from '@angular/core'; import { HttpService } from '@app/core/network/http/http.service'; import { Observable } from 'rxjs'; +import { tap } from 'rxjs/operators'; import { isJSON } from '../utils/ValidationJSON'; import { PresentationDefinitionResponse } from '../models/presentation-definition-response'; import { PresentationsResponse } from '../models/presentations-response'; +import { LocalStorageService } from './local-storage.service'; +import * as constants from '@core/constants/constants'; +import { DeviceDetectorService } from './device-detector.service'; +import { environment } from '@environments/environment'; @Injectable() export class PresentationDefinitionService { - constructor (private readonly httpService: HttpService) { } + constructor ( + private readonly httpService: HttpService, + private readonly localStorageService: LocalStorageService, + private readonly deviceDetectorService: DeviceDetectorService + ) { } - getWalletResponse (presentation_id: string, nonce: string) : Observable { - return this.httpService.get(`ui/presentations/${presentation_id}?nonce=${nonce}`); + getWalletResponseWithCode (presentation_id: string, code: string) : Observable { + return this.httpService.get(`ui/presentations/${presentation_id}?response_code=${code}`); + } + getWalletResponse (presentation_id: string) : Observable { + return this.httpService.get(`ui/presentations/${presentation_id}`); } generateCode (requestCode: string): Observable { return new Observable((subscriber) => { if (requestCode && isJSON(requestCode)) { const payload = JSON.parse(requestCode); + if (!this.deviceDetectorService.isDesktop()) { + payload['wallet_response_redirect_uri_template'] = environment.apiUrl+'/get-wallet-code?response_code={RESPONSE_CODE}"'; + } this.httpService.post('ui/presentations', payload) + .pipe( + tap((res) => { this.localStorageService.set(constants.UI_PRESENTATION, JSON.stringify(res));}) + ) .subscribe((data) => { subscriber.next(data); }); diff --git a/src/app/core/utils/uuid.ts b/src/app/core/utils/uuid.ts new file mode 100644 index 0000000..5043d98 --- /dev/null +++ b/src/app/core/utils/uuid.ts @@ -0,0 +1,3 @@ +export const uuidv4 = () => { + return crypto.randomUUID(); +}; diff --git a/src/app/features/home/components/home/home.component.ts b/src/app/features/home/components/home/home.component.ts index dc2588b..f63a3c9 100644 --- a/src/app/features/home/components/home/home.component.ts +++ b/src/app/features/home/components/home/home.component.ts @@ -10,6 +10,8 @@ import { MenuOption } from '../../models/menu-option'; import { WalletLayoutComponent } from '@app/core/layout/wallet-layout/wallet-layout.component'; import { BodyAction } from '@app/shared/elements/body-actions/models/BodyAction'; import { HOME_ACTIONS } from '@app/core/utils/pages-actions'; +import { LocalStorageService } from '@app/core/services/local-storage.service'; +import * as constants from '@core/constants/constants'; @Component({ selector: 'vc-home', @@ -28,8 +30,10 @@ export class HomeComponent implements OnInit { private navigateService: NavigateService, private readonly onlineAuthenticationSIOPService: OnlineAuthenticationSIOPService, private readonly dataService: DataService, - private readonly homeService: HomeService + private readonly homeService: HomeService, + private readonly localStorageService: LocalStorageService ) { + this.localStorageService.remove(constants.UI_PRESENTATION); } ngOnInit (): void { this.options = this.homeService.options; diff --git a/src/app/features/siop-custom/components/create-a-scenario/create-a-scenario.component.ts b/src/app/features/siop-custom/components/create-a-scenario/create-a-scenario.component.ts index 9aa7e91..c406a91 100644 --- a/src/app/features/siop-custom/components/create-a-scenario/create-a-scenario.component.ts +++ b/src/app/features/siop-custom/components/create-a-scenario/create-a-scenario.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ChangeDetectorRef, Input, OnChanges, SimpleChanges } from '@angular/core'; +import { Component, OnInit, ChangeDetectorRef, Injector } from '@angular/core'; import { FormGroup } from '@angular/forms'; import { catchError } from 'rxjs'; import { PresentationDefinitionResponse } from '@core/models/presentation-definition-response'; @@ -11,7 +11,8 @@ import { NavigateService } from '@app/core/services/navigate.service'; import { CBORFields } from '@app/core/data/cbor_fields'; import { CBORField } from '@app/core/models/CBORFields'; import { HelperCborSelectableService } from '../../services/helper-cbor-selectable.service'; - +import { LocalStorageService } from '@app/core/services/local-storage.service'; +import * as constants from '@core/constants/constants'; @Component({ selector: 'vc-create-a-scenario', templateUrl: './create-a-scenario.component.html', @@ -27,18 +28,24 @@ export class CreateAScenarioComponent implements OnInit { definition = {...PID_PRESENTATION_DEFINITION}; definitionText!: string; definitionFields: DefinitionPath[] = []; + private readonly navigateService!: NavigateService; + private readonly helperCborSelectableService!: HelperCborSelectableService; + private readonly localStorageService!: LocalStorageService; constructor ( private readonly createFormService: CreateFormService, private readonly presentationDefinitionService: PresentationDefinitionService, private readonly dataService: DataService, private readonly changeDetectorRef: ChangeDetectorRef, - private readonly navigateService: NavigateService, - private readonly helperCborSelectableService: HelperCborSelectableService + private readonly injector: Injector, ) { + this.navigateService = this.injector.get(NavigateService); + this.helperCborSelectableService = this.injector.get(HelperCborSelectableService); + this.localStorageService = this.injector.get(LocalStorageService); this.form = this.createFormService.form; this.fields = CBORFields; } ngOnInit (): void { + this.localStorageService.remove(constants.UI_PRESENTATION); const requiredFields = this.getFields() .filter((item) => item.filter ); requiredFields.forEach((item: DefinitionPath) => { diff --git a/src/app/features/test-qr/test-qr.component.scss b/src/app/features/test-qr/test-qr.component.scss index 122d9a2..e65e993 100644 --- a/src/app/features/test-qr/test-qr.component.scss +++ b/src/app/features/test-qr/test-qr.component.scss @@ -1,9 +1,10 @@ :host { - .qr-container { - display: flex; - flex-direction: row; - :first-child { - margin-right: 3rem; + .qr-container { + display: flex; + flex-direction: row; + + :first-child { + margin-right: 3rem; + } } - } } diff --git a/src/app/features/verifiable-credential/components/qr-code/qr-code.component.scss b/src/app/features/verifiable-credential/components/qr-code/qr-code.component.scss index 37393ef..21d2399 100644 --- a/src/app/features/verifiable-credential/components/qr-code/qr-code.component.scss +++ b/src/app/features/verifiable-credential/components/qr-code/qr-code.component.scss @@ -39,8 +39,9 @@ color: temp.$textDarkPrimary; cursor: pointer; } + a { - margin-top: temp.$spaceBasic; + margin-top: temp.$spaceBasic; } } } diff --git a/src/app/features/verifiable-credential/components/qr-code/qr-code.component.ts b/src/app/features/verifiable-credential/components/qr-code/qr-code.component.ts index d372dd5..508f303 100644 --- a/src/app/features/verifiable-credential/components/qr-code/qr-code.component.ts +++ b/src/app/features/verifiable-credential/components/qr-code/qr-code.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild, OnDestroy } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild, OnDestroy, Injector } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SharedModule } from '@app/shared/shared.module'; import { DataService } from '@app/core/services/data.service'; @@ -13,6 +13,9 @@ import { WalletResponse } from '../../models/WalletResponse'; import { JWTService } from '@app/core/services/jwt.service'; import { environment } from '@environments/environment'; import { PresentationsResultsComponent } from '../presentations-results/presentations-results.component'; +import { DeviceDetectorService } from '@app/core/services/device-detector.service'; +import { LocalStorageService } from '@app/core/services/local-storage.service'; +import * as constants from '@core/constants/constants'; // eslint-disable-next-line @typescript-eslint/no-explicit-any declare let QRCode: any; @@ -29,6 +32,7 @@ declare let QRCode: any; export class QrCodeComponent implements OnInit, OnDestroy { destroy$ = new Subject(); + stopPlay$ = new ReplaySubject(1); @ViewChild('qrCode') qrCode!: ElementRef; hasResult = false; @@ -40,48 +44,56 @@ export class QrCodeComponent implements OnInit, OnDestroy { presentationDefinition!: PresentationDefinitionResponse; redirectUrl!: string; + private readonly deviceDetectorService!: DeviceDetectorService; + private readonly jWTService!: JWTService; + private readonly localStorageService!: LocalStorageService; constructor ( private readonly presentationDefinitionService: PresentationDefinitionService, private readonly dataService: DataService, private readonly navigateService: NavigateService, private readonly changeDetectorRef: ChangeDetectorRef, private readonly cborDecodeService: CborDecodeService, - private readonly jWTService: JWTService - ) {} + private readonly injector: Injector, + ) { + this.deviceDetectorService = this.injector.get(DeviceDetectorService); + this.jWTService = this.injector.get(JWTService); + this.localStorageService = this.injector.get(LocalStorageService); + } ngOnInit (): void { this.presentationDefinition = this.dataService.QRCode as PresentationDefinitionResponse; if (!this.presentationDefinition) { this.navigateService.goHome(); - } - this.displayButtonJWTObject = false; - this.redirectUrl = this.buildQrCode(this.presentationDefinition); + } else { + this.displayButtonJWTObject = false; + this.redirectUrl = this.buildQrCode(this.presentationDefinition); - this.setUpQrCode(this.redirectUrl); - this.pollingRequest(this.presentationDefinition.presentation_id,'nonce'); + this.setUpQrCode(this.redirectUrl); + if (this.deviceDetectorService.isDesktop()) { + this.pollingRequest(this.presentationDefinition.presentation_id); + } + } } setUpQrCode (qr: string) { new QRCode(document.getElementById('qrcode'), { text: qr, - // colorDark : '#F5F5F5', - // colorLight : '#5a11df', correctLevel: QRCode.CorrectLevel.L, }); } - pollingRequest (presentation_id: string, nonce: string) { + pollingRequest (presentation_id: string) { const source = interval(2000); - const stopPlay$ = new ReplaySubject(1); source .pipe( - takeUntil(stopPlay$), + takeUntil(this.stopPlay$), take(60) ) .subscribe(() => { - this.presentationDefinitionService.getWalletResponse(presentation_id,nonce). + this.presentationDefinitionService.getWalletResponse(presentation_id). pipe( + takeUntil(this.stopPlay$), map((data) => data as WalletResponse), switchMap((res: WalletResponse) => { return forkJoin({ @@ -91,7 +103,6 @@ export class QrCodeComponent implements OnInit, OnDestroy { take(1) ); }), - takeUntil(this.destroy$), ) .subscribe( (res: TransformedResponse) =>{ @@ -100,7 +111,8 @@ export class QrCodeComponent implements OnInit, OnDestroy { divElement.style.display='none'; this.hasResult = true; this.changeDetectorRef.detectChanges(); - stopPlay$.next(1); + this.localStorageService.remove(constants.UI_PRESENTATION); + this.stopPlay$.next(1); }, ); }); @@ -124,7 +136,11 @@ export class QrCodeComponent implements OnInit, OnDestroy { } ngOnDestroy (): void { - this.destroy$.unsubscribe(); + // this.localStorageService.remove(constants.UI_PRESENTATION); + this.destroy$.next(''); + this.destroy$.complete(); + this.stopPlay$.next(''); + this.stopPlay$.complete(); this.dataService.setQRCode(null); } } diff --git a/src/app/features/wallet-redirect/resolver/wallet-redirect-resolver.ts b/src/app/features/wallet-redirect/resolver/wallet-redirect-resolver.ts new file mode 100644 index 0000000..e926ed6 --- /dev/null +++ b/src/app/features/wallet-redirect/resolver/wallet-redirect-resolver.ts @@ -0,0 +1,44 @@ +import { inject } from '@angular/core'; +import { KeyValue } from '@angular/common'; +import { ActivatedRouteSnapshot, ResolveFn, RouterStateSnapshot } from '@angular/router'; +import { LocalStorageService } from '@app/core/services/local-storage.service'; +import { PresentationDefinitionService } from '@app/core/services/presentation-definition.service'; +import { of, Observable, forkJoin, EMPTY } from 'rxjs'; +import { switchMap, take } from 'rxjs/operators'; +import * as constants from '@core/constants/constants'; +import { PresentationDefinitionResponse } from '@app/core/models/presentation-definition-response'; +import { WalletResponse } from '@app/features/verifiable-credential/models/WalletResponse'; +import { JWTService } from '@app/core/services/jwt.service'; +import { CborDecodeService } from '@app/core/services/cbor/cbor-decode.service'; + +export const WalletRedirectResolver: ResolveFn<{vpToken: KeyValue[], idToken: KeyValue[]}> = + // eslint-disable-next-line @typescript-eslint/no-unused-vars + (route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): + Observable<{vpToken: KeyValue[], idToken: KeyValue[]}> => { + const services = { + definition: inject(PresentationDefinitionService), + localStorage: inject(LocalStorageService), + cborDecode: inject(CborDecodeService), + jWT: inject(JWTService), + }; + + let data: PresentationDefinitionResponse; + const stData: string | null = services.localStorage.get(constants.UI_PRESENTATION); + const responseCode: string = route.queryParams['response_code']; + if (stData && responseCode) { + data = JSON.parse( stData ); + return services.definition.getWalletResponseWithCode(data.presentation_id, responseCode) + .pipe( + switchMap((res: WalletResponse) => { + return forkJoin({ + vpToken: res.vp_token ? services.cborDecode.decode(res.vp_token) : of([]), + idToken: res.id_token ? services.jWT.decode(res.id_token) : of([]), + }).pipe( + take(1) + ); + }), + ); + } else { + return EMPTY; + } + }; diff --git a/src/app/features/wallet-redirect/wallet-redirect.component.html b/src/app/features/wallet-redirect/wallet-redirect.component.html new file mode 100644 index 0000000..ef60591 --- /dev/null +++ b/src/app/features/wallet-redirect/wallet-redirect.component.html @@ -0,0 +1,8 @@ + +
+ +
+ +
+
+ diff --git a/src/app/features/wallet-redirect/wallet-redirect.component.scss b/src/app/features/wallet-redirect/wallet-redirect.component.scss new file mode 100644 index 0000000..5a26206 --- /dev/null +++ b/src/app/features/wallet-redirect/wallet-redirect.component.scss @@ -0,0 +1,15 @@ +@use '/src/template' as temp; +@use '/src/layout-breakpoint' as points; + +:host { + .display-container { + -webkit-box-pack: center; + display: flex; + height: fit-content; + justify-content: center; + max-height: temp.$body-height; + overflow-y: auto; + padding: temp.$spaceBasic; + width: 100%; + } +} diff --git a/src/app/features/wallet-redirect/wallet-redirect.component.spec.ts b/src/app/features/wallet-redirect/wallet-redirect.component.spec.ts new file mode 100644 index 0000000..7fe9071 --- /dev/null +++ b/src/app/features/wallet-redirect/wallet-redirect.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WalletRedirectComponent } from './wallet-redirect.component'; + +describe('WalletRedirectComponent', () => { + let component: WalletRedirectComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ WalletRedirectComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(WalletRedirectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/wallet-redirect/wallet-redirect.component.ts b/src/app/features/wallet-redirect/wallet-redirect.component.ts new file mode 100644 index 0000000..a879818 --- /dev/null +++ b/src/app/features/wallet-redirect/wallet-redirect.component.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ActivatedRoute } from '@angular/router'; +import { WalletLayoutComponent } from '@app/core/layout/wallet-layout/wallet-layout.component'; +import { TransformedResponse } from '../verifiable-credential/models/TransformedResponse'; +import { PresentationsResultsComponent } from '../verifiable-credential/components/presentations-results/presentations-results.component'; + +@Component({ + selector: 'vc-wallet-redirect', + standalone: true, + imports: [CommonModule, WalletLayoutComponent, PresentationsResultsComponent], + templateUrl: './wallet-redirect.component.html', + styleUrls: ['./wallet-redirect.component.scss'] +}) +export class WalletRedirectComponent implements OnInit { + data!: TransformedResponse; + constructor ( + private readonly activeRoute: ActivatedRoute + ) {} + ngOnInit (): void { + this.data = this.activeRoute.snapshot.data['data']; + } + +} diff --git a/src/proxy.conf.json b/src/proxy.conf.json index cd88c15..4d458ab 100644 --- a/src/proxy.conf.json +++ b/src/proxy.conf.json @@ -1,12 +1,12 @@ { "/ui": { - "target": "http://localhost:8080", + "target": "https://eudi.netcompany-intrasoft.com/san-dns", "secure": false, "logLevel": "debug", "changeOrigin": true }, "/wallet": { - "target": "http://localhost:8080", + "target": "https://eudi.netcompany-intrasoft.com/san-dns", "secure": false, "logLevel": "debug", "changeOrigin": true diff --git a/src/reset.scss b/src/reset.scss index 424f12c..31814a7 100644 --- a/src/reset.scss +++ b/src/reset.scss @@ -1,9 +1,5 @@ @use '/src/template' as temp; -.ͼe { - // color: #9af3b1 !important; -} - .mdc-list-item__primary-text { color: temp.$textDarkSecondary !important; }