diff --git a/apps/mobile/build/GoogleService-Info.plist b/apps/mobile/build/GoogleService-Info.plist index 2a5206366..ff64bf7c3 100644 --- a/apps/mobile/build/GoogleService-Info.plist +++ b/apps/mobile/build/GoogleService-Info.plist @@ -3,17 +3,17 @@ API_KEY - AIzaSyBD8lePDcfuPeJpJkvY1Egc_5sLX5lrtpg + AIzaSyBl6-TXvw5F0CX1r-935w0x_xPbVr0SSbQ GCM_SENDER_ID - 194977404578 + 992336953943 PLIST_VERSION 1 BUNDLE_ID is.follow PROJECT_ID - follow-428106 + diygod-folo STORAGE_BUCKET - follow-428106.firebasestorage.app + diygod-folo.firebasestorage.app IS_ADS_ENABLED IS_ANALYTICS_ENABLED @@ -25,6 +25,6 @@ IS_SIGNIN_ENABLED GOOGLE_APP_ID - 1:194977404578:ios:f26373d7487896293669fb + 1:992336953943:ios:75a436f716af190dc11912 \ No newline at end of file diff --git a/apps/mobile/build/google-services.json b/apps/mobile/build/google-services.json index f7531d888..5882f8aca 100644 --- a/apps/mobile/build/google-services.json +++ b/apps/mobile/build/google-services.json @@ -1,26 +1,36 @@ { "project_info": { - "project_number": "194977404578", - "project_id": "follow-428106", - "storage_bucket": "follow-428106.firebasestorage.app" + "project_number": "992336953943", + "project_id": "diygod-folo", + "storage_bucket": "diygod-folo.firebasestorage.app" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:194977404578:android:b160305b94681dcb3669fb", + "mobilesdk_app_id": "1:992336953943:android:7e45e76b1a8986e1c11912", "android_client_info": { "package_name": "is.follow" } }, - "oauth_client": [], + "oauth_client": [ + { + "client_id": "992336953943-3rja1g44ep4tmsmv84mkaa6itv9ejrsi.apps.googleusercontent.com", + "client_type": 3 + } + ], "api_key": [ { - "current_key": "AIzaSyA8knDQi334H3YBPflxfrYuod7AGZFQt64" + "current_key": "AIzaSyC7X-OdrxXWogeQwVDIFNkZzy81TINa7Fs" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [] + "other_platform_oauth_client": [ + { + "client_id": "992336953943-3rja1g44ep4tmsmv84mkaa6itv9ejrsi.apps.googleusercontent.com", + "client_type": 3 + } + ] } } } diff --git a/apps/mobile/ios/Folo/GoogleService-Info.plist b/apps/mobile/ios/Folo/GoogleService-Info.plist deleted file mode 100644 index 2a5206366..000000000 --- a/apps/mobile/ios/Folo/GoogleService-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - API_KEY - AIzaSyBD8lePDcfuPeJpJkvY1Egc_5sLX5lrtpg - GCM_SENDER_ID - 194977404578 - PLIST_VERSION - 1 - BUNDLE_ID - is.follow - PROJECT_ID - follow-428106 - STORAGE_BUCKET - follow-428106.firebasestorage.app - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:194977404578:ios:f26373d7487896293669fb - - \ No newline at end of file diff --git a/apps/mobile/ios/Folo/GoogleService-Info.plist b/apps/mobile/ios/Folo/GoogleService-Info.plist new file mode 120000 index 000000000..5064a11d9 --- /dev/null +++ b/apps/mobile/ios/Folo/GoogleService-Info.plist @@ -0,0 +1 @@ +../../build/GoogleService-Info.plist \ No newline at end of file diff --git a/packages/internal/shared/src/env.common.ts b/packages/internal/shared/src/env.common.ts index c9128fafb..f81745086 100644 --- a/packages/internal/shared/src/env.common.ts +++ b/packages/internal/shared/src/env.common.ts @@ -1,8 +1,19 @@ +const FIREBASE_CONFIG_DEFAULT = JSON.stringify({ + apiKey: "AIzaSyBpGB2C2Vz-9ktivqVkW7uTtVopNh3ELvo", + authDomain: "diygod-folo.firebaseapp.com", + projectId: "diygod-folo", + storageBucket: "diygod-folo.firebasestorage.app", + messagingSenderId: "992336953943", + appId: "1:992336953943:web:998aae576c8bc77dc11912", + measurementId: "G-HS4SF4GHWG", +}) + export const DEFAULT_VALUES = { PROD: { API_URL: "https://api.folo.is", WEB_URL: "https://app.folo.is", INBOXES_EMAIL: "@follow.re", + FIREBASE_CONFIG: FIREBASE_CONFIG_DEFAULT, OPENPANEL_CLIENT_ID: "4382168f-b8d2-40c1-9a26-133a312d072b", OPENPANEL_API_URL: "https://openpanel.follow.is/api", RECAPTCHA_V3_SITE_KEY: "6LeNhgwsAAAAAHO1dhunH0a-FI1YvOc9Ny98Oast", diff --git a/packages/internal/shared/src/env.desktop.ts b/packages/internal/shared/src/env.desktop.ts index e09210985..e2f08936f 100644 --- a/packages/internal/shared/src/env.desktop.ts +++ b/packages/internal/shared/src/env.desktop.ts @@ -14,7 +14,7 @@ export const env = createEnv({ VITE_DEV_PROXY: z.string().optional(), VITE_SENTRY_DSN: z.string().optional(), VITE_INBOXES_EMAIL: z.string().default(DEFAULT_VALUES.PROD.INBOXES_EMAIL), - VITE_FIREBASE_CONFIG: z.string().optional(), + VITE_FIREBASE_CONFIG: z.string().default(DEFAULT_VALUES.PROD.FIREBASE_CONFIG), VITE_OPENPANEL_CLIENT_ID: z.string().optional(), VITE_OPENPANEL_API_URL: z.string().url().optional(), diff --git a/packages/internal/shared/src/env.ssr.ts b/packages/internal/shared/src/env.ssr.ts index cc5b336fa..1e8cebbde 100644 --- a/packages/internal/shared/src/env.ssr.ts +++ b/packages/internal/shared/src/env.ssr.ts @@ -14,7 +14,7 @@ export const env = createEnv({ VITE_DEV_PROXY: z.string().optional(), VITE_SENTRY_DSN: z.string().optional(), VITE_INBOXES_EMAIL: z.string().default(DEFAULT_VALUES.PROD.INBOXES_EMAIL), - VITE_FIREBASE_CONFIG: z.string().optional(), + VITE_FIREBASE_CONFIG: z.string().default(DEFAULT_VALUES.PROD.FIREBASE_CONFIG), VITE_OPENPANEL_CLIENT_ID: z.string().optional(), VITE_OPENPANEL_API_URL: z.string().url().optional(),