netlify-cli 10.8.0 → 10.9.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "10.8.0",
+  "version": "10.9.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "10.8.0",
+      "version": "10.9.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -15,7 +15,7 @@
         "@netlify/edge-bundler": "^1.5.0",
         "@netlify/framework-info": "^9.1.0",
         "@netlify/local-functions-proxy": "^1.1.1",
-        "@netlify/plugins-list": "^6.30.0",
+        "@netlify/plugins-list": "^6.32.0",
         "@netlify/zip-it-and-ship-it": "^5.12.0",
         "@octokit/rest": "^18.0.0",
         "@sindresorhus/slugify": "^1.1.0",
@@ -81,7 +81,7 @@
         "multiparty": "^4.2.1",
         "netlify": "^11.0.2",
         "netlify-headers-parser": "^6.0.2",
-        "netlify-onegraph-internal": "0.3.1",
+        "netlify-onegraph-internal": "0.3.6",
         "netlify-redirect-parser": "^13.0.5",
         "netlify-redirector": "^0.2.1",
         "node-fetch": "^2.6.0",
@@ -3946,9 +3946,9 @@
       "integrity": "sha512-ZJF4nbLPfxsWrVgp2reCb23HMxsWl5+r+K0RtIhxcZ/RxbHVihRA9mwyzIcxPWrT5x9uAAxCr1aKGP7IdsDe+Q=="
     },
     "node_modules/@netlify/plugins-list": {
-      "version": "6.30.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.30.0.tgz",
-      "integrity": "sha512-NF0G7rMl/FbCkZMDiihoDW70i96aF3fguHvuspucstM4ArAdMai5b3rEKSOO2SXTbmQHaAlQEpiYAPZsGwU7jg==",
+      "version": "6.32.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.32.0.tgz",
+      "integrity": "sha512-ZYaik41Xl7Jg7k204daKG26eT8pywThqvrwsDqW3gVuVx+Clo3uSrPTwNEuHme9Py0smdw2/oG2qp1jH3Q5sLQ==",
       "engines": {
         "node": "^12.20.0 || ^14.14.0 || >=16.0.0"
       }
@@ -16342,9 +16342,9 @@
       }
     },
     "node_modules/netlify-onegraph-internal": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.1.tgz",
-      "integrity": "sha512-VU649035kx14sTFARPOgo0mF7jT7aEJlnpYS1IrGyUUwVM3wLdy6bLbn9UEng8ommRc7BHwPHWRV6NzRb2FYEQ==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.6.tgz",
+      "integrity": "sha512-nNqCWT2jzPmqw/3/sKf1RFicL2JEFjmxXTpnIzJKt5U+bnS633cOy5pImNnfBGTd50NTNvdZ0GXMhQ7AwH16Qg==",
       "dependencies": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",
@@ -25771,9 +25771,9 @@
       "integrity": "sha512-ZJF4nbLPfxsWrVgp2reCb23HMxsWl5+r+K0RtIhxcZ/RxbHVihRA9mwyzIcxPWrT5x9uAAxCr1aKGP7IdsDe+Q=="
     },
     "@netlify/plugins-list": {
-      "version": "6.30.0",
-      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.30.0.tgz",
-      "integrity": "sha512-NF0G7rMl/FbCkZMDiihoDW70i96aF3fguHvuspucstM4ArAdMai5b3rEKSOO2SXTbmQHaAlQEpiYAPZsGwU7jg=="
+      "version": "6.32.0",
+      "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.32.0.tgz",
+      "integrity": "sha512-ZYaik41Xl7Jg7k204daKG26eT8pywThqvrwsDqW3gVuVx+Clo3uSrPTwNEuHme9Py0smdw2/oG2qp1jH3Q5sLQ=="
     },
     "@netlify/run-utils": {
       "version": "4.0.1",
@@ -35237,9 +35237,9 @@
       }
     },
     "netlify-onegraph-internal": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.1.tgz",
-      "integrity": "sha512-VU649035kx14sTFARPOgo0mF7jT7aEJlnpYS1IrGyUUwVM3wLdy6bLbn9UEng8ommRc7BHwPHWRV6NzRb2FYEQ==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/netlify-onegraph-internal/-/netlify-onegraph-internal-0.3.6.tgz",
+      "integrity": "sha512-nNqCWT2jzPmqw/3/sKf1RFicL2JEFjmxXTpnIzJKt5U+bnS633cOy5pImNnfBGTd50NTNvdZ0GXMhQ7AwH16Qg==",
       "requires": {
         "graphql": "16.0.0",
         "node-fetch": "^2.6.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "10.8.0",
+  "version": "10.9.0",
   "author": "Netlify Inc.",
   "contributors": [
     "Abraham Schilling <AbrahamSchilling@gmail.com> (https://gitlab.com/n4bb12)",
@@ -221,7 +221,7 @@
     "@netlify/edge-bundler": "^1.5.0",
     "@netlify/framework-info": "^9.1.0",
     "@netlify/local-functions-proxy": "^1.1.1",
-    "@netlify/plugins-list": "^6.30.0",
+    "@netlify/plugins-list": "^6.32.0",
     "@netlify/zip-it-and-ship-it": "^5.12.0",
     "@octokit/rest": "^18.0.0",
     "@sindresorhus/slugify": "^1.1.0",
@@ -287,7 +287,7 @@
     "multiparty": "^4.2.1",
     "netlify": "^11.0.2",
     "netlify-headers-parser": "^6.0.2",
-    "netlify-onegraph-internal": "0.3.1",
+    "netlify-onegraph-internal": "0.3.6",
     "netlify-redirect-parser": "^13.0.5",
     "netlify-redirector": "^0.2.1",
     "node-fetch": "^2.6.0",

package/src/commands/dev/dev.js

@@ -234,6 +234,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
  * @param {InspectSettings} params.inspectSettings
  * @param {() => Promise<object>} params.getUpdatedConfig
  * @param {string} params.geolocationMode
+ * @param {string} params.geoCountry
  * @param {*} params.settings
  * @param {boolean} params.offline
  * @param {*} params.site
@@ -243,6 +244,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
 const startProxyServer = async ({
   addonsUrls,
   config,
+  geoCountry,
   geolocationMode,
   getUpdatedConfig,
   inspectSettings,
@@ -256,6 +258,7 @@ const startProxyServer = async ({
     config,
     configPath: site.configPath,
     geolocationMode,
+    geoCountry,
     getUpdatedConfig,
     inspectSettings,
     offline,
@@ -386,6 +389,19 @@ const validateShortFlagArgs = (args) => {
   return args
 }
 
+const validateGeoCountryCode = (arg) => {
+  // Validate that the arg passed is two letters only for country
+  // See https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
+  if (!/^[a-z]{2}$/i.test(arg)) {
+    throw new Error(
+      `The geo country code must use a two letter abbreviation.
+      ${chalk.red(BANG)}  Example:
+      netlify dev --geo=mock --country=FR`,
+    )
+  }
+  return arg.toUpperCase()
+}
+
 /**
  * The dev command
  * @param {import('commander').OptionValues} options
@@ -460,6 +476,7 @@ const dev = async (options, command) => {
     addonsUrls,
     config,
     geolocationMode: options.geo,
+    geoCountry: options.country,
     getUpdatedConfig,
     inspectSettings,
     offline: options.offline,
@@ -599,6 +616,12 @@ const createDevCommand = (program) => {
         .choices(['cache', 'mock', 'update'])
         .default('cache'),
     )
+    .addOption(
+      new Option(
+        '--country <geoCountry>',
+        'Two-letter country code (ISO 3166-1 alpha-2, https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) to use as mock geolocation (enables --geo=mock autmatically)',
+      ).argParser(validateGeoCountryCode),
+    )
     .addOption(
       new Option('--staticServerPort <port>', 'port of the static app server used when no framework is detected')
         .argParser((value) => Number.parseInt(value))

package/src/commands/graph/graph-pull.js

@@ -56,9 +56,10 @@ const graphPull = async (options, command) => {
     error(`Failed to fetch and update Netlify GraphQL schema`)
   }
 
+  const { jwt } = await OneGraphCliClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
   const next = await OneGraphCliClient.fetchCliSessionEvents({
     appId: siteId,
-    authToken: netlifyToken,
+    jwt,
     sessionId: oneGraphSessionId,
   })
 
@@ -83,7 +84,7 @@ const graphPull = async (options, command) => {
 
     await OneGraphCliClient.ackCLISessionEvents({
       appId: siteId,
-      authToken: netlifyToken,
+      jwt,
       sessionId: oneGraphSessionId,
       eventIds: ackIds,
     })

package/src/lib/edge-functions/proxy.js

@@ -48,6 +48,7 @@ const handleProxyRequest = (req, proxyReq) => {
 const initializeProxy = async ({
   config,
   configPath,
+  geoCountry,
   geolocationMode,
   getUpdatedConfig,
   inspectSettings,
@@ -84,7 +85,7 @@ const initializeProxy = async ({
     }
 
     const [geoLocation, registry] = await Promise.all([
-      getGeoLocation({ mode: geolocationMode, offline, state }),
+      getGeoLocation({ mode: geolocationMode, geoCountry, offline, state }),
       server,
     ])
 

package/src/lib/geo-location.js

@@ -3,7 +3,6 @@ const fetch = require('node-fetch')
 
 const API_URL = 'https://netlifind.netlify.app'
 const STATE_GEO_PROPERTY = 'geolocation'
-
 // 24 hours
 const CACHE_TTL = 8.64e7
 
@@ -17,12 +16,11 @@ const REQUEST_TIMEOUT = 1e4
  * @property {object} country
  * @property {string} country.code
  * @property {string} country.name
- * @property {object} country
- * @property {string} country.code
- * @property {string} country.name
+ * @property {object} subdivision
+ * @property {string} subdivision.code
+ * @property {string} subdivision.name
  */
 
-// The default location to be used if we're unable to talk to the API.
 const mockLocation = {
   city: 'San Francisco',
   country: { code: 'US', name: 'United States' },
@@ -34,13 +32,13 @@ const mockLocation = {
  * location, depending on the mode selected.
  *
  * @param {object} params
- * @param {string} params.geolocationMode
  * @param {"cache"|"update"|"mock"} params.mode
+ * @param {string} params.geoCountry
  * @param {boolean} params.offline
  * @param {import('../utils/state-config').StateConfig} params.state
  * @returns {Promise<GeoLocation>}
  */
-const getGeoLocation = async ({ mode, offline, state }) => {
+const getGeoLocation = async ({ geoCountry, mode, offline, state }) => {
   const cacheObject = state.get(STATE_GEO_PROPERTY)
 
   // If we have cached geolocation data and the `--geo` option is set to
@@ -56,10 +54,18 @@ const getGeoLocation = async ({ mode, offline, state }) => {
     }
   }
 
-  // If the `--geo` option is set to `mock`, we use the mock location. Also,
-  // if the `--offline` option was used, we can't talk to the API, so let's
-  // also use the mock location.
-  if (mode === 'mock' || offline) {
+  // If the `--geo` option is set to `mock`, we use the default mock location.
+  // If the `--offline` option was used, we can't talk to the API, so let's
+  // also use the mock location.  Otherwise, use the country code passed in by
+  // the user.
+  if (mode === 'mock' || offline || geoCountry) {
+    if (geoCountry) {
+      return {
+        city: 'Mock City',
+        country: { code: geoCountry, name: 'Mock Country' },
+        subdivision: { code: 'SD', name: 'Mock Subdivision' },
+      }
+    }
     return mockLocation
   }
 

package/src/lib/one-graph/cli-client.js

@@ -70,7 +70,8 @@ const monitorCLISessionEvents = (input) => {
   let nextMarkActiveHeartbeat = defaultHeartbeatFrequency
 
   const markActiveHelper = async () => {
-    const fullSession = await OneGraphClient.fetchCliSession({ authToken: netlifyToken, appId, sessionId })
+    const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
+    const fullSession = await OneGraphClient.fetchCliSession({ jwt: graphJwt.jwt, appId, sessionId })
     // @ts-ignore
     const heartbeatIntervalms = fullSession.session.cliHeartbeatIntervalMs || defaultHeartbeatFrequency
     nextMarkActiveHeartbeat = heartbeatIntervalms
@@ -85,12 +86,14 @@ const monitorCLISessionEvents = (input) => {
 
   const enabledServiceWatcher = async (innerNetlifyToken, siteId) => {
     const enabledServices = state.get('oneGraphEnabledServices') || ['onegraph']
-    const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(innerNetlifyToken, siteId)
+    const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
+
+    const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(jwt, siteId)
     if (!enabledServicesInfo) {
       warn('Unable to fetch enabled services for site for code generation')
       return
     }
-    const newEnabledServices = enabledServicesInfo.map((service) => service.service)
+    const newEnabledServices = enabledServicesInfo.map((service) => service.graphQLField)
     const enabledServicesCompareKey = enabledServices.sort().join(',')
     const newEnabledServicesCompareKey = newEnabledServices.sort().join(',')
 
@@ -117,15 +120,16 @@ const monitorCLISessionEvents = (input) => {
       onClose && onClose()
     }
 
-    const next = await OneGraphClient.fetchCliSessionEvents({ appId, authToken: netlifyToken, sessionId })
+    const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId: appId, nfToken: netlifyToken })
+    const next = await OneGraphClient.fetchCliSessionEvents({ appId, jwt: graphJwt.jwt, sessionId })
 
-    if (next.errors) {
+    if (next && next.errors) {
       next.errors.forEach((fetchEventError) => {
         onError(fetchEventError)
       })
     }
 
-    const { events } = next
+    const events = (next && next.events) || []
 
     if (events.length !== 0) {
       let ackIds = []
@@ -134,7 +138,7 @@ const monitorCLISessionEvents = (input) => {
       } catch (eventHandlerError) {
         warn(`Error handling event: ${eventHandlerError}`)
       } finally {
-        await OneGraphClient.ackCLISessionEvents({ appId, authToken: netlifyToken, sessionId, eventIds: ackIds })
+        await OneGraphClient.ackCLISessionEvents({ appId, jwt: graphJwt.jwt, sessionId, eventIds: ackIds })
       }
     }
 
@@ -182,16 +186,18 @@ const monitorOperationFile = async ({ netlifyGraphConfig, onAdd, onChange, onUnl
  */
 const refetchAndGenerateFromOneGraph = async (input) => {
   const { logger, netlifyGraphConfig, netlifyToken, siteId, state } = input
-  await OneGraphClient.ensureAppForSite(netlifyToken, siteId)
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+
+  await OneGraphClient.ensureAppForSite(jwt, siteId)
 
-  const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(netlifyToken, siteId)
+  const enabledServicesInfo = await OneGraphClient.fetchEnabledServices(jwt, siteId)
   if (!enabledServicesInfo) {
     warn('Unable to fetch enabled services for site for code generation')
     return
   }
 
   const enabledServices = enabledServicesInfo
-    .map((service) => service.service)
+    .map((service) => service.graphQLField)
     .sort((aString, bString) => aString.localeCompare(bString))
 
   const schema = await OneGraphClient.fetchOneGraphSchemaForServices(siteId, enabledServices)
@@ -266,7 +272,8 @@ const quickHash = (input) => {
  */
 const updateGraphQLOperationsFileFromPersistedDoc = async (input) => {
   const { docId, logger, netlifyGraphConfig, netlifyToken, schema, siteId } = input
-  const persistedDoc = await OneGraphClient.fetchPersistedQuery(netlifyToken, siteId, docId)
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+  const persistedDoc = await OneGraphClient.fetchPersistedQuery(jwt, siteId, docId)
   if (!persistedDoc) {
     warn(`No persisted doc found for: ${docId}`)
     return
@@ -341,11 +348,15 @@ const handleCliSessionEvent = async ({
           },
         }
 
-        await OneGraphClient.executeCreateCLISessionEventMutation({
-          nfToken: netlifyToken,
-          sessionId,
-          payload: fileWrittenEvent,
-        })
+        const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+
+        await OneGraphClient.executeCreateCLISessionEventMutation(
+          {
+            sessionId,
+            payload: fileWrittenEvent,
+          },
+          { accesToken: graphJwt.jwt },
+        )
       }
       break
     }
@@ -397,10 +408,12 @@ const handleCliSessionEvent = async ({
  * @param {object} input.siteId The site object that contains the root file path for the site
  */
 const getCLISession = async ({ netlifyToken, oneGraphSessionId, siteId }) => {
+  const graphJwt = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+
   const input = {
     appId: siteId,
     sessionId: oneGraphSessionId,
-    authToken: netlifyToken,
+    jwt: graphJwt.jwt,
     desiredEventCount: 1,
   }
   return await OneGraphClient.fetchCliSession(input)
@@ -468,7 +481,9 @@ const upsertMergeCLISessionMetadata = async ({ netlifyToken, newMetadata, oneGra
 
   // @ts-ignore
   const finalMetadata = { ...metadata, ...detectedMetadata, ...newMetadata }
-  return OneGraphClient.updateCLISessionMetadata(netlifyToken, siteId, oneGraphSessionId, finalMetadata)
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+
+  return OneGraphClient.updateCLISessionMetadata(jwt, siteId, oneGraphSessionId, finalMetadata)
 }
 
 const persistNewOperationsDocForSession = async ({
@@ -519,8 +534,9 @@ const persistNewOperationsDocForSession = async ({
   }
 }
 
-const createCLISession = ({ metadata, netlifyToken, sessionName, siteId }) => {
-  const result = OneGraphClient.createCLISession(netlifyToken, siteId, sessionName, metadata)
+const createCLISession = async ({ metadata, netlifyToken, sessionName, siteId }) => {
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId, nfToken: netlifyToken })
+  const result = OneGraphClient.createCLISession(jwt, siteId, sessionName, metadata)
   return result
 }
 
@@ -542,7 +558,8 @@ const loadCLISession = (state) => state.get('oneGraphSessionId')
  */
 const startOneGraphCLISession = async (input) => {
   const { netlifyGraphConfig, netlifyToken, site, state } = input
-  OneGraphClient.ensureAppForSite(netlifyToken, site.id)
+  const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId: site.id, nfToken: netlifyToken })
+  OneGraphClient.ensureAppForSite(jwt, site.id)
 
   const oneGraphSessionId = await ensureCLISession({
     metadata: {},
@@ -667,9 +684,11 @@ const ensureCLISession = async (input) => {
   // Validate that session still exists and we can access it
   try {
     if (oneGraphSessionId) {
+      const { jwt } = await OneGraphClient.getGraphJwtForSite({ siteId: site.id, nfToken: netlifyToken })
+
       const sessionEvents = await OneGraphClient.fetchCliSessionEvents({
         appId: site.id,
-        authToken: netlifyToken,
+        jwt,
         sessionId: oneGraphSessionId,
       })
       if (sessionEvents.errors) {
@@ -728,6 +747,7 @@ const OneGraphCliClient = {
   fetchCliSessionEvents: OneGraphClient.fetchCliSessionEvents,
   ensureAppForSite,
   updateCLISessionMetadata,
+  getGraphJwtForSite: OneGraphClient.getGraphJwtForSite,
 }
 
 module.exports = {

package/src/utils/proxy.js

@@ -465,6 +465,7 @@ const startProxy = async function ({
   addonsUrls,
   config,
   configPath,
+  geoCountry,
   geolocationMode,
   getUpdatedConfig,
   inspectSettings,
@@ -478,6 +479,7 @@ const startProxy = async function ({
     config,
     configPath,
     geolocationMode,
+    geoCountry,
     getUpdatedConfig,
     inspectSettings,
     offline,