From e8399646f52735847a5f98993ef3b4a201358711 Mon Sep 17 00:00:00 2001 From: "shreya.mishra" Date: Sun, 1 Sep 2024 01:32:44 +0530 Subject: [PATCH] getting urls from env --- App.tsx | 2 +- android/app/build.gradle | 1 + android/app/google-services.json | 40 +++++++++++++++++++++++--- package.json | 1 + src/components/Notify/NotifyForm.tsx | 2 -- src/constants/apiConstant/AuthApi.ts | 8 ++---- src/constants/apiConstant/NotifyApi.ts | 7 ++--- src/screens/AuthScreen/AuthScreen.tsx | 16 ++++------- src/screens/AuthScreen/Util.ts | 7 +++-- yarn.lock | 5 ++++ 10 files changed, 60 insertions(+), 29 deletions(-) diff --git a/App.tsx b/App.tsx index c6a6e882..5b4ab14e 100644 --- a/App.tsx +++ b/App.tsx @@ -7,13 +7,13 @@ import reducers from './src/reducers'; import { Provider } from 'react-redux'; import createSagaMiddleware from '@redux-saga/core'; import rootSaga from './src/sagas/rootSaga'; - const sagaMiddleware = createSagaMiddleware(); const middleware = [sagaMiddleware]; export const store = compose(applyMiddleware(...middleware))(createStore)( reducers, ); sagaMiddleware.run(rootSaga); + const App = () => { return ( <> diff --git a/android/app/build.gradle b/android/app/build.gradle index e2cc5587..35b12872 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -78,3 +78,4 @@ dependencies { } apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) +apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" diff --git a/android/app/google-services.json b/android/app/google-services.json index 150656f3..f6ec121c 100644 --- a/android/app/google-services.json +++ b/android/app/google-services.json @@ -1,9 +1,12 @@ { "project_info": { - "project_number": "260594870079", - "firebase_url": "https://rds-backend-86606-default-rtdb.firebaseio.com", - "project_id": "rds-backend-86606", - "storage_bucket": "rds-backend-86606.appspot.com" + // "project_number": "260594870079", + // "firebase_url": "https://rds-backend-86606-default-rtdb.firebaseio.com", + // "project_id": "rds-backend-86606", + // "storage_bucket": "rds-backend-86606.appspot.com" + "project_number": "500338429689", + "project_id": "realdevsquad-10012", + "storage_bucket": "realdevsquad-10012.appspot.com" }, "client": [ { @@ -92,6 +95,35 @@ ] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:500338429689:android:3466042d6816e27fbcdc28", + "android_client_info": { + "package_name": "com.rdsapp" + } + }, + "oauth_client": [ + { + "client_id": "500338429689-bs60eaons6m17p788ka6tkffqthk5arl.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyCCk2qqhDfeEm7_QWehc-r3H6me6_T0C5s" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "500338429689-bs60eaons6m17p788ka6tkffqthk5arl.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } } ], "configuration_version": "1" diff --git a/package.json b/package.json index d43a2aa0..96da648d 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "react-native-circular-progress-indicator": "^4.4.2", "react-native-collapsible": "^1.6.1", "react-native-collapsible-tab-view": "^6.2.1", + "react-native-config": "^1.5.3", "react-native-date-picker": "^4.2.13", "react-native-datepicker": "^1.7.2", "react-native-device-info": "^10.8.0", diff --git a/src/components/Notify/NotifyForm.tsx b/src/components/Notify/NotifyForm.tsx index c8438bc9..0a3fc9ae 100644 --- a/src/components/Notify/NotifyForm.tsx +++ b/src/components/Notify/NotifyForm.tsx @@ -44,7 +44,6 @@ const NotifyForm = ({ notifyHandler }: { notifyHandler: () => void }) => { const getFCMToken = async () => { const fcmToken_ = await firebase.messaging().getToken(); - console.log('🚀 ~ getFCMToken ~ fcmToken_:', fcmToken_); await postFcmToken(fcmToken_, token); }; @@ -57,7 +56,6 @@ const NotifyForm = ({ notifyHandler }: { notifyHandler: () => void }) => { notifyTo: selectedUser?.id, }); await sendNotification(title, description, selectedUser?.id, token); - // LocalNotification(); }; useEffect(() => { const fetchData = async () => { diff --git a/src/constants/apiConstant/AuthApi.ts b/src/constants/apiConstant/AuthApi.ts index 0aee4f99..45dcf66f 100644 --- a/src/constants/apiConstant/AuthApi.ts +++ b/src/constants/apiConstant/AuthApi.ts @@ -1,9 +1,7 @@ -import { STAGING_BASE_URL } from './BaseUrl'; -// const basrUrl = 'https://api.realdevsquad.com'; //production +import Config from 'react-native-config'; const AuthApis = { - USER_DETAIL: 'https://api.realdevsquad.com/users/userId/', - QR_AUTH_API: 'https://api.realdevsquad.com/auth/qr-code-auth', - QR_AUTH_API_STAGING: `${STAGING_BASE_URL}/auth/qr-code-auth`, + USER_DETAIL: `${Config.BASE_URL}/users/userId/`, + QR_AUTH_API: `${Config.BASE_URL}/auth/qr-code-auth`, GITHUB_AUTH_API: 'https://api.realdevsquad.com/auth/github/login', }; diff --git a/src/constants/apiConstant/NotifyApi.ts b/src/constants/apiConstant/NotifyApi.ts index 371f1deb..88fa27b4 100644 --- a/src/constants/apiConstant/NotifyApi.ts +++ b/src/constants/apiConstant/NotifyApi.ts @@ -1,4 +1,3 @@ -import { LOCAL_URL, PROD_BASE_URL } from './BaseUrl'; - -export const SAVE_FCM_TOKEN = `${PROD_BASE_URL}/v1/fcm-tokens`; -export const NOTIFY_API = `${PROD_BASE_URL}/v1/notifications`; +import Config from 'react-native-config'; +export const SAVE_FCM_TOKEN = `${Config.BASE_URL}/v1/fcm-tokens`; +export const NOTIFY_API = `${Config.BASE_URL}/v1/notifications`; diff --git a/src/screens/AuthScreen/AuthScreen.tsx b/src/screens/AuthScreen/AuthScreen.tsx index 2528fd75..184ea16e 100644 --- a/src/screens/AuthScreen/AuthScreen.tsx +++ b/src/screens/AuthScreen/AuthScreen.tsx @@ -19,20 +19,16 @@ import { AuthContext } from '../../context/AuthContext'; import { getUserData, goalsAuth, requestCameraPermission } from './Util'; import { storeData } from '../../utils/dataStore'; import AuthApis from '../../constants/apiConstant/AuthApi'; -// import { AuthApisStaging } from '../../constants/apiConstant/AuthApi'; import { CameraScreen } from 'react-native-camera-kit'; import CustomModal from '../../components/Modal/CustomModal'; import LoadingScreen from '../../components/LoadingScreen'; import Tooltip from 'react-native-walkthrough-tooltip'; -import { useSelector } from 'react-redux'; -// import Github from '../../constants/images/Image'; import Images from '../../constants/images/Image'; import GithubSvg from '../../../assets/svgs/github_logo.js'; import WebSvg from '../../../assets/svgs/web'; const baseUrl = AuthApis.GITHUB_AUTH_API; const AuthScreen = () => { - const { isProdEnvironment } = useSelector((store) => store.localFeatureFlag); const { setLoggedInUserData, setGoalsData } = useContext(AuthContext); const [loading, setLoading] = useState(false); const [cameraActive, setCameraActive] = useState(false); @@ -143,11 +139,8 @@ const AuthScreen = () => { const qrCodeLogin = async () => { const deviceId = await DeviceInfo.getUniqueId(); - // const url = `${AuthApis.QR_AUTH_API}?device_id=${deviceId}` + const url = `${AuthApis.QR_AUTH_API}?device_id=${deviceId}`; - const url = isProdEnvironment - ? `${AuthApis.QR_AUTH_API}?device_id=${deviceId}` - : `${AuthApis.QR_AUTH_API_STAGING}?device_id=${deviceId}`; try { const userInfo = await fetch(url); console.log(userInfo, 'user info in rds app auth'); @@ -175,9 +168,8 @@ const AuthScreen = () => { const getAuthStatus = async () => { const deviceInfo = await DeviceInfo.getDeviceName(); const deviceId = await DeviceInfo.getUniqueId(); - const url = isProdEnvironment - ? AuthApis.QR_AUTH_API - : AuthApis.QR_AUTH_API_STAGING; + const url = AuthApis.QR_AUTH_API; + console.log('URL', url); setLoading(true); try { const data = await fetch(url, { @@ -191,6 +183,7 @@ const AuthScreen = () => { device_id: deviceId, }), }); + console.log('🚀 ~ getAuthStatus ~ data:', data); if (data.ok) { const dataJson = await data.json(); @@ -209,6 +202,7 @@ const AuthScreen = () => { ]); } else { await data.json(); + console.log('dataa>>>', data.json()); Toast.show({ type: 'error', text1: 'Something went wrong, please try again', diff --git a/src/screens/AuthScreen/Util.ts b/src/screens/AuthScreen/Util.ts index 191114a9..8dd35aa2 100644 --- a/src/screens/AuthScreen/Util.ts +++ b/src/screens/AuthScreen/Util.ts @@ -8,6 +8,7 @@ import { NOTIFY_API, SAVE_FCM_TOKEN, } from '../../constants/apiConstant/NotifyApi'; +import Config from 'react-native-config'; export const getUserData = async (token: string) => { try { @@ -448,6 +449,7 @@ export const overallTaskProgress = async ( }; export const postFcmToken = async (fcmToken: string, token: string) => { + console.log('token is ', `${Config.RDS_SESSION}=${token}`); try { const response = await axios.post( SAVE_FCM_TOKEN, @@ -455,7 +457,8 @@ export const postFcmToken = async (fcmToken: string, token: string) => { { headers: { 'Content-Type': 'application/json', - Cookie: `rds-session=${token}`, + Cookie: + 'rds-session-staging=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiI0ZG5EcjVJNVB0N0N2bGpSUmttMiIsImlhdCI6MTcyNTEyOTcxNSwiZXhwIjoxNzU2MjMzNzE1fQ.Xknq3-RBz5aKPWnQ6pXypEmSs2M91lr_jnijP4Ih_GW_hrU0GBT3HaHRGXKoLWvKieV086OeKPMbLYbOAD7JWTOfJY1ebXuEUUYTjTI3bO3IyOCWsw_KIswBONebmQCyAqvm9HfvHU9UoPg-30tb1Bec4J3wGp7ciVnKatr6noU', }, }, ); @@ -481,7 +484,7 @@ export const sendNotification = async ( { headers: { 'Content-Type': 'application/json', - Cookie: `rds-session=${token}`, + Cookie: `${Config.RDS_SESSION}${token}`, }, }, ); diff --git a/yarn.lock b/yarn.lock index 17241613..587e83c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7813,6 +7813,11 @@ react-native-collapsible@^1.6.1: resolved "https://registry.npmjs.org/react-native-collapsible/-/react-native-collapsible-1.6.1.tgz" integrity sha512-orF4BeiXd2hZW7fu9YcqIJXzN6TJcFcddY807D3MAOVktLuW9oQ+RIkrTJ5DR3v9ZOFfREkOjEmS79qeUTvkBQ== +react-native-config@^1.5.3: + version "1.5.3" + resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-1.5.3.tgz#1286c0c117adb367a948b31005430146e88c9c2e" + integrity sha512-3D05Abgk5DfDw9w258EzXvX5AkU7eqj3u9H0H0L4gUga4nYg/zuupcrpGbpF4QeXBcJ84jjs6g8JaEP6VBT7Pg== + react-native-date-picker@^4.2.13: version "4.2.13" resolved "https://registry.npmjs.org/react-native-date-picker/-/react-native-date-picker-4.2.13.tgz"