From 8ca151574af7a0afd215427a56138ebd642f3cbb Mon Sep 17 00:00:00 2001
From: gofnnp <fbicha1234@gmail.com>
Date: Sun, 16 Oct 2022 22:05:12 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#12797=20=D0=94=D0=BE=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D1=84=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus-program/bonus-program.component.html  |  2 +-
 .../bonus-program/bonus-program.component.ts    | 17 ++++++++++++++---
 .../src/app/services/apple-wallet.service.ts    |  4 ++--
 angular/src/environments/environment.prod.ts    |  4 ++--
 angular/src/environments/environment.ts         |  4 ++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.html b/angular/src/app/pages/account/bonus-program/bonus-program.component.html
index 1d0d03c..e67f48f 100644
--- a/angular/src/app/pages/account/bonus-program/bonus-program.component.html
+++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.html
@@ -47,5 +47,5 @@
       </div>
     </div>
   </div>
-  <!-- <button *ngIf="deviceType == 'ios'" class="add-to-wallet" (click)="addCardToWallet($event)">Добавить в Apple Wallet</button> -->
+  <button *ngIf="deviceType == 'ios'" class="add-to-wallet" (click)="addCardToWallet($event)">Добавить в Apple Wallet</button>
 </div>
diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
index 15084f5..dca1624 100644
--- a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
+++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts
@@ -118,11 +118,22 @@ export class BonusProgramComponent implements OnInit {
   }
 
 
-  addCardToWallet(e: any) {
+  async addCardToWallet(e: any) {
     e.preventDefault()
     const token = this.cookiesService.getItem('token')
-    if (token) {
-      this.appleWallet.generateCard(token).subscribe({
+    const accountData = (await lastValueFrom(
+      this.jsonrpc
+        .rpc(
+          {
+            method: 'getTokenData',
+            params: [],
+          },
+          RpcService.authService,
+          true
+        )
+    )).data
+    if (token && accountData.user_id) {
+      this.appleWallet.generateCard(token, accountData.user_id).subscribe({
         next: (res: any) => {
           this.document.location.href = res.url
         },
diff --git a/angular/src/app/services/apple-wallet.service.ts b/angular/src/app/services/apple-wallet.service.ts
index 360cda3..96c8bf6 100644
--- a/angular/src/app/services/apple-wallet.service.ts
+++ b/angular/src/app/services/apple-wallet.service.ts
@@ -11,12 +11,12 @@ export class AppleWalletService {
     private http: HttpClient,
   ) {}
 
-  generateCard(token: string) {
+  generateCard(token: string, user_id: string) {
     let headers = new HttpHeaders();
     headers = headers.set('Authorization', environment.appleWalletSecret);
     const options = {
       headers: headers,
     };
-    return this.http.get(`${this.url}/client/${environment.clientName}/passUrl/${token}`, options)
+    return this.http.get(`${this.url}/client/${environment.clientName}/passUrl/${user_id}/token/${token}`, options)
   }
 }
diff --git a/angular/src/environments/environment.prod.ts b/angular/src/environments/environment.prod.ts
index c7d8c4d..9c10b86 100644
--- a/angular/src/environments/environment.prod.ts
+++ b/angular/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ import packageJson from '../../package.json';
 
 export const environment = {
   production: true,
-  appAuthEndpoint: 'https://testauth.crm4retail.ru/tnt',
+  appAuthEndpoint: 'https://auth.crm4retail.ru/tnt',
   appBonusEndpoint: 'https://customerapi2.mi.crm4retail.ru/json.rpc/',
   appWPEndpoint: 'http://213.239.210.240:4500/wp-json/woofood/v1/',
   hasBonusProgram: true,
@@ -18,7 +18,7 @@ export const environment = {
     measurementId: "G-RQF97ZK7R1"
   },
   version: packageJson.version,
-  appleWalletEndpoint: 'https://ru-academy.online/apns/api',
+  appleWalletEndpoint: 'https://apple-push-notifications.it-retail.tech/apns/api',
   appleWalletSecret: 'Token Z_vtuf_flvby!',
   clientName: 'fashionlogica'
 }
diff --git a/angular/src/environments/environment.ts b/angular/src/environments/environment.ts
index e857a70..dc6ad94 100644
--- a/angular/src/environments/environment.ts
+++ b/angular/src/environments/environment.ts
@@ -2,7 +2,7 @@ import packageJson from '../../package.json';
 
 export const environment = {
   production: false,
-  appAuthEndpoint: 'https://testauth.crm4retail.ru/tnt',
+  appAuthEndpoint: 'https://auth.crm4retail.ru/tnt',
   appBonusEndpoint: 'https://customerapi2.mi.crm4retail.ru/json.rpc/',
   appWPEndpoint: 'http://192.168.0.179:4200/wp-json/woofood/v1/',
   hasBonusProgram: true,
@@ -18,7 +18,7 @@ export const environment = {
     measurementId: 'G-RQF97ZK7R1',
   },
   version: packageJson.version,
-  appleWalletEndpoint: 'https://ru-academy.online/apns/api',
+  appleWalletEndpoint: 'http://192.168.0.179:4200/apns/api',
   appleWalletSecret: 'Token Z_vtuf_flvby!',
   clientName: 'fashionlogica'
 };