Skip to content

Commit 4a17ca7

Browse files
hlshenhlshen
authored
Refactor api.ts file constants to getters (#6913)
* Refactor api.ts file constants to getters * prettier
1 parent c6d1615 commit 4a17ca7

File tree

106 files changed

+689
-727
lines changed

Some content is hidden

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

106 files changed

+689
-727
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: 133 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -5,206 +5,145 @@ import * as utils from "./utils";
55

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

8-
export const authProxyOrigin = utils.envOverride(
9-
"FIREBASE_AUTHPROXY_URL",
10-
"https://auth.firebase.tools",
11-
);
8+
export const authProxyOrigin = () =>
9+
utils.envOverride("FIREBASE_AUTHPROXY_URL", "https://auth.firebase.tools");
1210
// "In this context, the client secret is obviously not treated as a secret"
1311
// https://developers.google.com/identity/protocols/OAuth2InstalledApp
14-
export const clientId = utils.envOverride(
15-
"FIREBASE_CLIENT_ID",
16-
"563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com",
17-
);
18-
export const clientSecret = utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi");
19-
export const cloudbillingOrigin = utils.envOverride(
20-
"FIREBASE_CLOUDBILLING_URL",
21-
"https://cloudbilling.googleapis.com",
22-
);
23-
export const cloudloggingOrigin = utils.envOverride(
24-
"FIREBASE_CLOUDLOGGING_URL",
25-
"https://logging.googleapis.com",
26-
);
27-
export const cloudMonitoringOrigin = utils.envOverride(
28-
"CLOUD_MONITORING_URL",
29-
"https://monitoring.googleapis.com",
30-
);
31-
export const containerRegistryDomain = utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io");
32-
export const artifactRegistryDomain = utils.envOverride(
33-
"ARTIFACT_REGISTRY_DOMAIN",
34-
"https://artifactregistry.googleapis.com",
35-
);
36-
export const appDistributionOrigin = utils.envOverride(
37-
"FIREBASE_APP_DISTRIBUTION_URL",
38-
"https://firebaseappdistribution.googleapis.com",
39-
);
40-
export const authOrigin = utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
41-
export const consoleOrigin = utils.envOverride(
42-
"FIREBASE_CONSOLE_URL",
43-
"https://console.firebase.google.com",
44-
);
45-
export const deployOrigin = utils.envOverride(
46-
"FIREBASE_DEPLOY_URL",
47-
utils.envOverride("FIREBASE_UPLOAD_URL", "https://deploy.firebase.com"),
48-
);
49-
export const dynamicLinksOrigin = utils.envOverride(
50-
"FIREBASE_DYNAMIC_LINKS_URL",
51-
"https://firebasedynamiclinks.googleapis.com",
52-
);
53-
export const dynamicLinksKey = utils.envOverride(
54-
"FIREBASE_DYNAMIC_LINKS_KEY",
55-
"AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ",
56-
);
57-
export const eventarcOrigin = utils.envOverride("EVENTARC_URL", "https://eventarc.googleapis.com");
58-
export const firebaseApiOrigin = utils.envOverride(
59-
"FIREBASE_API_URL",
60-
"https://firebase.googleapis.com",
61-
);
62-
export const firebaseExtensionsRegistryOrigin = utils.envOverride(
63-
"FIREBASE_EXT_REGISTRY_ORIGIN",
64-
"https://extensions-registry.firebaseapp.com",
65-
);
66-
export const firedataOrigin = utils.envOverride(
67-
"FIREBASE_FIREDATA_URL",
68-
"https://mobilesdk-pa.googleapis.com",
69-
);
70-
export const firestoreOriginOrEmulator = utils.envOverride(
71-
Constants.FIRESTORE_EMULATOR_HOST,
72-
utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"),
73-
(val) => {
74-
if (val.startsWith("http")) {
75-
return val;
76-
}
77-
return `http://${val}`;
78-
},
79-
);
80-
export const firestoreOrigin = utils.envOverride(
81-
"FIRESTORE_URL",
82-
"https://firestore.googleapis.com",
83-
);
84-
export const functionsOrigin = utils.envOverride(
85-
"FIREBASE_FUNCTIONS_URL",
86-
"https://cloudfunctions.googleapis.com",
87-
);
88-
export const functionsV2Origin = utils.envOverride(
89-
"FIREBASE_FUNCTIONS_V2_URL",
90-
"https://cloudfunctions.googleapis.com",
91-
);
92-
export const runOrigin = utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
93-
export const functionsDefaultRegion = utils.envOverride(
94-
"FIREBASE_FUNCTIONS_DEFAULT_REGION",
95-
"us-central1",
96-
);
12+
export const clientId = () =>
13+
utils.envOverride(
14+
"FIREBASE_CLIENT_ID",
15+
"563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com",
16+
);
17+
export const clientSecret = () =>
18+
utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi");
19+
export const cloudbillingOrigin = () =>
20+
utils.envOverride("FIREBASE_CLOUDBILLING_URL", "https://cloudbilling.googleapis.com");
21+
export const cloudloggingOrigin = () =>
22+
utils.envOverride("FIREBASE_CLOUDLOGGING_URL", "https://logging.googleapis.com");
23+
export const cloudMonitoringOrigin = () =>
24+
utils.envOverride("CLOUD_MONITORING_URL", "https://monitoring.googleapis.com");
25+
export const containerRegistryDomain = () =>
26+
utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io");
27+
export const artifactRegistryDomain = () =>
28+
utils.envOverride("ARTIFACT_REGISTRY_DOMAIN", "https://artifactregistry.googleapis.com");
29+
export const appDistributionOrigin = () =>
30+
utils.envOverride(
31+
"FIREBASE_APP_DISTRIBUTION_URL",
32+
"https://firebaseappdistribution.googleapis.com",
33+
);
34+
export const authOrigin = () =>
35+
utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
36+
export const consoleOrigin = () =>
37+
utils.envOverride("FIREBASE_CONSOLE_URL", "https://console.firebase.google.com");
38+
export const deployOrigin = () =>
39+
utils.envOverride(
40+
"FIREBASE_DEPLOY_URL",
41+
utils.envOverride("FIREBASE_UPLOAD_URL", "https://deploy.firebase.com"),
42+
);
43+
export const dynamicLinksOrigin = () =>
44+
utils.envOverride("FIREBASE_DYNAMIC_LINKS_URL", "https://firebasedynamiclinks.googleapis.com");
45+
export const dynamicLinksKey = () =>
46+
utils.envOverride("FIREBASE_DYNAMIC_LINKS_KEY", "AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ");
47+
export const eventarcOrigin = () =>
48+
utils.envOverride("EVENTARC_URL", "https://eventarc.googleapis.com");
49+
export const firebaseApiOrigin = () =>
50+
utils.envOverride("FIREBASE_API_URL", "https://firebase.googleapis.com");
51+
export const firebaseExtensionsRegistryOrigin = () =>
52+
utils.envOverride("FIREBASE_EXT_REGISTRY_ORIGIN", "https://extensions-registry.firebaseapp.com");
53+
export const firedataOrigin = () =>
54+
utils.envOverride("FIREBASE_FIREDATA_URL", "https://mobilesdk-pa.googleapis.com");
55+
export const firestoreOriginOrEmulator = () =>
56+
utils.envOverride(
57+
Constants.FIRESTORE_EMULATOR_HOST,
58+
utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"),
59+
(val) => {
60+
if (val.startsWith("http")) {
61+
return val;
62+
}
63+
return `http://${val}`;
64+
},
65+
);
66+
export const firestoreOrigin = () =>
67+
utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com");
68+
export const functionsOrigin = () =>
69+
utils.envOverride("FIREBASE_FUNCTIONS_URL", "https://cloudfunctions.googleapis.com");
70+
export const functionsV2Origin = () =>
71+
utils.envOverride("FIREBASE_FUNCTIONS_V2_URL", "https://cloudfunctions.googleapis.com");
72+
export const runOrigin = () => utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
73+
export const functionsDefaultRegion = () =>
74+
utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "us-central1");
9775

98-
export const cloudbuildOrigin = utils.envOverride(
99-
"FIREBASE_CLOUDBUILD_URL",
100-
"https://cloudbuild.googleapis.com",
101-
);
76+
export const cloudbuildOrigin = () =>
77+
utils.envOverride("FIREBASE_CLOUDBUILD_URL", "https://cloudbuild.googleapis.com");
10278

103-
export const developerConnectOrigin = utils.envOverride(
104-
"FIREBASE_DEVELOPERCONNECT_URL",
105-
"https://developerconnect.googleapis.com",
106-
);
79+
export const developerConnectOrigin = () =>
80+
utils.envOverride("FIREBASE_DEVELOPERCONNECT_URL", "https://developerconnect.googleapis.com");
10781

108-
export const developerConnectP4SAOrigin = utils.envOverride(
109-
"FIREBASE_DEVELOPERCONNECT_P4SA_URL",
110-
"gcp-sa-developerconnect.iam.gserviceaccount.com",
111-
);
82+
export const developerConnectP4SAOrigin = () =>
83+
utils.envOverride(
84+
"FIREBASE_DEVELOPERCONNECT_P4SA_URL",
85+
"gcp-sa-developerconnect.iam.gserviceaccount.com",
86+
);
11287

113-
export const cloudschedulerOrigin = utils.envOverride(
114-
"FIREBASE_CLOUDSCHEDULER_URL",
115-
"https://cloudscheduler.googleapis.com",
116-
);
117-
export const cloudTasksOrigin = utils.envOverride(
118-
"FIREBASE_CLOUD_TAKS_URL",
119-
"https://cloudtasks.googleapis.com",
120-
);
121-
export const pubsubOrigin = utils.envOverride(
122-
"FIREBASE_PUBSUB_URL",
123-
"https://pubsub.googleapis.com",
124-
);
125-
export const googleOrigin = utils.envOverride(
126-
"FIREBASE_TOKEN_URL",
127-
utils.envOverride("FIREBASE_GOOGLE_URL", "https://www.googleapis.com"),
128-
);
129-
export const hostingOrigin = utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app");
130-
export const identityOrigin = utils.envOverride(
131-
"FIREBASE_IDENTITY_URL",
132-
"https://identitytoolkit.googleapis.com",
133-
);
134-
export const iamOrigin = utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com");
135-
export const extensionsOrigin = utils.envOverride(
136-
"FIREBASE_EXT_URL",
137-
"https://firebaseextensions.googleapis.com",
138-
);
139-
export const extensionsPublisherOrigin = utils.envOverride(
140-
"FIREBASE_EXT_PUBLISHER_URL",
141-
"https://firebaseextensionspublisher.googleapis.com",
142-
);
143-
export const extensionsTOSOrigin = utils.envOverride(
144-
"FIREBASE_EXT_TOS_URL",
145-
"https://firebaseextensionstos-pa.googleapis.com",
146-
);
147-
export const realtimeOrigin = utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com");
148-
export const rtdbManagementOrigin = utils.envOverride(
149-
"FIREBASE_RTDB_MANAGEMENT_URL",
150-
"https://firebasedatabase.googleapis.com",
151-
);
152-
export const rtdbMetadataOrigin = utils.envOverride(
153-
"FIREBASE_RTDB_METADATA_URL",
154-
"https://metadata-dot-firebase-prod.appspot.com",
155-
);
156-
export const remoteConfigApiOrigin = utils.envOverride(
157-
"FIREBASE_REMOTE_CONFIG_URL",
158-
"https://firebaseremoteconfig.googleapis.com",
159-
);
160-
export const resourceManagerOrigin = utils.envOverride(
161-
"FIREBASE_RESOURCEMANAGER_URL",
162-
"https://cloudresourcemanager.googleapis.com",
163-
);
164-
export const rulesOrigin = utils.envOverride(
165-
"FIREBASE_RULES_URL",
166-
"https://firebaserules.googleapis.com",
167-
);
168-
export const runtimeconfigOrigin = utils.envOverride(
169-
"FIREBASE_RUNTIMECONFIG_URL",
170-
"https://runtimeconfig.googleapis.com",
171-
);
172-
export const storageOrigin = utils.envOverride(
173-
"FIREBASE_STORAGE_URL",
174-
"https://storage.googleapis.com",
175-
);
176-
export const firebaseStorageOrigin = utils.envOverride(
177-
"FIREBASE_FIREBASESTORAGE_URL",
178-
"https://firebasestorage.googleapis.com",
179-
);
180-
export const hostingApiOrigin = utils.envOverride(
181-
"FIREBASE_HOSTING_API_URL",
182-
"https://firebasehosting.googleapis.com",
183-
);
184-
export const cloudRunApiOrigin = utils.envOverride(
185-
"CLOUD_RUN_API_URL",
186-
"https://run.googleapis.com",
187-
);
188-
export const serviceUsageOrigin = utils.envOverride(
189-
"FIREBASE_SERVICE_USAGE_URL",
190-
"https://serviceusage.googleapis.com",
191-
);
192-
export const apphostingOrigin = utils.envOverride(
193-
"APPHOSTING_URL",
194-
"https://firebaseapphosting.googleapis.com",
195-
);
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(
199-
"CLOUD_SECRET_MANAGER_URL",
200-
"https://secretmanager.googleapis.com",
201-
);
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(
205-
"GITHUB_CLIENT_SECRET",
206-
"3330d14abc895d9a74d5f17cd7a00711fa2c5bf0",
207-
);
88+
export const cloudschedulerOrigin = () =>
89+
utils.envOverride("FIREBASE_CLOUDSCHEDULER_URL", "https://cloudscheduler.googleapis.com");
90+
export const cloudTasksOrigin = () =>
91+
utils.envOverride("FIREBASE_CLOUD_TAKS_URL", "https://cloudtasks.googleapis.com");
92+
export const pubsubOrigin = () =>
93+
utils.envOverride("FIREBASE_PUBSUB_URL", "https://pubsub.googleapis.com");
94+
export const googleOrigin = () =>
95+
utils.envOverride(
96+
"FIREBASE_TOKEN_URL",
97+
utils.envOverride("FIREBASE_GOOGLE_URL", "https://www.googleapis.com"),
98+
);
99+
export const hostingOrigin = () => utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app");
100+
export const identityOrigin = () =>
101+
utils.envOverride("FIREBASE_IDENTITY_URL", "https://identitytoolkit.googleapis.com");
102+
export const iamOrigin = () => utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com");
103+
export const extensionsOrigin = () =>
104+
utils.envOverride("FIREBASE_EXT_URL", "https://firebaseextensions.googleapis.com");
105+
export const extensionsPublisherOrigin = () =>
106+
utils.envOverride(
107+
"FIREBASE_EXT_PUBLISHER_URL",
108+
"https://firebaseextensionspublisher.googleapis.com",
109+
);
110+
export const extensionsTOSOrigin = () =>
111+
utils.envOverride("FIREBASE_EXT_TOS_URL", "https://firebaseextensionstos-pa.googleapis.com");
112+
export const realtimeOrigin = () =>
113+
utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com");
114+
export const rtdbManagementOrigin = () =>
115+
utils.envOverride("FIREBASE_RTDB_MANAGEMENT_URL", "https://firebasedatabase.googleapis.com");
116+
export const rtdbMetadataOrigin = () =>
117+
utils.envOverride("FIREBASE_RTDB_METADATA_URL", "https://metadata-dot-firebase-prod.appspot.com");
118+
export const remoteConfigApiOrigin = () =>
119+
utils.envOverride("FIREBASE_REMOTE_CONFIG_URL", "https://firebaseremoteconfig.googleapis.com");
120+
export const resourceManagerOrigin = () =>
121+
utils.envOverride("FIREBASE_RESOURCEMANAGER_URL", "https://cloudresourcemanager.googleapis.com");
122+
export const rulesOrigin = () =>
123+
utils.envOverride("FIREBASE_RULES_URL", "https://firebaserules.googleapis.com");
124+
export const runtimeconfigOrigin = () =>
125+
utils.envOverride("FIREBASE_RUNTIMECONFIG_URL", "https://runtimeconfig.googleapis.com");
126+
export const storageOrigin = () =>
127+
utils.envOverride("FIREBASE_STORAGE_URL", "https://storage.googleapis.com");
128+
export const firebaseStorageOrigin = () =>
129+
utils.envOverride("FIREBASE_FIREBASESTORAGE_URL", "https://firebasestorage.googleapis.com");
130+
export const hostingApiOrigin = () =>
131+
utils.envOverride("FIREBASE_HOSTING_API_URL", "https://firebasehosting.googleapis.com");
132+
export const cloudRunApiOrigin = () =>
133+
utils.envOverride("CLOUD_RUN_API_URL", "https://run.googleapis.com");
134+
export const serviceUsageOrigin = () =>
135+
utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com");
136+
export const apphostingOrigin = () =>
137+
utils.envOverride("APPHOSTING_URL", "https://firebaseapphosting.googleapis.com");
138+
export const githubOrigin = () => utils.envOverride("GITHUB_URL", "https://github.com");
139+
export const githubApiOrigin = () => utils.envOverride("GITHUB_API_URL", "https://api.github.com");
140+
export const secretManagerOrigin = () =>
141+
utils.envOverride("CLOUD_SECRET_MANAGER_URL", "https://secretmanager.googleapis.com");
142+
export const computeOrigin = () =>
143+
utils.envOverride("COMPUTE_URL", "https://compute.googleapis.com");
144+
export const githubClientId = () => utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6aaed3484");
145+
export const githubClientSecret = () =>
146+
utils.envOverride("GITHUB_CLIENT_SECRET", "3330d14abc895d9a74d5f17cd7a00711fa2c5bf0");
208147

209148
/** Gets scopes that have been set. */
210149
export function getScopes(): string[] {

‎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)