Skip to content

Commit 4431464

Browse files
hlshenhlshen
committed
Refactor api.ts file constants to getters
1 parent 90b6506 commit 4431464

File tree

104 files changed

+587
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+587
-587
lines changed

‎src/accountExporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { googleOrigin } from "./api";
88
import * as utils from "./utils";
99

1010
const apiClient = new Client({
11-
urlPrefix: googleOrigin,
11+
urlPrefix: googleOrigin(),
1212
});
1313

1414
// TODO: support for MFA at runtime was added in PR #3173, but this exporter currently ignores `mfaInfo` and loses the data on export.

‎src/accountImporter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FirebaseError } from "./error";
77
import * as utils from "./utils";
88

99
const apiClient = new Client({
10-
urlPrefix: googleOrigin,
10+
urlPrefix: googleOrigin(),
1111
});
1212

1313
// TODO: support for MFA at runtime was added in PR #3173, but this importer currently ignores `mfaInfo` and loses the data on import.

‎src/api.ts‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,69 @@ import * as utils from "./utils";
55

66
let commandScopes = new Set<string>();
77

8-
export const authProxyOrigin = utils.envOverride(
8+
export const authProxyOrigin = () => utils.envOverride(
99
"FIREBASE_AUTHPROXY_URL",
1010
"https://auth.firebase.tools",
1111
);
1212
// "In this context, the client secret is obviously not treated as a secret"
1313
// https://developers.google.com/identity/protocols/OAuth2InstalledApp
14-
export const clientId = utils.envOverride(
14+
export const clientId = () => utils.envOverride(
1515
"FIREBASE_CLIENT_ID",
1616
"563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com",
1717
);
18-
export const clientSecret = utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi");
19-
export const cloudbillingOrigin = utils.envOverride(
18+
export const clientSecret = () => utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi");
19+
export const cloudbillingOrigin = () => utils.envOverride(
2020
"FIREBASE_CLOUDBILLING_URL",
2121
"https://cloudbilling.googleapis.com",
2222
);
23-
export const cloudloggingOrigin = utils.envOverride(
23+
export const cloudloggingOrigin = () => utils.envOverride(
2424
"FIREBASE_CLOUDLOGGING_URL",
2525
"https://logging.googleapis.com",
2626
);
27-
export const cloudMonitoringOrigin = utils.envOverride(
27+
export const cloudMonitoringOrigin = () => utils.envOverride(
2828
"CLOUD_MONITORING_URL",
2929
"https://monitoring.googleapis.com",
3030
);
31-
export const containerRegistryDomain = utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io");
32-
export const artifactRegistryDomain = utils.envOverride(
31+
export const containerRegistryDomain = () => utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io");
32+
export const artifactRegistryDomain = () => utils.envOverride(
3333
"ARTIFACT_REGISTRY_DOMAIN",
3434
"https://artifactregistry.googleapis.com",
3535
);
36-
export const appDistributionOrigin = utils.envOverride(
36+
export const appDistributionOrigin = () => utils.envOverride(
3737
"FIREBASE_APP_DISTRIBUTION_URL",
3838
"https://firebaseappdistribution.googleapis.com",
3939
);
40-
export const authOrigin = utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
41-
export const consoleOrigin = utils.envOverride(
40+
export const authOrigin = () => utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
41+
export const consoleOrigin = () => utils.envOverride(
4242
"FIREBASE_CONSOLE_URL",
4343
"https://console.firebase.google.com",
4444
);
45-
export const deployOrigin = utils.envOverride(
45+
export const deployOrigin = () => utils.envOverride(
4646
"FIREBASE_DEPLOY_URL",
4747
utils.envOverride("FIREBASE_UPLOAD_URL", "https://deploy.firebase.com"),
4848
);
49-
export const dynamicLinksOrigin = utils.envOverride(
49+
export const dynamicLinksOrigin = () => utils.envOverride(
5050
"FIREBASE_DYNAMIC_LINKS_URL",
5151
"https://firebasedynamiclinks.googleapis.com",
5252
);
53-
export const dynamicLinksKey = utils.envOverride(
53+
export const dynamicLinksKey = () => utils.envOverride(
5454
"FIREBASE_DYNAMIC_LINKS_KEY",
5555
"AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ",
5656
);
57-
export const eventarcOrigin = utils.envOverride("EVENTARC_URL", "https://eventarc.googleapis.com");
58-
export const firebaseApiOrigin = utils.envOverride(
57+
export const eventarcOrigin = () => utils.envOverride("EVENTARC_URL", "https://eventarc.googleapis.com");
58+
export const firebaseApiOrigin = () => utils.envOverride(
5959
"FIREBASE_API_URL",
6060
"https://firebase.googleapis.com",
6161
);
62-
export const firebaseExtensionsRegistryOrigin = utils.envOverride(
62+
export const firebaseExtensionsRegistryOrigin = () => utils.envOverride(
6363
"FIREBASE_EXT_REGISTRY_ORIGIN",
6464
"https://extensions-registry.firebaseapp.com",
6565
);
66-
export const firedataOrigin = utils.envOverride(
66+
export const firedataOrigin = () => utils.envOverride(
6767
"FIREBASE_FIREDATA_URL",
6868
"https://mobilesdk-pa.googleapis.com",
6969
);
70-
export const firestoreOriginOrEmulator = utils.envOverride(
70+
export const firestoreOriginOrEmulator = () => utils.envOverride(
7171
Constants.FIRESTORE_EMULATOR_HOST,
7272
utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"),
7373
(val) => {
@@ -77,131 +77,131 @@ export const firestoreOriginOrEmulator = utils.envOverride(
7777
return `http://${val}`;
7878
},
7979
);
80-
export const firestoreOrigin = utils.envOverride(
80+
export const firestoreOrigin = () => utils.envOverride(
8181
"FIRESTORE_URL",
8282
"https://firestore.googleapis.com",
8383
);
84-
export const functionsOrigin = utils.envOverride(
84+
export const functionsOrigin = () => utils.envOverride(
8585
"FIREBASE_FUNCTIONS_URL",
8686
"https://cloudfunctions.googleapis.com",
8787
);
88-
export const functionsV2Origin = utils.envOverride(
88+
export const functionsV2Origin = () => utils.envOverride(
8989
"FIREBASE_FUNCTIONS_V2_URL",
9090
"https://cloudfunctions.googleapis.com",
9191
);
92-
export const runOrigin = utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
93-
export const functionsDefaultRegion = utils.envOverride(
92+
export const runOrigin = () => utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
93+
export const functionsDefaultRegion = () => utils.envOverride(
9494
"FIREBASE_FUNCTIONS_DEFAULT_REGION",
9595
"us-central1",
9696
);
9797

98-
export const cloudbuildOrigin = utils.envOverride(
98+
export const cloudbuildOrigin = () => utils.envOverride(
9999
"FIREBASE_CLOUDBUILD_URL",
100100
"https://cloudbuild.googleapis.com",
101101
);
102102

103-
export const developerConnectOrigin = utils.envOverride(
103+
export const developerConnectOrigin = () => utils.envOverride(
104104
"FIREBASE_DEVELOPERCONNECT_URL",
105105
"https://developerconnect.googleapis.com",
106106
);
107107

108-
export const developerConnectP4SAOrigin = utils.envOverride(
108+
export const developerConnectP4SAOrigin = () => utils.envOverride(
109109
"FIREBASE_DEVELOPERCONNECT_P4SA_URL",
110110
"gcp-sa-developerconnect.iam.gserviceaccount.com",
111111
);
112112

113-
export const cloudschedulerOrigin = utils.envOverride(
113+
export const cloudschedulerOrigin = () => utils.envOverride(
114114
"FIREBASE_CLOUDSCHEDULER_URL",
115115
"https://cloudscheduler.googleapis.com",
116116
);
117-
export const cloudTasksOrigin = utils.envOverride(
117+
export const cloudTasksOrigin = () => utils.envOverride(
118118
"FIREBASE_CLOUD_TAKS_URL",
119119
"https://cloudtasks.googleapis.com",
120120
);
121-
export const pubsubOrigin = utils.envOverride(
121+
export const pubsubOrigin = () => utils.envOverride(
122122
"FIREBASE_PUBSUB_URL",
123123
"https://pubsub.googleapis.com",
124124
);
125-
export const googleOrigin = utils.envOverride(
125+
export const googleOrigin = () => utils.envOverride(
126126
"FIREBASE_TOKEN_URL",
127127
utils.envOverride("FIREBASE_GOOGLE_URL", "https://www.googleapis.com"),
128128
);
129-
export const hostingOrigin = utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app");
130-
export const identityOrigin = utils.envOverride(
129+
export const hostingOrigin = () => utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app");
130+
export const identityOrigin = () => utils.envOverride(
131131
"FIREBASE_IDENTITY_URL",
132132
"https://identitytoolkit.googleapis.com",
133133
);
134-
export const iamOrigin = utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com");
135-
export const extensionsOrigin = utils.envOverride(
134+
export const iamOrigin = () => utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com");
135+
export const extensionsOrigin = () => utils.envOverride(
136136
"FIREBASE_EXT_URL",
137137
"https://firebaseextensions.googleapis.com",
138138
);
139-
export const extensionsPublisherOrigin = utils.envOverride(
139+
export const extensionsPublisherOrigin = () => utils.envOverride(
140140
"FIREBASE_EXT_PUBLISHER_URL",
141141
"https://firebaseextensionspublisher.googleapis.com",
142142
);
143-
export const extensionsTOSOrigin = utils.envOverride(
143+
export const extensionsTOSOrigin = () => utils.envOverride(
144144
"FIREBASE_EXT_TOS_URL",
145145
"https://firebaseextensionstos-pa.googleapis.com",
146146
);
147-
export const realtimeOrigin = utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com");
148-
export const rtdbManagementOrigin = utils.envOverride(
147+
export const realtimeOrigin = () => utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com");
148+
export const rtdbManagementOrigin = () => utils.envOverride(
149149
"FIREBASE_RTDB_MANAGEMENT_URL",
150150
"https://firebasedatabase.googleapis.com",
151151
);
152-
export const rtdbMetadataOrigin = utils.envOverride(
152+
export const rtdbMetadataOrigin = () => utils.envOverride(
153153
"FIREBASE_RTDB_METADATA_URL",
154154
"https://metadata-dot-firebase-prod.appspot.com",
155155
);
156-
export const remoteConfigApiOrigin = utils.envOverride(
156+
export const remoteConfigApiOrigin = () => utils.envOverride(
157157
"FIREBASE_REMOTE_CONFIG_URL",
158158
"https://firebaseremoteconfig.googleapis.com",
159159
);
160-
export const resourceManagerOrigin = utils.envOverride(
160+
export const resourceManagerOrigin = () => utils.envOverride(
161161
"FIREBASE_RESOURCEMANAGER_URL",
162162
"https://cloudresourcemanager.googleapis.com",
163163
);
164-
export const rulesOrigin = utils.envOverride(
164+
export const rulesOrigin = () => utils.envOverride(
165165
"FIREBASE_RULES_URL",
166166
"https://firebaserules.googleapis.com",
167167
);
168-
export const runtimeconfigOrigin = utils.envOverride(
168+
export const runtimeconfigOrigin = () => utils.envOverride(
169169
"FIREBASE_RUNTIMECONFIG_URL",
170170
"https://runtimeconfig.googleapis.com",
171171
);
172-
export const storageOrigin = utils.envOverride(
172+
export const storageOrigin = () => utils.envOverride(
173173
"FIREBASE_STORAGE_URL",
174174
"https://storage.googleapis.com",
175175
);
176-
export const firebaseStorageOrigin = utils.envOverride(
176+
export const firebaseStorageOrigin = () => utils.envOverride(
177177
"FIREBASE_FIREBASESTORAGE_URL",
178178
"https://firebasestorage.googleapis.com",
179179
);
180-
export const hostingApiOrigin = utils.envOverride(
180+
export const hostingApiOrigin = () => utils.envOverride(
181181
"FIREBASE_HOSTING_API_URL",
182182
"https://firebasehosting.googleapis.com",
183183
);
184-
export const cloudRunApiOrigin = utils.envOverride(
184+
export const cloudRunApiOrigin = () => utils.envOverride(
185185
"CLOUD_RUN_API_URL",
186186
"https://run.googleapis.com",
187187
);
188-
export const serviceUsageOrigin = utils.envOverride(
188+
export const serviceUsageOrigin = () => utils.envOverride(
189189
"FIREBASE_SERVICE_USAGE_URL",
190190
"https://serviceusage.googleapis.com",
191191
);
192-
export const apphostingOrigin = utils.envOverride(
192+
export const apphostingOrigin = () => utils.envOverride(
193193
"APPHOSTING_URL",
194194
"https://firebaseapphosting.googleapis.com",
195195
);
196-
export const githubOrigin = utils.envOverride("GITHUB_URL", "https://github.com");
197-
export const githubApiOrigin = utils.envOverride("GITHUB_API_URL", "https://api.github.com");
198-
export const secretManagerOrigin = utils.envOverride(
196+
export const githubOrigin = () => utils.envOverride("GITHUB_URL", "https://github.com");
197+
export const githubApiOrigin = () => utils.envOverride("GITHUB_API_URL", "https://api.github.com");
198+
export const secretManagerOrigin = () => utils.envOverride(
199199
"CLOUD_SECRET_MANAGER_URL",
200200
"https://secretmanager.googleapis.com",
201201
);
202-
export const computeOrigin = utils.envOverride("COMPUTE_URL", "https://compute.googleapis.com");
203-
export const githubClientId = utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6aaed3484");
204-
export const githubClientSecret = utils.envOverride(
202+
export const computeOrigin = () => utils.envOverride("COMPUTE_URL", "https://compute.googleapis.com");
203+
export const githubClientId = () => utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6aaed3484");
204+
export const githubClientSecret = () => utils.envOverride(
205205
"GITHUB_CLIENT_SECRET",
206206
"3330d14abc895d9a74d5f17cd7a00711fa2c5bf0",
207207
);

‎src/appdistribution/client.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import {
2222
*/
2323
export class AppDistributionClient {
2424
appDistroV1Client = new Client({
25-
urlPrefix: appDistributionOrigin,
25+
urlPrefix: appDistributionOrigin(),
2626
apiVersion: "v1",
2727
});
2828
appDistroV1AlphaClient = new Client({
29-
urlPrefix: appDistributionOrigin,
29+
urlPrefix: appDistributionOrigin(),
3030
apiVersion: "v1alpha",
3131
});
3232

@@ -36,7 +36,7 @@ export class AppDistributionClient {
3636
}
3737

3838
async uploadRelease(appName: string, distribution: Distribution): Promise<string> {
39-
const client = new Client({ urlPrefix: appDistributionOrigin });
39+
const client = new Client({ urlPrefix: appDistributionOrigin() });
4040
const apiResponse = await client.request<ReadStream, { name: string }>({
4141
method: "POST",
4242
path: `/upload/v1/${appName}/releases:upload`,
@@ -54,7 +54,7 @@ export class AppDistributionClient {
5454
async pollUploadStatus(operationName: string): Promise<UploadReleaseResponse> {
5555
return operationPoller.pollOperation<UploadReleaseResponse>({
5656
pollerName: "App Distribution Upload Poller",
57-
apiOrigin: appDistributionOrigin,
57+
apiOrigin: appDistributionOrigin(),
5858
apiVersion: "v1",
5959
operationResourceName: operationName,
6060
masterTimeout: 5 * 60 * 1000,

0 commit comments

Comments
 (0)