Skip to content

Commit a64a541

Browse files
ruizehungruizehung
authored
Merge pull request #1459 from numbersprotocol/revert-1453-feature-add-bubble-db-api-token-for-create-network-action-order-history
Revert "feat: add bubble db api token for creating network action order history"
2 parents ebbb44f + 063b6e7 commit a64a541

File tree

7 files changed

+2
-27
lines changed

7 files changed

+2
-27
lines changed

‎.github/workflows/build-apks.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,26 @@ jobs:
1515
storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
1616
storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
1717
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
18-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
1918
- folder_name: storage-qa-bubble-qa
2019
storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
2120
storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
2221
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
23-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
2422
- folder_name: storage-prod-bubble-qa
2523
storage_base_url: NUMBERS_STORAGE_BASE_URL
2624
storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
2725
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
28-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
2926
- folder_name: storage-dev-bubble-prod
3027
storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
3128
storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
3229
bubble_db_url: NUMBERS_BUBBLE_DB_URL
33-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
3430
- folder_name: storage-qa-bubble-prod
3531
storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
3632
storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
3733
bubble_db_url: NUMBERS_BUBBLE_DB_URL
38-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
3934
- folder_name: storage-prod-bubble-prod
4035
storage_base_url: NUMBERS_STORAGE_BASE_URL
4136
storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
4237
bubble_db_url: NUMBERS_BUBBLE_DB_URL
43-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
4438
steps:
4539
- uses: actions/checkout@v2
4640

@@ -60,7 +54,6 @@ jobs:
6054
NUMBERS_STORAGE_BASE_URL: ${{ secrets[matrix.storage_base_url] }}
6155
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
6256
NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
63-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets[matrix.bubble_db_api_token] }}
6457
run: |
6558
npm install -g @ionic/cli
6659
npm install

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
7777
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
7878
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
79-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
8079
run: npm run build
8180

8281
- name: Build Android
@@ -110,7 +109,6 @@ jobs:
110109
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
111110
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
112111
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
113-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
114112
run: npm run build
115113

116114
- name: Import the Code-Signing PKCS12 Certificate

‎.github/workflows/pre-release.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
3131
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
3232
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
33-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
3433
run: |
3534
npm install -g @ionic/cli
3635
npm install
@@ -91,7 +90,6 @@ jobs:
9190
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
9291
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
9392
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
94-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
9593
run: |
9694
npm install -g @ionic/cli
9795
npm install
@@ -162,32 +160,26 @@ jobs:
162160
storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
163161
storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
164162
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
165-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
166163
- folder_name: storage-qa-bubble-qa
167164
storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
168165
storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
169166
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
170-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
171167
- folder_name: storage-prod-bubble-qa
172168
storage_base_url: NUMBERS_STORAGE_BASE_URL
173169
storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
174170
bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
175-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
176171
- folder_name: storage-dev-bubble-prod
177172
storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
178173
storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
179174
bubble_db_url: NUMBERS_BUBBLE_DB_URL
180-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
181175
- folder_name: storage-qa-bubble-prod
182176
storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
183177
storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
184178
bubble_db_url: NUMBERS_BUBBLE_DB_URL
185-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
186179
- folder_name: storage-prod-bubble-prod
187180
storage_base_url: NUMBERS_STORAGE_BASE_URL
188181
storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
189182
bubble_db_url: NUMBERS_BUBBLE_DB_URL
190-
bubble_db_api_token: NUMBERS_BUBBLE_DB_API_TOKEN
191183
steps:
192184
- uses: actions/checkout@v2
193185

@@ -207,7 +199,6 @@ jobs:
207199
NUMBERS_STORAGE_BASE_URL: ${{ secrets[matrix.storage_base_url] }}
208200
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
209201
NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
210-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets[matrix.bubble_db_api_token] }}
211202
run: |
212203
npm install -g @ionic/cli
213204
npm install
@@ -251,7 +242,6 @@ jobs:
251242
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
252243
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
253244
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
254-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
255245
run: |
256246
npm install -g @ionic/cli
257247
npm install

‎.github/workflows/uiux-release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
2121
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
2222
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
23-
NUMBERS_BUBBLE_DB_API_TOKEN: ${{ secrets.NUMBERS_BUBBLE_DB_API_TOKEN }}
2423
run: |
2524
npm install -g @ionic/cli
2625
npm install

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ Set the system environment variables `NUMBERS_STORAGE_BASE_URL`, `NUMBERS_STORAG
2323
```txt
2424
export NUMBERS_STORAGE_BASE_URL="THE PRIVATE BASE URL"
2525
export NUMBERS_STORAGE_TRUSTED_CLIENT_KEY="THE TRUSTED CLIENT KEY"
26-
export NUMBERS_BUBBLE_DB_URL="BUBBLE DB URL"
27-
export BUBBLE_DB_API_TOKEN="BUBBLE DB API TOKEN"
26+
export NUMBERS_BUBBLE_DB_URL="THE BUBBLE DB URL"
2827
```
2928

3029
Preview the app in web browser.

‎set-secret.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ const envConfigFile = `
88
export const BASE_URL = '${process.env.NUMBERS_STORAGE_BASE_URL}';
99
export const TRUSTED_CLIENT_KEY = '${process.env.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY}';
1010
export const BUBBLE_DB_URL = '${process.env.NUMBERS_BUBBLE_DB_URL}';
11-
export const BUBBLE_DB_API_TOKEN = '${process.env.NUMBERS_BUBBLE_DB_API_TOKEN}';
1211
`;
1312
fs.writeFile(targetPath, envConfigFile, err => {
1413
if (err) {

‎src/app/shared/actions/service/order-history.service.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, defer, EMPTY, Observable } from 'rxjs';
55
import { concatMap, first, map, pluck, tap } from 'rxjs/operators';
66
import { WebCryptoApiSignatureProvider } from '../../collector/signature/web-crypto-api-signature-provider/web-crypto-api-signature-provider.service';
77
import { DiaBackendAssetRepository } from '../../dia-backend/asset/dia-backend-asset-repository.service';
8-
import { BUBBLE_DB_API_TOKEN, BUBBLE_DB_URL } from '../../dia-backend/secret';
8+
import { BUBBLE_DB_URL } from '../../dia-backend/secret';
99
import { NetworkAppOrder } from '../../dia-backend/store/dia-backend-store.service';
1010
import { DiaBackendTransactionRepository } from '../../dia-backend/transaction/dia-backend-transaction-repository.service';
1111
import { Proof } from '../../repositories/proof/proof';
@@ -64,9 +64,6 @@ export class OrderHistoryService {
6464
status_text: OrderStatus.Submitted,
6565
total_cost_number: Number(networkAppOrder.total_cost),
6666
uid_text: publicKey,
67-
},
68-
{
69-
headers: { authorization: `Bearer ${BUBBLE_DB_API_TOKEN}` },
7067
}
7168
)
7269
)

0 commit comments

Comments
 (0)