Merge pull request #20 from Azure/fix_vulns

fix vulns
2023-03-27 10:22:18 +02:00 · 2023-03-27 10:22:18 +02:00 · ef0c7899b5
--- a/1
+++ b/1
@ -4,3 +4,4 @@ source 'https://rubygems.org'
 ruby '~> 2.7.4'

 gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'activesupport', '>=6.1.7.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,30 +1,29 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
      rexml
-    activesupport (6.1.7.2)
+    activesupport (7.0.4.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
    algoliasearch (1.27.5)
      httpclient (~> 2.8, >= 2.8.3)
      json (>= 1.5.1)
    atomos (0.1.3)
    claide (1.1.0)
-    cocoapods (1.11.3)
+    cocoapods (1.12.0)
      addressable (~> 2.8)
      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
+      cocoapods-core (= 1.12.0)
      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-downloader (>= 1.6.0, < 2.0)
      cocoapods-plugins (>= 1.0.0, < 2.0)
      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
      cocoapods-try (>= 1.1.0, < 2.0)
      colored2 (~> 3.1)
      escape (~> 0.0.4)
@ -32,10 +31,10 @@ GEM
      gh_inspector (~> 1.0)
      molinillo (~> 0.8.0)
      nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
+      ruby-macho (>= 2.3.0, < 3.0)
      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
+    cocoapods-core (1.12.0)
+      activesupport (>= 5.0, < 8)
      addressable (~> 2.8)
      algoliasearch (~> 1.0)
      concurrent-ruby (~> 1.1)
@ -54,9 +53,9 @@ GEM
      netrc (~> 0.11)
    cocoapods-try (1.2.0)
    colored2 (3.1.2)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
    escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
      ffi (>= 1.15.0)
    ffi (1.15.5)
    fourflusher (2.3.1)
@ -65,8 +64,8 @@ GEM
    httpclient (2.8.3)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.17.0)
+    json (2.6.3)
+    minitest (5.18.0)
    molinillo (0.8.0)
    nanaimo (0.3.0)
    nap (1.1.0)
@ -76,25 +75,25 @@ GEM
    ruby-macho (2.5.1)
    typhoeus (1.4.0)
      ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
      colored2 (~> 3.1)
      nanaimo (~> 0.3.0)
      rexml (~> 3.2.4)
-    zeitwerk (2.6.6)

 PLATFORMS
  ruby

 DEPENDENCIES
+  activesupport (>= 6.1.7.3)
  cocoapods (~> 1.11, >= 1.11.2)

 RUBY VERSION
   ruby 2.7.4p191

 BUNDLED WITH
-   2.4.3
+   2.4.9
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -1,5 +1,9 @@
 PODS:
  - boost (1.76.0)
+  - Charts (4.1.0):
+    - Charts/Core (= 4.1.0)
+  - Charts/Core (4.1.0):
+    - SwiftAlgorithms (~> 1.0)
  - CocoaAsyncSocket (7.6.5)
  - DoubleConversion (1.1.6)
  - FBLazyVector (0.68.0)
@ -76,7 +80,7 @@ PODS:
  - libevent (2.1.12)
  - MultiplatformBleAdapter (0.1.9)
  - OpenSSL-Universal (1.1.1100)
-  - Permission-Camera (3.3.1):
+  - Permission-Camera (3.6.1):
    - RNPermissions
  - RCT-Folly (2021.06.28.00-v2):
    - boost
@ -296,21 +300,25 @@ PODS:
    - React-Core
  - react-native-camera/RN (4.2.1):
    - React-Core
-  - react-native-geolocation (2.0.2):
+  - react-native-charts-wrapper (0.5.11):
+    - Charts (= 4.1.0)
    - React
-  - react-native-get-random-values (1.7.2):
+    - SwiftyJSON (= 5.0)
+  - react-native-geolocation (2.1.0):
    - React-Core
-  - react-native-image-picker (4.7.3):
+  - react-native-get-random-values (1.8.0):
    - React-Core
-  - react-native-maps (0.31.0-beta.5):
+  - react-native-image-picker (4.10.3):
+    - React-Core
+  - react-native-maps (0.31.1):
    - React-Core
  - react-native-safe-area-context (3.4.1):
    - React-Core
  - react-native-torch (1.2.0):
    - React
-  - react-native-version-check (3.4.2):
-    - React
-  - react-native-webview (11.18.1):
+  - react-native-version-check (3.4.6):
+    - React-Core
+  - react-native-webview (11.26.0):
    - React-Core
  - React-perflogger (0.68.0)
  - React-RCTActionSheet (0.68.0):
@ -377,24 +385,26 @@ PODS:
    - React-jsi (= 0.68.0)
    - React-logger (= 0.68.0)
    - React-perflogger (= 0.68.0)
-  - RNDeviceInfo (8.7.0):
+  - RNDeviceInfo (8.7.1):
    - React-Core
-  - RNGestureHandler (2.3.2):
+  - RNGestureHandler (2.8.0):
    - React-Core
-  - RNKeychain (8.0.0):
+  - RNKeychain (8.1.1):
    - React-Core
-  - RNPermissions (3.3.1):
+  - RNPermissions (3.6.1):
    - React-Core
-  - RNScreens (3.13.1):
+  - RNScreens (3.18.2):
    - React-Core
    - React-RCTImage
-  - RNSensors (7.3.5):
+  - RNSensors (7.3.6):
    - React-Core
-  - RNSVG (12.3.0):
+  - RNSVG (12.5.0):
    - React-Core
-  - RNVectorIcons (9.1.0):
+  - RNVectorIcons (9.2.0):
    - React-Core
  - SocketRocket (0.6.0)
+  - SwiftAlgorithms (1.0.0)
+  - SwiftyJSON (5.0.0)
  - Yoga (1.14.0)
  - YogaKit (1.18.1):
    - Yoga (~> 1.14)
@ -445,6 +455,7 @@ DEPENDENCIES:
  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
  - react-native-ble-plx (from `../node_modules/react-native-ble-plx`)
  - react-native-camera (from `../node_modules/react-native-camera`)
+  - react-native-charts-wrapper (from `../node_modules/react-native-charts-wrapper`)
  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
  - react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
@ -477,6 +488,7 @@ DEPENDENCIES:

 SPEC REPOS:
  trunk:
+    - Charts
    - CocoaAsyncSocket
    - Flipper
    - Flipper-Boost-iOSX
@ -492,6 +504,8 @@ SPEC REPOS:
    - MultiplatformBleAdapter
    - OpenSSL-Universal
    - SocketRocket
+    - SwiftAlgorithms
+    - SwiftyJSON
    - YogaKit

 EXTERNAL SOURCES:
@ -537,6 +551,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-ble-plx"
  react-native-camera:
    :path: "../node_modules/react-native-camera"
+  react-native-charts-wrapper:
+    :path: "../node_modules/react-native-charts-wrapper"
  react-native-geolocation:
    :path: "../node_modules/@react-native-community/geolocation"
  react-native-get-random-values:
@ -598,6 +614,7 @@ EXTERNAL SOURCES:

 SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
+  Charts: 354f86803d11d9c35de280587fef50d1af063978
  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
  FBLazyVector: d2fd875e2b24bbc350722df0df9d383cb891b9f2
@ -616,7 +633,7 @@ SPEC CHECKSUMS:
  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
  MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  Permission-Camera: bae27a8503530770c35aadfecbb97ec71823382a
+  Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6
  RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
  RCTRequired: bab4a7c3d7eb9553b13773ee190f279712efd1fc
  RCTTypeSafety: efbeb6e450ff6cef8e19c2cb5314c6d8bfeeef77
@ -632,14 +649,15 @@ SPEC CHECKSUMS:
  React-logger: 8474fefa09d05f573a13c044cb0dfd751d4e52e3
  react-native-ble-plx: f10240444452dfb2d2a13a0e4f58d7783e92d76e
  react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
-  react-native-geolocation: c956aeb136625c23e0dce0467664af2c437888c9
-  react-native-get-random-values: 30b3f74ca34e30e2e480de48e4add2706a40ac8f
-  react-native-image-picker: 4e6008ad8c2321622affa2c85432a5ebd02d480c
-  react-native-maps: 49713442691003285a3b489b36a45f3c9e00cee3
+  react-native-charts-wrapper: 4461b72f48e737a490e968bf2468cc0fd2281681
+  react-native-geolocation: 69f4fd37650b8e7fee91816d395e62dd16f5ab8d
+  react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
+  react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695
+  react-native-maps: 8b8bfada2c86205a7f5a07dd1f92f29b33ea83aa
  react-native-safe-area-context: 9e40fb181dac02619414ba1294d6c2a807056ab9
  react-native-torch: 3f278a42607fb5b69f3e378d740ff0b128c859fd
-  react-native-version-check: d8b8900e6ce03ae1568cb22ef9451f2508188883
-  react-native-webview: 0b7bd2bffced115aefd393e1841babd9b9a557b1
+  react-native-version-check: dc483031cdf65d9e947aea2d6a41142d010c7e59
+  react-native-webview: 994b9f8fbb504d6314dc40d83f94f27c6831b3bf
  React-perflogger: 15cb741d6c2379f4d3fc8f9e4d4e1110ef3020cb
  React-RCTActionSheet: ea9099db0597bd769430db1e2d011fd5fdb7fc5e
  React-RCTAnimation: 252df4749866f2654f37612f839522cac91c1165
@ -652,15 +670,17 @@ SPEC CHECKSUMS:
  React-RCTVibration: 82fc52d3d96549b8c59a6c8c017d5a1a11457049
  React-runtimeexecutor: 9b1304f48e344c55bb3c36e13bf11461cb4da5d8
  ReactCommon: fab89a13b52f1ac42b59a0e4b4f76f21aea9eebe
-  RNDeviceInfo: 36286df381fcaf1933ff9d2d3c34ba2abeb2d8d8
-  RNGestureHandler: 6e757e487a4834e7280e98e9bac66d2d9c575e9c
-  RNKeychain: 4f63aada75ebafd26f4bc2c670199461eab85d94
-  RNPermissions: 34d678157c800b25b22a488e4d8babb57456e796
-  RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
-  RNSensors: e74c8bd9606400c1048ab67af7f41eb2091cb2fc
-  RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8
-  RNVectorIcons: 7923e585eaeb139b9f4531d25a125a1500162a0b
+  RNDeviceInfo: aad3c663b25752a52bf8fce93f2354001dd185aa
+  RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3
+  RNKeychain: ff836453cba46938e0e9e4c22e43d43fa2c90333
+  RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c
+  RNScreens: 34cc502acf1b916c582c60003dc3089fa01dc66d
+  RNSensors: 117ba71c7eeeea0407ea0c0bb79e3495d602049b
+  RNSVG: 6adc5c52d2488a476248413064b7f2832e639057
+  RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
  SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
+  SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53
+  SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
  Yoga: 6671cf077f614314c22fd09ddf87d7abeee64e96
  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

--- a/src/hooks/iotc.ts
+++ b/src/hooks/iotc.ts
@ -177,7 +177,7 @@ export function useConnectIoTCentralClient(): [
        setConnecting(false);
      }
    },
-    [setConnecting, _connect_internal, saveCredentials],
+    [setConnecting, _connect_internal, saveCredentials, connecting],
  );

  const cancel = useCallback(