companion: use updated grant js version for instagram graph

package-lock.json

@@ -5910,8 +5910,7 @@
       "dependencies": {
         "es6-promise": {
           "version": "4.2.8",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-          "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+          "bundled": true
         }
       }
     },
@@ -6014,8 +6013,7 @@
       "dependencies": {
         "react": {
           "version": "16.5.0",
-          "resolved": "https://registry.npmjs.org/react/-/react-16.5.0.tgz",
-          "integrity": "sha512-nw/yB/L51kA9PsAy17T1JrzzGRk+BlFCJwFF7p+pwVxgqwPjYNeZEkkH7LXn9dmflolrYMXLWMTkQ77suKPTNQ==",
+          "bundled": true,
           "requires": {
             "loose-envify": "^1.1.0",
             "object-assign": "^4.1.1",
@@ -6059,8 +6057,7 @@
       "dependencies": {
         "drag-drop": {
           "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/drag-drop/-/drag-drop-4.2.0.tgz",
-          "integrity": "sha512-RA8jXrxOlOFzkM5+tapHeavt0PIlh4FReYx4Ct9ECBRMxixPKUehRs4OQSruAPhQScClt1JaZ3M882FQdcZWaw==",
+          "bundled": true,
           "requires": {
             "blob-to-buffer": "^1.0.2",
             "flatten": "^1.0.2",
@@ -6125,7 +6122,7 @@
         "express-prom-bundle": "3.3.0",
         "express-request-id": "1.4.1",
         "express-session": "1.15.6",
-        "grant": "github:ifedapoolarewaju/grant#a2696b67bf90de9adc0bd06043c6f5b724a64674",
+        "grant": "4.6.5",
         "helmet": "3.8.2",
         "isobject": "3.0.1",
         "jsonwebtoken": "8.3.0",
@@ -6149,13 +6146,11 @@
       "dependencies": {
         "atob": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz",
-          "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw=="
+          "bundled": true
         },
         "body-parser": {
           "version": "1.18.2",
-          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-          "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+          "bundled": true,
           "requires": {
             "bytes": "3.0.0",
             "content-type": "~1.0.4",
@@ -6171,23 +6166,19 @@
         },
         "buffer-from": {
           "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz",
-          "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="
+          "bundled": true
         },
         "bytes": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-          "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+          "bundled": true
         },
         "connect-redis": {
           "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.3.tgz",
-          "integrity": "sha512-Php0P0ShNfilW6f2d/2v7Q0VAiFeBYsg0bIgu8ST3x26CcQ1JtzV6vxPLUwK0uiq10hQSMR+HzSNhWbcvx6nLg=="
+          "bundled": true
         },
         "cookie-parser": {
           "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.3.tgz",
-          "integrity": "sha1-D+MfoZ0AC5X0qt8fU/3CuKIDuqU=",
+          "bundled": true,
           "requires": {
             "cookie": "0.3.1",
             "cookie-signature": "1.0.6"
@@ -6195,23 +6186,20 @@
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "bundled": true,
           "requires": {
             "ms": "2.0.0"
           },
           "dependencies": {
             "ms": {
               "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+              "bundled": true
             }
           }
         },
         "express-session": {
           "version": "1.15.6",
-          "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz",
-          "integrity": "sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==",
+          "bundled": true,
           "requires": {
             "cookie": "0.3.1",
             "cookie-signature": "1.0.6",
@@ -6224,18 +6212,29 @@
             "utils-merge": "1.0.1"
           }
         },
-        "grant-express": {
-          "version": "4.6.4",
-          "resolved": "https://registry.npmjs.org/grant-express/-/grant-express-4.6.4.tgz",
-          "integrity": "sha512-7pvLC7EWU5f6Vl+kq1ZBtt+cNayzTonsgvpOGpBXxl2P1xIbvamQKKElGLwunCp5iVn5N6T5N6vFSxX9YdnTEw==",
+        "grant": {
+          "version": "4.6.5",
+          "bundled": true,
           "requires": {
-            "grant": "4.6.4"
+            "qs": "^6.9.1",
+            "request-compose": "^1.2.1",
+            "request-oauth": "0.0.3"
+          },
+          "dependencies": {
+            "qs": {
+              "version": "6.9.1",
+              "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz",
+              "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="
+            }
           }
         },
+        "grant-express": {
+          "version": "4.6.4",
+          "bundled": true
+        },
         "http-errors": {
           "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "bundled": true,
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.3",
@@ -6245,28 +6244,23 @@
         },
         "iconv-lite": {
           "version": "0.4.19",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-          "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+          "bundled": true
         },
         "lodash.merge": {
           "version": "4.6.2",
-          "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-          "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+          "bundled": true
         },
         "ms": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+          "bundled": true
         },
         "qs": {
           "version": "6.5.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+          "bundled": true
         },
         "raw-body": {
           "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-          "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+          "bundled": true,
           "requires": {
             "bytes": "3.0.0",
             "http-errors": "1.6.2",
@@ -6276,13 +6270,11 @@
           "dependencies": {
             "depd": {
               "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-              "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
+              "bundled": true
             },
             "http-errors": {
               "version": "1.6.2",
-              "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-              "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+              "bundled": true,
               "requires": {
                 "depd": "1.1.1",
                 "inherits": "2.0.3",
@@ -6292,15 +6284,13 @@
             },
             "setprototypeof": {
               "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-              "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
+              "bundled": true
             }
           }
         },
         "request": {
           "version": "2.88.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+          "bundled": true,
           "requires": {
             "aws-sign2": "~0.7.0",
             "aws4": "^1.8.0",
@@ -6326,30 +6316,25 @@
           "dependencies": {
             "qs": {
               "version": "6.5.2",
-              "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-              "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+              "bundled": true
             },
             "uuid": {
               "version": "3.3.3",
-              "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-              "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+              "bundled": true
             }
           }
         },
         "semver": {
           "version": "6.1.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
-          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="
+          "bundled": true
         },
         "setprototypeof": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+          "bundled": true
         },
         "tough-cookie": {
           "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "bundled": true,
           "requires": {
             "psl": "^1.1.24",
             "punycode": "^1.4.1"
@@ -6357,8 +6342,7 @@
         },
         "tus-js-client": {
           "version": "1.8.0-2",
-          "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.8.0-2.tgz",
-          "integrity": "sha512-8v/q4s9biAV1A1hZf2mtnvRlh7AXpXbozrX5bZgjRmhgY9TLlmfFVieamrOjN1DI9RPze9mSh3e6BQRRDIDsiA==",
+          "bundled": true,
           "requires": {
             "buffer-from": "^0.1.1",
             "combine-errors": "^3.0.3",
@@ -6371,18 +6355,15 @@
         },
         "ultron": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-          "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
+          "bundled": true
         },
         "uuid": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz",
-          "integrity": "sha1-SL1WmPBnfjx5AaHEbvFbFkN5RyY="
+          "bundled": true
         },
         "ws": {
           "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.1.tgz",
-          "integrity": "sha512-8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A==",
+          "bundled": true,
           "requires": {
             "async-limiter": "~1.0.0",
             "safe-buffer": "~5.1.0",
@@ -6614,13 +6595,11 @@
       "dependencies": {
         "buffer-from": {
           "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-0.1.2.tgz",
-          "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg=="
+          "bundled": true
         },
         "tus-js-client": {
           "version": "1.8.0-2",
-          "resolved": "https://registry.npmjs.org/tus-js-client/-/tus-js-client-1.8.0-2.tgz",
-          "integrity": "sha512-8v/q4s9biAV1A1hZf2mtnvRlh7AXpXbozrX5bZgjRmhgY9TLlmfFVieamrOjN1DI9RPze9mSh3e6BQRRDIDsiA==",
+          "bundled": true,
           "requires": {
             "buffer-from": "^0.1.1",
             "combine-errors": "^3.0.3",
@@ -14940,7 +14919,7 @@
         "qs": "^6.5.0",
         "react-native-branch": "2.2.5",
         "react-native-gesture-handler": "~1.0.14",
-        "react-native-maps": "github:expo/react-native-maps#v0.22.1-exp.0",
+        "react-native-maps": "github:expo/react-native-maps#e6f98ff7272e5d0a7fe974a41f28593af2d77bb2",
         "react-native-reanimated": "1.0.0-alpha.11",
         "react-native-screens": "1.0.0-alpha.22",
         "react-native-svg": "8.0.10",
@@ -16159,8 +16138,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -16178,13 +16156,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -16197,18 +16173,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -16311,8 +16284,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -16322,7 +16294,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -16335,20 +16306,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -16365,7 +16333,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -16438,8 +16405,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -16449,7 +16415,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -16525,8 +16490,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -16556,7 +16520,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -16574,7 +16537,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -16613,13 +16575,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
@@ -17432,15 +17392,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
       "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg=="
     },
-    "grant": {
-      "version": "github:ifedapoolarewaju/grant#a2696b67bf90de9adc0bd06043c6f5b724a64674",
-      "from": "github:ifedapoolarewaju/grant#a2696b67bf90de9adc0bd06043c6f5b724a64674",
-      "requires": {
-        "qs": "^6.7.0",
-        "request-compose": "^1.2.0",
-        "request-oauth": "0.0.3"
-      }
-    },
     "grapheme-breaker": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/grapheme-breaker/-/grapheme-breaker-0.3.2.tgz",
@@ -32085,8 +32036,7 @@
       "dependencies": {
         "drag-drop": {
           "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/drag-drop/-/drag-drop-4.2.0.tgz",
-          "integrity": "sha512-RA8jXrxOlOFzkM5+tapHeavt0PIlh4FReYx4Ct9ECBRMxixPKUehRs4OQSruAPhQScClt1JaZ3M882FQdcZWaw==",
+          "bundled": true,
           "requires": {
             "blob-to-buffer": "^1.0.2",
             "flatten": "^1.0.2",

packages/@uppy/companion/package.json

@@ -43,7 +43,7 @@
     "express-prom-bundle": "3.3.0",
     "express-request-id": "1.4.1",
     "express-session": "1.15.6",
-    "grant": "github:ifedapoolarewaju/grant#a2696b67bf90de9adc0bd06043c6f5b724a64674",
+    "grant": "4.6.5",
     "helmet": "3.8.2",
     "isobject": "3.0.1",
     "jsonwebtoken": "8.3.0",

packages/@uppy/companion/src/server/provider/index.js

@@ -47,7 +47,9 @@ module.exports.getProviderMiddleware = (providers) => {
 module.exports.getDefaultProviders = (companionOptions) => {
   const { providerOptions } = companionOptions || { providerOptions: null }
   const providers = { dropbox, drive, facebook, onedrive }
-  if (providerOptions && providerOptions.instagram && providerOptions.instagram.useGraphAPI) {
+  // Instagram's Graph API key is just numbers, while the old API key is hex
+  const usesGraphAPI = () => /^\d+$/.test(providerOptions.instagram.key)
+  if (providerOptions && providerOptions.instagram && usesGraphAPI()) {
     providers.instagram = instagramGraph
   } else {
     providers.instagram = instagram

packages/@uppy/companion/src/server/provider/instagram/graph/index.js

@@ -17,9 +17,7 @@ class Instagram extends Provider {
   static getExtraConfig () {
     return {
       protocol: 'https',
-      credentials_fields: { key: 'app_id', secret: 'app_secret' },
-      scope: ['user_profile', 'user_media'],
-      scope_delimiter: ','
+      scope: ['user_profile', 'user_media']
     }
   }
 

packages/@uppy/companion/src/standalone/helper.js

@@ -39,8 +39,7 @@ const getConfigFromEnv = () => {
       },
       instagram: {
         key: process.env.COMPANION_INSTAGRAM_KEY,
-        secret: getSecret('COMPANION_INSTAGRAM_SECRET'),
-        useGraphAPI: !!process.env.COMPANION_INSTAGRAM_USE_GRAPH_API
+        secret: getSecret('COMPANION_INSTAGRAM_SECRET')
       },
       facebook: {
         key: process.env.COMPANION_FACEBOOK_KEY,

packages/@uppy/companion/test/__tests__/provider-manager.js

@@ -24,17 +24,15 @@ describe('Test Provider options', () => {
   })
 
   test('adds extra provider config', () => {
-    process.env.COMPANION_INSTAGRAM_USE_GRAPH_API = 'truthy value'
+    process.env.COMPANION_INSTAGRAM_KEY = '123456'
     providerManager.addProviderOptions(getCompanionOptions(), grantConfig)
     expect(grantConfig.instagram).toEqual({
       transport: 'session',
       callback: '/instagram/callback',
-      key: 'instagram_key',
+      key: '123456',
       secret: 'instagram_secret',
       protocol: 'https',
-      credentials_fields: { key: 'app_id', secret: 'app_secret' },
-      scope: ['user_profile', 'user_media'],
-      scope_delimiter: ','
+      scope: ['user_profile', 'user_media']
     })
 
     expect(grantConfig.dropbox).toEqual({
@@ -55,8 +53,6 @@ describe('Test Provider options', () => {
       ],
       callback: '/drive/callback'
     })
-
-    process.env.COMPANION_INSTAGRAM_USE_GRAPH_API = ''
   })
 
   test('adds provider options for secret files', () => {

website/src/docs/companion.md

@@ -177,8 +177,6 @@ export COMPANION_INSTAGRAM_KEY="YOUR INSTAGRAM KEY"
 export COMPANION_INSTAGRAM_SECRET="YOUR INSTAGRAM SECRET"
 # specifying a secret file will override a directly set secret
 export COMPANION_INSTAGRAM_SECRET_FILE="PATH/TO/INSTAGRAM/SECRET/FILE"
-# set this value only if you are using the new Instagram Graph API https://developers.facebook.com/docs/instagram-basic-display-api
-export COMPANION_INSTAGRAM_USE_GRAPH_API="true"
 
 # to enable Facebook
 export COMPANION_FACEBOOK_KEY="YOUR FACEBOOK KEY"
@@ -232,9 +230,7 @@ See [env.example.sh](https://github.com/transloadit/uppy/blob/master/env.example
     },
     instagram: {
       key: "***",
-      secret: "***",
-      // set this to true only if you are using the new Instagram Graph API https://developers.facebook.com/docs/instagram-basic-display-api
-      useGraphAPI: false // default: false
+      secret: "***"
     },
     facebook: {
       key: "***",