hotfix: update dependencies to fix vulnerabilities

williamjesusdev · Mar 4, 2022 · 40b5379 · 40b5379
1 parent 391b306
commit 40b5379
Show file tree

Hide file tree

Showing 15 changed files with 9,994 additions and 12,429 deletions.
diff --git a/DevRadar/backend/package.json b/DevRadar/backend/package.json
@@ -8,11 +8,11 @@
     "dev": "nodemon src/index.js"
   },
   "dependencies": {
-    "axios": "^0.19.1",
+    "axios": "^0.26.0",
     "cors": "^2.8.5",
     "express": "^4.17.1",
     "mongoose": "^5.8.7",
-    "socket.io": "^2.3.0"
+    "socket.io": "^4.4.1"
   },
   "devDependencies": {
     "dotenv": "^8.2.0",

diff --git a/DevRadar/backend/yarn.lock b/DevRadar/backend/yarn.lock
diff --git a/DevRadar/frontend/package.json b/DevRadar/frontend/package.json
@@ -6,14 +6,14 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.26",
     "@fortawesome/free-solid-svg-icons": "^5.12.0",
     "@fortawesome/react-fontawesome": "^0.1.8",
-    "@testing-library/jest-dom": "^4.2.4",
-    "@testing-library/react": "^9.3.2",
-    "@testing-library/user-event": "^7.1.2",
-    "axios": "^0.19.1",
+    "@testing-library/jest-dom": "^5.16.2",
+    "@testing-library/react": "^12.1.3",
+    "@testing-library/user-event": "^13.5.0",
+    "axios": "^0.26.0",
     "express": "^4.17.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-scripts": "3.4.0",
+    "react-scripts": "5.0.0",
     "socket.io-client": "^2.3.0"
   },
   "scripts": {

diff --git a/DevRadar/frontend/yarn.lock b/DevRadar/frontend/yarn.lock
diff --git a/DevRadar/mobile/.env.example b/DevRadar/mobile/.env.example
@@ -0,0 +1,5 @@
+# Basic
+LOCALE='WORK'
+HOME_API='http://192.168.0.1:3333'
+WORK_API='http://192.168.2.5:3333'
+PROD_API='https://'
diff --git a/DevRadar/mobile/.gitignore b/DevRadar/mobile/.gitignore
@@ -1,5 +1,5 @@
-node_modules/**/*
-.expo/*
+/node_modules
+/.expo*
 npm-debug.*
 *.jks
 *.p8
@@ -10,5 +10,10 @@ npm-debug.*
 web-build/
 web-report/
 
-# macOS
+# misc
 .DS_Store
+.env
+.env.development.local
+.env.test.local
+.env.production
+.env.production.local
diff --git a/DevRadar/mobile/App.js b/DevRadar/mobile/App.js
@@ -1,8 +1,8 @@
 import React from "react";
-import { StatusBar, YellowBox } from "react-native";
+import { StatusBar, LogBox } from "react-native";
 
 import Routes from "./src/routes";
-YellowBox.ignoreWarnings(["Unrecognized WebSocket"]);
+LogBox.ignoreLogs(["Unrecognized WebSocket"]);
 
 export default function App() {
   return (

diff --git a/DevRadar/mobile/app.json b/DevRadar/mobile/app.json
@@ -3,8 +3,11 @@
     "name": "DevRadar",
     "slug": "DevRadar",
     "privacy": "public",
-    "sdkVersion": "36.0.0",
-    "platforms": ["ios", "android", "web"],
+    "platforms": [
+      "ios",
+      "android",
+      "web"
+    ],
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -16,7 +19,9 @@
     "updates": {
       "fallbackToCacheTimeout": 0
     },
-    "assetBundlePatterns": ["**/*"],
+    "assetBundlePatterns": [
+      "**/*"
+    ],
     "ios": {
       "supportsTablet": true
     }

diff --git a/DevRadar/mobile/babel.config.js b/DevRadar/mobile/babel.config.js
@@ -1,6 +1,6 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
-    presets: ['babel-preset-expo'],
+    presets: ["babel-preset-expo", "module:react-native-dotenv"],
   };
 };
diff --git a/DevRadar/mobile/package.json b/DevRadar/mobile/package.json
@@ -1,34 +1,36 @@
 {
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
-    "start": "expo start",
+    "dev": "expo start",
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
     "eject": "expo eject"
   },
   "dependencies": {
     "@react-native-community/masked-view": "^0.1.6",
-    "axios": "^0.19.1",
-    "expo": "~36.0.0",
-    "expo-location": "~8.0.0",
-    "react": "~16.9.0",
-    "react-dom": "~16.9.0",
-    "react-native": "https://github.com/expo/react-native/archive/sdk-36.0.0.tar.gz",
-    "react-native-gesture-handler": "~1.5.0",
-    "react-native-maps": "0.26.1",
-    "react-native-reanimated": "~1.4.0",
-    "react-native-safe-area-context": "0.6.0",
-    "react-native-screens": "2.0.0-alpha.12",
-    "react-native-web": "~0.11.7",
-    "react-native-webview": "7.4.3",
+    "axios": "^0.26.0",
+    "expo": "^44.0.0",
+    "expo-constants": "~13.0.1",
+    "expo-location": "~14.0.1",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native": "0.64.3",
+    "react-native-dotenv": "^0.2.0",
+    "react-native-gesture-handler": "~2.1.0",
+    "react-native-maps": "0.29.4",
+    "react-native-reanimated": "~2.3.1",
+    "react-native-safe-area-context": "3.3.2",
+    "react-native-screens": "~3.10.1",
+    "react-native-web": "0.17.1",
+    "react-native-webview": "11.15.0",
     "react-navigation": "^4.0.10",
     "react-navigation-stack": "^2.0.15",
     "socket.io-client": "^2.3.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "babel-preset-expo": "~8.0.0"
+    "@babel/core": "^7.12.9",
+    "babel-preset-expo": "9.0.2"
   },
   "private": true
 }
diff --git a/DevRadar/mobile/src/pages/Main.js b/DevRadar/mobile/src/pages/Main.js
@@ -2,8 +2,8 @@ import React, { useEffect, useState } from "react";
 import { Image, View, Text, TextInput, TouchableOpacity } from "react-native";
 import Mapview, { Marker, Callout } from "react-native-maps";
 import {
-  requestPermissionsAsync,
-  getCurrentPositionAsync
+  requestForegroundPermissionsAsync,
+  getCurrentPositionAsync,
 } from "expo-location";
 import { MaterialIcons } from "@expo/vector-icons";
 
@@ -20,17 +20,17 @@ function Main({ navigation }) {
 
   useEffect(() => {
     async function loadInitialPosition() {
-      const { granted } = await requestPermissionsAsync();
+      const { granted } = await requestForegroundPermissionsAsync();
       if (granted) {
         const { coords } = await getCurrentPositionAsync({
-          enableHighAccuracy: true
+          enableHighAccuracy: true,
         });
         const { latitude, longitude } = coords;
         const region = {
           latitude,
           longitude,
           latitudeDelta: 0.015,
-          longitudeDelta: 0.011
+          longitudeDelta: 0.011,
         };
         setCurrentRegion(region);
         setInitialRegion(region);
@@ -41,7 +41,7 @@ function Main({ navigation }) {
   }, []);
 
   useEffect(() => {
-    subscribeToNewDevs(dev => setDevs([...devs, dev]));
+    subscribeToNewDevs((dev) => setDevs([...devs, dev]));
   }, [devs]);
 
   function setupWebSocket() {
@@ -54,16 +54,20 @@ function Main({ navigation }) {
 
   async function loadDevs() {
     const { latitude, longitude } = currentRegion;
-    const response = await api.get("/search", {
-      params: {
-        latitude,
-        longitude,
-        techs
-      }
-    });
-    setDevs(response.data.devs);
-    setInitialRegion(null);
-    setupWebSocket();
+    api
+      .get("/search", {
+        params: {
+          latitude,
+          longitude,
+          techs,
+        },
+      })
+      .then((response) => {
+        setDevs(response.data.devs);
+        setInitialRegion(null);
+        setupWebSocket();
+      })
+      .catch((err) => console.error({ ...err }));
   }
 
   async function loadLocation() {
@@ -92,7 +96,7 @@ function Main({ navigation }) {
             key="initial"
             coordinate={{
               latitude: initialRegion.latitude,
-              longitude: initialRegion.longitude
+              longitude: initialRegion.longitude,
             }}
           >
             <MaterialIcons name="room" size={50} color="#8e4dff" />
@@ -108,24 +112,24 @@ function Main({ navigation }) {
             </Callout>
           </Marker>
         ) : (
-          devs.map(dev => (
+          devs.map((dev) => (
             <Marker
               key={dev._id}
               coordinate={{
                 latitude: dev.location.coordinates[1],
-                longitude: dev.location.coordinates[0]
+                longitude: dev.location.coordinates[0],
               }}
             >
               <Image
                 style={styles.avatar}
                 source={{
-                  uri: dev.avatar_url
+                  uri: dev.avatar_url,
                 }}
               />
               <Callout
                 onPress={() => {
                   navigation.navigate("Profile", {
-                    github_username: dev.github_username
+                    github_username: dev.github_username,
                   });
                 }}
               >

diff --git a/DevRadar/mobile/src/services/api.js b/DevRadar/mobile/src/services/api.js
@@ -1,9 +1,9 @@
 import axios from "axios";
+import { LOCALE, WORK_API, HOME_API, PROD_API } from "react-native-dotenv";
 
-const API_URL = process.env.API_URL || "http://backend-devradar.herokuapp.com/";
+const api = axios.create();
 
-const api = axios.create({
-  baseURL: API_URL
-});
+api.defaults.baseURL =
+  LOCALE === "HOME" ? HOME_API : LOCALE === "WORK" ? WORK_API : PROD_API;
 
 export default api;