@strapi/cloud-cli 0.0.0-next.b11829e6c6aacb45bc1ec2f341609d04d88080d2 → 0.0.0-next.c6549bf210addfc92e2ffc84d41d7629cc3c3363

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/LICENSE +18 -3
  2. package/dist/index.js +664 -313
  3. package/dist/index.js.map +1 -1
  4. package/dist/index.mjs +654 -300
  5. package/dist/index.mjs.map +1 -1
  6. package/dist/src/create-project/action.d.ts +1 -1
  7. package/dist/src/create-project/action.d.ts.map +1 -1
  8. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts +3 -0
  9. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts.map +1 -0
  10. package/dist/src/create-project/utils/project-questions.utils.d.ts +20 -0
  11. package/dist/src/create-project/utils/project-questions.utils.d.ts.map +1 -0
  12. package/dist/src/deploy-project/action.d.ts.map +1 -1
  13. package/dist/src/index.d.ts +2 -0
  14. package/dist/src/index.d.ts.map +1 -1
  15. package/dist/src/link/action.d.ts +4 -0
  16. package/dist/src/link/action.d.ts.map +1 -0
  17. package/dist/src/link/command.d.ts +7 -0
  18. package/dist/src/link/command.d.ts.map +1 -0
  19. package/dist/src/link/index.d.ts +7 -0
  20. package/dist/src/link/index.d.ts.map +1 -0
  21. package/dist/src/list-projects/action.d.ts +4 -0
  22. package/dist/src/list-projects/action.d.ts.map +1 -0
  23. package/dist/src/list-projects/command.d.ts +7 -0
  24. package/dist/src/list-projects/command.d.ts.map +1 -0
  25. package/dist/src/list-projects/index.d.ts +7 -0
  26. package/dist/src/list-projects/index.d.ts.map +1 -0
  27. package/dist/src/login/action.d.ts +2 -2
  28. package/dist/src/login/action.d.ts.map +1 -1
  29. package/dist/src/logout/action.d.ts.map +1 -1
  30. package/dist/src/services/build-logs.d.ts.map +1 -1
  31. package/dist/src/services/cli-api.d.ts +38 -8
  32. package/dist/src/services/cli-api.d.ts.map +1 -1
  33. package/dist/src/services/strapi-info-save.d.ts +1 -1
  34. package/dist/src/services/strapi-info-save.d.ts.map +1 -1
  35. package/dist/src/services/token.d.ts +1 -1
  36. package/dist/src/services/token.d.ts.map +1 -1
  37. package/dist/src/types.d.ts +1 -0
  38. package/dist/src/types.d.ts.map +1 -1
  39. package/dist/src/utils/analytics.d.ts +4 -0
  40. package/dist/src/utils/analytics.d.ts.map +1 -0
  41. package/dist/src/utils/compress-files.d.ts.map +1 -1
  42. package/dist/src/utils/pkg.d.ts.map +1 -1
  43. package/package.json +7 -6
  44. package/dist/src/utils/tests/compress-files.test.d.ts +0 -2
  45. package/dist/src/utils/tests/compress-files.test.d.ts.map +0 -1
package/dist/index.js CHANGED
@@ -29,7 +29,6 @@ const chalk = require("chalk");
29
29
  const axios = require("axios");
30
30
  const crypto = require("node:crypto");
31
31
  const utils = require("@strapi/utils");
32
- const fs = require("fs");
33
32
  const tar = require("tar");
34
33
  const minimatch = require("minimatch");
35
34
  const inquirer = require("inquirer");
@@ -41,10 +40,9 @@ const jwt = require("jsonwebtoken");
41
40
  const stringify = require("fast-safe-stringify");
42
41
  const ora = require("ora");
43
42
  const cliProgress = require("cli-progress");
44
- const EventSource = require("eventsource");
45
- const fs$1 = require("fs/promises");
46
43
  const pkgUp = require("pkg-up");
47
44
  const yup = require("yup");
45
+ const EventSource = require("eventsource");
48
46
  const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
49
47
  function _interopNamespace(e) {
50
48
  if (e && e.__esModule)
@@ -65,12 +63,11 @@ function _interopNamespace(e) {
65
63
  return Object.freeze(n);
66
64
  }
67
65
  const crypto__default = /* @__PURE__ */ _interopDefault(crypto$1);
68
- const fse__default = /* @__PURE__ */ _interopDefault(fse);
66
+ const fse__namespace = /* @__PURE__ */ _interopNamespace(fse);
69
67
  const path__namespace = /* @__PURE__ */ _interopNamespace(path);
70
68
  const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
71
69
  const axios__default = /* @__PURE__ */ _interopDefault(axios);
72
70
  const crypto__namespace = /* @__PURE__ */ _interopNamespace(crypto);
73
- const fs__namespace = /* @__PURE__ */ _interopNamespace(fs);
74
71
  const tar__namespace = /* @__PURE__ */ _interopNamespace(tar);
75
72
  const inquirer__default = /* @__PURE__ */ _interopDefault(inquirer);
76
73
  const os__default = /* @__PURE__ */ _interopDefault(os);
@@ -80,10 +77,9 @@ const jwt__default = /* @__PURE__ */ _interopDefault(jwt);
80
77
  const stringify__default = /* @__PURE__ */ _interopDefault(stringify);
81
78
  const ora__default = /* @__PURE__ */ _interopDefault(ora);
82
79
  const cliProgress__namespace = /* @__PURE__ */ _interopNamespace(cliProgress);
83
- const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
84
- const fs__default = /* @__PURE__ */ _interopDefault(fs$1);
85
80
  const pkgUp__default = /* @__PURE__ */ _interopDefault(pkgUp);
86
81
  const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
82
+ const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
87
83
  const apiConfig = {
88
84
  apiBaseUrl: utils.env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
89
85
  dashboardBaseUrl: utils.env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -102,23 +98,6 @@ const IGNORED_PATTERNS = [
102
98
  "**/.idea/**",
103
99
  "**/.vscode/**"
104
100
  ];
105
- const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
106
- const entries = fs__namespace.readdirSync(path__namespace.join(dirPath, subfolder));
107
- entries.forEach((entry) => {
108
- const entryPathFromRoot = path__namespace.join(subfolder, entry);
109
- const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
110
- const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
111
- if (isIgnored) {
112
- return;
113
- }
114
- if (fs__namespace.statSync(entryPath).isDirectory()) {
115
- getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
116
- } else {
117
- arrayOfFiles.push(entryPath);
118
- }
119
- });
120
- return arrayOfFiles;
121
- };
122
101
  const isIgnoredFile = (folderPath, file, ignorePatterns) => {
123
102
  ignorePatterns.push(...IGNORED_PATTERNS);
124
103
  const relativeFilePath = path__namespace.join(folderPath, file);
@@ -136,16 +115,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
136
115
  }
137
116
  return isIgnored;
138
117
  };
139
- const readGitignore = (folderPath) => {
118
+ const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
119
+ const arrayOfFiles = [];
120
+ const entries = await fse__namespace.readdir(path__namespace.join(dirPath, subfolder));
121
+ for (const entry of entries) {
122
+ const entryPathFromRoot = path__namespace.join(subfolder, entry);
123
+ const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
124
+ const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
125
+ if (!isIgnored) {
126
+ if (fse__namespace.statSync(entryPath).isDirectory()) {
127
+ const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
128
+ arrayOfFiles.push(...subFiles);
129
+ } else {
130
+ arrayOfFiles.push(entryPath);
131
+ }
132
+ }
133
+ }
134
+ return arrayOfFiles;
135
+ };
136
+ const readGitignore = async (folderPath) => {
140
137
  const gitignorePath = path__namespace.resolve(folderPath, ".gitignore");
141
- if (!fs__namespace.existsSync(gitignorePath))
138
+ const pathExist = await fse__namespace.pathExists(gitignorePath);
139
+ if (!pathExist)
142
140
  return [];
143
- const gitignoreContent = fs__namespace.readFileSync(gitignorePath, "utf8");
141
+ const gitignoreContent = await fse__namespace.readFile(gitignorePath, "utf8");
144
142
  return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
145
143
  };
146
144
  const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
147
- const ignorePatterns = readGitignore(folderToCompress);
148
- const filesToCompress = getFiles(folderToCompress, ignorePatterns);
145
+ const ignorePatterns = await readGitignore(folderToCompress);
146
+ const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
149
147
  return tar__namespace.c(
150
148
  {
151
149
  gzip: true,
@@ -158,7 +156,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
158
156
  const CONFIG_FILENAME = "config.json";
159
157
  async function checkDirectoryExists(directoryPath) {
160
158
  try {
161
- const fsStat = await fse__default.default.lstat(directoryPath);
159
+ const fsStat = await fse__namespace.default.lstat(directoryPath);
162
160
  return fsStat.isDirectory();
163
161
  } catch (e) {
164
162
  return false;
@@ -166,14 +164,14 @@ async function checkDirectoryExists(directoryPath) {
166
164
  }
167
165
  async function getTmpStoragePath() {
168
166
  const storagePath = path__namespace.default.join(os__default.default.tmpdir(), APP_FOLDER_NAME);
169
- await fse__default.default.ensureDir(storagePath);
167
+ await fse__namespace.default.ensureDir(storagePath);
170
168
  return storagePath;
171
169
  }
172
170
  async function getConfigPath() {
173
171
  const configDirs = XDGAppPaths__default.default(APP_FOLDER_NAME).configDirs();
174
172
  const configPath = configDirs.find(checkDirectoryExists);
175
173
  if (!configPath) {
176
- await fse__default.default.ensureDir(configDirs[0]);
174
+ await fse__namespace.default.ensureDir(configDirs[0]);
177
175
  return configDirs[0];
178
176
  }
179
177
  return configPath;
@@ -181,9 +179,9 @@ async function getConfigPath() {
181
179
  async function getLocalConfig() {
182
180
  const configPath = await getConfigPath();
183
181
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
184
- await fse__default.default.ensureFile(configFilePath);
182
+ await fse__namespace.default.ensureFile(configFilePath);
185
183
  try {
186
- return await fse__default.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
184
+ return await fse__namespace.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
187
185
  } catch (e) {
188
186
  return {};
189
187
  }
@@ -191,10 +189,10 @@ async function getLocalConfig() {
191
189
  async function saveLocalConfig(data) {
192
190
  const configPath = await getConfigPath();
193
191
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
194
- await fse__default.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
192
+ await fse__namespace.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
195
193
  }
196
194
  const name = "@strapi/cloud-cli";
197
- const version = "4.25.0";
195
+ const version = "4.25.9";
198
196
  const description = "Commands to interact with the Strapi Cloud";
199
197
  const keywords = [
200
198
  "strapi",
@@ -235,11 +233,12 @@ const scripts = {
235
233
  build: "pack-up build",
236
234
  clean: "run -T rimraf ./dist",
237
235
  lint: "run -T eslint .",
236
+ "test:unit": "run -T jest",
238
237
  watch: "pack-up watch"
239
238
  };
240
239
  const dependencies = {
241
- "@strapi/utils": "4.25.0",
242
- axios: "1.6.0",
240
+ "@strapi/utils": "4.25.9",
241
+ axios: "1.7.4",
243
242
  chalk: "4.1.2",
244
243
  "cli-progress": "3.12.0",
245
244
  commander: "8.3.0",
@@ -263,8 +262,8 @@ const devDependencies = {
263
262
  "@types/cli-progress": "3.11.5",
264
263
  "@types/eventsource": "1.1.15",
265
264
  "@types/lodash": "^4.14.191",
266
- "eslint-config-custom": "4.25.0",
267
- tsconfig: "4.25.0"
265
+ "eslint-config-custom": "4.25.9",
266
+ tsconfig: "4.25.9"
268
267
  };
269
268
  const engines = {
270
269
  node: ">=18.0.0 <=20.x.x",
@@ -293,7 +292,7 @@ const packageJson = {
293
292
  engines
294
293
  };
295
294
  const VERSION = "v1";
296
- async function cloudApiFactory(token) {
295
+ async function cloudApiFactory({ logger }, token) {
297
296
  const localConfig = await getLocalConfig();
298
297
  const customHeaders = {
299
298
  "x-device-id": localConfig.deviceId,
@@ -317,7 +316,7 @@ async function cloudApiFactory(token) {
317
316
  deploy({ filePath, project }, { onUploadProgress }) {
318
317
  return axiosCloudAPI.post(
319
318
  `/deploy/${project.name}`,
320
- { file: fse__default.default.createReadStream(filePath) },
319
+ { file: fse__namespace.default.createReadStream(filePath) },
321
320
  {
322
321
  headers: {
323
322
  "Content-Type": "multipart/form-data"
@@ -346,11 +345,61 @@ async function cloudApiFactory(token) {
346
345
  getUserInfo() {
347
346
  return axiosCloudAPI.get("/user");
348
347
  },
349
- config() {
350
- return axiosCloudAPI.get("/config");
348
+ async config() {
349
+ try {
350
+ const response = await axiosCloudAPI.get("/config");
351
+ if (response.status !== 200) {
352
+ throw new Error("Error fetching cloud CLI config from the server.");
353
+ }
354
+ return response;
355
+ } catch (error) {
356
+ logger.debug(
357
+ "🥲 Oops! Couldn't retrieve the cloud CLI config from the server. Please try again."
358
+ );
359
+ throw error;
360
+ }
361
+ },
362
+ async listProjects() {
363
+ try {
364
+ const response = await axiosCloudAPI.get("/projects");
365
+ if (response.status !== 200) {
366
+ throw new Error("Error fetching cloud projects from the server.");
367
+ }
368
+ return response;
369
+ } catch (error) {
370
+ logger.debug(
371
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
372
+ );
373
+ throw error;
374
+ }
375
+ },
376
+ async listLinkProjects() {
377
+ try {
378
+ const response = await axiosCloudAPI.get("/projects-linkable");
379
+ if (response.status !== 200) {
380
+ throw new Error("Error fetching cloud projects from the server.");
381
+ }
382
+ return response;
383
+ } catch (error) {
384
+ logger.debug(
385
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
386
+ );
387
+ throw error;
388
+ }
351
389
  },
352
- listProjects() {
353
- return axiosCloudAPI.get("/projects");
390
+ async getProject({ name: name2 }) {
391
+ try {
392
+ const response = await axiosCloudAPI.get(`/projects/${name2}`);
393
+ if (response.status !== 200) {
394
+ throw new Error("Error fetching project's details.");
395
+ }
396
+ return response;
397
+ } catch (error) {
398
+ logger.debug(
399
+ "🥲 Oops! There was a problem retrieving your project's details. Please try again."
400
+ );
401
+ throw error;
402
+ }
354
403
  },
355
404
  track(event, payload = {}) {
356
405
  return axiosCloudAPI.post("/track", {
@@ -365,18 +414,18 @@ async function save(data, { directoryPath } = {}) {
365
414
  const alreadyInFileData = await retrieve({ directoryPath });
366
415
  const storedData = { ...alreadyInFileData, ...data };
367
416
  const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
368
- await fse__default.default.ensureDir(path__namespace.default.dirname(pathToFile));
369
- await fse__default.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
417
+ await fse__namespace.default.ensureDir(path__namespace.default.dirname(pathToFile));
418
+ await fse__namespace.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
370
419
  }
371
420
  async function retrieve({
372
421
  directoryPath
373
422
  } = {}) {
374
423
  const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
375
- const pathExists = await fse__default.default.pathExists(pathToFile);
424
+ const pathExists = await fse__namespace.default.pathExists(pathToFile);
376
425
  if (!pathExists) {
377
426
  return {};
378
427
  }
379
- return fse__default.default.readJSON(pathToFile, { encoding: "utf8" });
428
+ return fse__namespace.default.readJSON(pathToFile, { encoding: "utf8" });
380
429
  }
381
430
  const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
382
431
  __proto__: null,
@@ -386,7 +435,7 @@ const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defi
386
435
  }, Symbol.toStringTag, { value: "Module" }));
387
436
  let cliConfig;
388
437
  async function tokenServiceFactory({ logger }) {
389
- const cloudApiService = await cloudApiFactory();
438
+ const cloudApiService = await cloudApiFactory({ logger });
390
439
  async function saveToken(str) {
391
440
  const appConfig = await getLocalConfig();
392
441
  if (!appConfig) {
@@ -435,14 +484,17 @@ async function tokenServiceFactory({ logger }) {
435
484
  "There seems to be a problem with your login information. Please try logging in again."
436
485
  );
437
486
  }
487
+ return Promise.reject(new Error("Invalid token"));
438
488
  }
439
489
  return new Promise((resolve, reject) => {
440
490
  jwt__default.default.verify(idToken, getKey, (err) => {
441
491
  if (err) {
442
492
  reject(err);
443
- } else {
444
- resolve();
445
493
  }
494
+ if (decodedToken.payload.exp < Math.floor(Date.now() / 1e3)) {
495
+ reject(new Error("Token is expired"));
496
+ }
497
+ resolve();
446
498
  });
447
499
  });
448
500
  }
@@ -476,15 +528,15 @@ async function tokenServiceFactory({ logger }) {
476
528
  throw e;
477
529
  }
478
530
  }
479
- async function getValidToken() {
480
- const token = await retrieveToken();
481
- if (!token) {
482
- logger.log("No token found. Please login first.");
483
- return null;
484
- }
485
- if (!await isTokenValid(token)) {
486
- logger.log("Unable to proceed: Token is expired or not valid. Please login again.");
487
- return null;
531
+ async function getValidToken(ctx, loginAction2) {
532
+ let token = await retrieveToken();
533
+ while (!token || !await isTokenValid(token)) {
534
+ logger.log(
535
+ token ? "Oops! Your token seems expired or invalid. Please login again." : "We couldn't find a valid token. You need to be logged in to use this feature."
536
+ );
537
+ if (!await loginAction2(ctx))
538
+ return null;
539
+ token = await retrieveToken();
488
540
  }
489
541
  return token;
490
542
  }
@@ -618,17 +670,254 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
618
670
  local: strapiInfoSave,
619
671
  tokenServiceFactory
620
672
  }, Symbol.toStringTag, { value: "Module" }));
621
- async function handleError(ctx, error) {
673
+ yup__namespace.object({
674
+ name: yup__namespace.string().required(),
675
+ exports: yup__namespace.lazy(
676
+ (value) => yup__namespace.object(
677
+ typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
678
+ if (typeof value2 === "object") {
679
+ acc[key] = yup__namespace.object({
680
+ types: yup__namespace.string().optional(),
681
+ source: yup__namespace.string().required(),
682
+ module: yup__namespace.string().optional(),
683
+ import: yup__namespace.string().required(),
684
+ require: yup__namespace.string().required(),
685
+ default: yup__namespace.string().required()
686
+ }).noUnknown(true);
687
+ } else {
688
+ acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
689
+ }
690
+ return acc;
691
+ }, {}) : void 0
692
+ ).optional()
693
+ )
694
+ });
695
+ const loadPkg = async ({ cwd, logger }) => {
696
+ const pkgPath = await pkgUp__default.default({ cwd });
697
+ if (!pkgPath) {
698
+ throw new Error("Could not find a package.json in the current directory");
699
+ }
700
+ const buffer = await fse__namespace.readFile(pkgPath);
701
+ const pkg = JSON.parse(buffer.toString());
702
+ logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
703
+ return pkg;
704
+ };
705
+ async function getProjectNameFromPackageJson(ctx) {
706
+ try {
707
+ const packageJson2 = await loadPkg(ctx);
708
+ return packageJson2.name || "my-strapi-project";
709
+ } catch (e) {
710
+ return "my-strapi-project";
711
+ }
712
+ }
713
+ const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
714
+ try {
715
+ await cloudApiService.track(eventName, eventData);
716
+ } catch (e) {
717
+ ctx.logger.debug(`Failed to track ${eventName}`, e);
718
+ }
719
+ };
720
+ const openModule$1 = import("open");
721
+ async function promptLogin(ctx) {
722
+ const response = await inquirer__default.default.prompt([
723
+ {
724
+ type: "confirm",
725
+ name: "login",
726
+ message: "Would you like to login?"
727
+ }
728
+ ]);
729
+ if (response.login) {
730
+ const loginSuccessful = await loginAction(ctx);
731
+ return loginSuccessful;
732
+ }
733
+ return false;
734
+ }
735
+ async function loginAction(ctx) {
736
+ const { logger } = ctx;
622
737
  const tokenService = await tokenServiceFactory(ctx);
738
+ const existingToken = await tokenService.retrieveToken();
739
+ const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
740
+ if (existingToken) {
741
+ const isTokenValid = await tokenService.isTokenValid(existingToken);
742
+ if (isTokenValid) {
743
+ try {
744
+ const userInfo = await cloudApiService.getUserInfo();
745
+ const { email } = userInfo.data.data;
746
+ if (email) {
747
+ logger.log(`You are already logged into your account (${email}).`);
748
+ } else {
749
+ logger.log("You are already logged in.");
750
+ }
751
+ logger.log(
752
+ "To access your dashboard, please copy and paste the following URL into your web browser:"
753
+ );
754
+ logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
755
+ return true;
756
+ } catch (e) {
757
+ logger.debug("Failed to fetch user info", e);
758
+ }
759
+ }
760
+ }
761
+ let cliConfig2;
762
+ try {
763
+ logger.info("🔌 Connecting to the Strapi Cloud API...");
764
+ const config = await cloudApiService.config();
765
+ cliConfig2 = config.data;
766
+ } catch (e) {
767
+ logger.error("🥲 Oops! Something went wrong while logging you in. Please try again.");
768
+ logger.debug(e);
769
+ return false;
770
+ }
771
+ await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
772
+ logger.debug("🔐 Creating device authentication request...", {
773
+ client_id: cliConfig2.clientId,
774
+ scope: cliConfig2.scope,
775
+ audience: cliConfig2.audience
776
+ });
777
+ const deviceAuthResponse = await axios__default.default.post(cliConfig2.deviceCodeAuthUrl, {
778
+ client_id: cliConfig2.clientId,
779
+ scope: cliConfig2.scope,
780
+ audience: cliConfig2.audience
781
+ }).catch((e) => {
782
+ logger.error("There was an issue with the authentication process. Please try again.");
783
+ if (e.message) {
784
+ logger.debug(e.message, e);
785
+ } else {
786
+ logger.debug(e);
787
+ }
788
+ });
789
+ openModule$1.then((open) => {
790
+ open.default(deviceAuthResponse.data.verification_uri_complete).catch((e) => {
791
+ logger.error("We encountered an issue opening the browser. Please try again later.");
792
+ logger.debug(e.message, e);
793
+ });
794
+ });
795
+ logger.log("If a browser tab does not open automatically, please follow the next steps:");
796
+ logger.log(
797
+ `1. Open this url in your device: ${deviceAuthResponse.data.verification_uri_complete}`
798
+ );
799
+ logger.log(
800
+ `2. Enter the following code: ${deviceAuthResponse.data.user_code} and confirm to login.
801
+ `
802
+ );
803
+ const tokenPayload = {
804
+ grant_type: "urn:ietf:params:oauth:grant-type:device_code",
805
+ device_code: deviceAuthResponse.data.device_code,
806
+ client_id: cliConfig2.clientId
807
+ };
808
+ let isAuthenticated = false;
809
+ const authenticate = async () => {
810
+ const spinner = logger.spinner("Waiting for authentication");
811
+ spinner.start();
812
+ const spinnerFail = () => spinner.fail("Authentication failed!");
813
+ while (!isAuthenticated) {
814
+ try {
815
+ const tokenResponse = await axios__default.default.post(cliConfig2.tokenUrl, tokenPayload);
816
+ const authTokenData = tokenResponse.data;
817
+ if (tokenResponse.status === 200) {
818
+ try {
819
+ logger.debug("🔐 Validating token...");
820
+ await tokenService.validateToken(authTokenData.id_token, cliConfig2.jwksUrl);
821
+ logger.debug("🔐 Token validation successful!");
822
+ } catch (e) {
823
+ logger.debug(e);
824
+ spinnerFail();
825
+ throw new Error("Unable to proceed: Token validation failed");
826
+ }
827
+ logger.debug("🔍 Fetching user information...");
828
+ const cloudApiServiceWithToken = await cloudApiFactory(ctx, authTokenData.access_token);
829
+ await cloudApiServiceWithToken.getUserInfo();
830
+ logger.debug("🔍 User information fetched successfully!");
831
+ try {
832
+ logger.debug("📝 Saving login information...");
833
+ await tokenService.saveToken(authTokenData.access_token);
834
+ logger.debug("📝 Login information saved successfully!");
835
+ isAuthenticated = true;
836
+ } catch (e) {
837
+ logger.error(
838
+ "There was a problem saving your login information. Please try logging in again."
839
+ );
840
+ logger.debug(e);
841
+ spinnerFail();
842
+ return false;
843
+ }
844
+ }
845
+ } catch (e) {
846
+ if (e.message === "Unable to proceed: Token validation failed") {
847
+ logger.error(
848
+ "There seems to be a problem with your login information. Please try logging in again."
849
+ );
850
+ spinnerFail();
851
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
852
+ return false;
853
+ }
854
+ if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
855
+ logger.debug(e);
856
+ spinnerFail();
857
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
858
+ return false;
859
+ }
860
+ await new Promise((resolve) => {
861
+ setTimeout(resolve, deviceAuthResponse.data.interval * 1e3);
862
+ });
863
+ }
864
+ }
865
+ spinner.succeed("Authentication successful!");
866
+ logger.log("You are now logged into Strapi Cloud.");
867
+ logger.log(
868
+ "To access your dashboard, please copy and paste the following URL into your web browser:"
869
+ );
870
+ logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
871
+ await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
872
+ };
873
+ await authenticate();
874
+ return isAuthenticated;
875
+ }
876
+ function questionDefaultValuesMapper(questionsMap) {
877
+ return (questions) => {
878
+ return questions.map((question) => {
879
+ const questionName = question.name;
880
+ if (questionName in questionsMap) {
881
+ const questionDefault = questionsMap[questionName];
882
+ if (typeof questionDefault === "function") {
883
+ return {
884
+ ...question,
885
+ default: questionDefault(question)
886
+ };
887
+ }
888
+ return {
889
+ ...question,
890
+ default: questionDefault
891
+ };
892
+ }
893
+ return question;
894
+ });
895
+ };
896
+ }
897
+ function getDefaultsFromQuestions(questions) {
898
+ return questions.reduce((acc, question) => {
899
+ if (question.default && question.name) {
900
+ return { ...acc, [question.name]: question.default };
901
+ }
902
+ return acc;
903
+ }, {});
904
+ }
905
+ function getProjectNodeVersionDefault(question) {
906
+ const currentNodeVersion = process.versions.node.split(".")[0];
907
+ if (question.type === "list" && Array.isArray(question.choices)) {
908
+ const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
909
+ if (choice) {
910
+ return choice.value;
911
+ }
912
+ }
913
+ return question.default;
914
+ }
915
+ async function handleError(ctx, error) {
623
916
  const { logger } = ctx;
624
917
  logger.debug(error);
625
918
  if (error instanceof axios.AxiosError) {
626
919
  const errorMessage = typeof error.response?.data === "string" ? error.response.data : null;
627
920
  switch (error.response?.status) {
628
- case 401:
629
- logger.error("Your session has expired. Please log in again.");
630
- await tokenService.eraseToken();
631
- return;
632
921
  case 403:
633
922
  logger.error(
634
923
  errorMessage || "You do not have permission to create a project. Please contact support for assistance."
@@ -654,19 +943,8 @@ async function handleError(ctx, error) {
654
943
  "We encountered an issue while creating your project. Please try again in a moment. If the problem persists, contact support for assistance."
655
944
  );
656
945
  }
657
- const action$3 = async (ctx) => {
946
+ async function createProject$1(ctx, cloudApi, projectInput) {
658
947
  const { logger } = ctx;
659
- const { getValidToken } = await tokenServiceFactory(ctx);
660
- const token = await getValidToken();
661
- if (!token) {
662
- return;
663
- }
664
- const cloudApi = await cloudApiFactory(token);
665
- const { data: config } = await cloudApi.config();
666
- const { questions, defaults: defaultValues } = config.projectCreation;
667
- const projectAnswersDefaulted = fp.defaults(defaultValues);
668
- const projectAnswers = await inquirer__default.default.prompt(questions);
669
- const projectInput = projectAnswersDefaulted(projectAnswers);
670
948
  const spinner = logger.spinner("Setting up your project...").start();
671
949
  try {
672
950
  const { data } = await cloudApi.createProject(projectInput);
@@ -674,18 +952,54 @@ const action$3 = async (ctx) => {
674
952
  spinner.succeed("Project created successfully!");
675
953
  return data;
676
954
  } catch (e) {
677
- spinner.fail("Failed to create project on Strapi Cloud.");
678
- await handleError(ctx, e);
955
+ spinner.fail("An error occurred while creating the project on Strapi Cloud.");
956
+ throw e;
679
957
  }
680
- };
681
- function notificationServiceFactory({ logger }) {
682
- return (url, token, cliConfig2) => {
683
- const CONN_TIMEOUT = Number(cliConfig2.notificationsConnectionTimeout);
684
- const es = new EventSource__default.default(url, {
685
- headers: {
686
- Authorization: `Bearer ${token}`
687
- }
688
- });
958
+ }
959
+ const action$4 = async (ctx) => {
960
+ const { logger } = ctx;
961
+ const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
962
+ const token = await getValidToken(ctx, promptLogin);
963
+ if (!token) {
964
+ return;
965
+ }
966
+ const cloudApi = await cloudApiFactory(ctx, token);
967
+ const { data: config } = await cloudApi.config();
968
+ const projectName = await getProjectNameFromPackageJson(ctx);
969
+ const defaultAnswersMapper = questionDefaultValuesMapper({
970
+ name: projectName,
971
+ nodeVersion: getProjectNodeVersionDefault
972
+ });
973
+ const questions = defaultAnswersMapper(config.projectCreation.questions);
974
+ const defaultValues = {
975
+ ...config.projectCreation.defaults,
976
+ ...getDefaultsFromQuestions(questions)
977
+ };
978
+ const projectAnswersDefaulted = fp.defaults(defaultValues);
979
+ const projectAnswers = await inquirer__default.default.prompt(questions);
980
+ const projectInput = projectAnswersDefaulted(projectAnswers);
981
+ try {
982
+ return await createProject$1(ctx, cloudApi, projectInput);
983
+ } catch (e) {
984
+ if (e instanceof axios.AxiosError && e.response?.status === 401) {
985
+ logger.warn("Oops! Your session has expired. Please log in again to retry.");
986
+ await eraseToken();
987
+ if (await promptLogin(ctx)) {
988
+ return await createProject$1(ctx, cloudApi, projectInput);
989
+ }
990
+ } else {
991
+ await handleError(ctx, e);
992
+ }
993
+ }
994
+ };
995
+ function notificationServiceFactory({ logger }) {
996
+ return (url, token, cliConfig2) => {
997
+ const CONN_TIMEOUT = Number(cliConfig2.notificationsConnectionTimeout);
998
+ const es = new EventSource__default.default(url, {
999
+ headers: {
1000
+ Authorization: `Bearer ${token}`
1001
+ }
1002
+ });
689
1003
  let timeoutId;
690
1004
  const resetTimeout = () => {
691
1005
  clearTimeout(timeoutId);
@@ -709,38 +1023,6 @@ function notificationServiceFactory({ logger }) {
709
1023
  };
710
1024
  };
711
1025
  }
712
- yup__namespace.object({
713
- name: yup__namespace.string().required(),
714
- exports: yup__namespace.lazy(
715
- (value) => yup__namespace.object(
716
- typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
717
- if (typeof value2 === "object") {
718
- acc[key] = yup__namespace.object({
719
- types: yup__namespace.string().optional(),
720
- source: yup__namespace.string().required(),
721
- module: yup__namespace.string().optional(),
722
- import: yup__namespace.string().required(),
723
- require: yup__namespace.string().required(),
724
- default: yup__namespace.string().required()
725
- }).noUnknown(true);
726
- } else {
727
- acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
728
- }
729
- return acc;
730
- }, {}) : void 0
731
- ).optional()
732
- )
733
- });
734
- const loadPkg = async ({ cwd, logger }) => {
735
- const pkgPath = await pkgUp__default.default({ cwd });
736
- if (!pkgPath) {
737
- throw new Error("Could not find a package.json in the current directory");
738
- }
739
- const buffer = await fs__default.default.readFile(pkgPath);
740
- const pkg = JSON.parse(buffer.toString());
741
- logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
742
- return pkg;
743
- };
744
1026
  const buildLogsServiceFactory = ({ logger }) => {
745
1027
  return async (url, token, cliConfig2) => {
746
1028
  const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
@@ -794,6 +1076,7 @@ const buildLogsServiceFactory = ({ logger }) => {
794
1076
  if (retries > MAX_RETRIES) {
795
1077
  spinner.fail("We were unable to connect to the server to get build logs at this time.");
796
1078
  es.close();
1079
+ clearExistingTimeout();
797
1080
  reject(new Error("Max retries reached"));
798
1081
  }
799
1082
  };
@@ -803,7 +1086,7 @@ const buildLogsServiceFactory = ({ logger }) => {
803
1086
  };
804
1087
  };
805
1088
  async function upload(ctx, project, token, maxProjectFileSize) {
806
- const cloudApi = await cloudApiFactory(token);
1089
+ const cloudApi = await cloudApiFactory(ctx, token);
807
1090
  try {
808
1091
  const storagePath = await getTmpStoragePath();
809
1092
  const projectFolder = path__namespace.default.resolve(process.cwd());
@@ -836,13 +1119,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
836
1119
  process.exit(1);
837
1120
  }
838
1121
  const tarFilePath = path__namespace.default.resolve(storagePath, compressedFilename);
839
- const fileStats = await fse__default.default.stat(tarFilePath);
1122
+ const fileStats = await fse__namespace.default.stat(tarFilePath);
840
1123
  if (fileStats.size > maxProjectFileSize) {
841
1124
  ctx.logger.log(
842
1125
  "Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
843
1126
  );
844
1127
  try {
845
- await fse__default.default.remove(tarFilePath);
1128
+ await fse__namespace.default.remove(tarFilePath);
846
1129
  } catch (e) {
847
1130
  ctx.logger.log("Unable to remove file: ", tarFilePath);
848
1131
  ctx.logger.debug(e);
@@ -868,20 +1151,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
868
1151
  return data.build_id;
869
1152
  } catch (e) {
870
1153
  progressBar.stop();
871
- if (e instanceof axios.AxiosError && e.response?.data) {
872
- if (e.response.status === 404) {
873
- ctx.logger.error(
874
- `The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
875
- );
876
- } else {
877
- ctx.logger.error(e.response.data);
878
- }
879
- } else {
880
- ctx.logger.error("An error occurred while deploying the project. Please try again later.");
881
- }
1154
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
882
1155
  ctx.logger.debug(e);
883
1156
  } finally {
884
- await fse__default.default.remove(tarFilePath);
1157
+ await fse__namespace.default.remove(tarFilePath);
885
1158
  }
886
1159
  process.exit(0);
887
1160
  } catch (e) {
@@ -894,7 +1167,7 @@ async function getProject(ctx) {
894
1167
  const { project } = await retrieve();
895
1168
  if (!project) {
896
1169
  try {
897
- return await action$3(ctx);
1170
+ return await action$4(ctx);
898
1171
  } catch (e) {
899
1172
  ctx.logger.error("An error occurred while deploying the project. Please try again later.");
900
1173
  ctx.logger.debug(e);
@@ -903,10 +1176,21 @@ async function getProject(ctx) {
903
1176
  }
904
1177
  return project;
905
1178
  }
906
- const action$2 = async (ctx) => {
1179
+ async function getConfig({
1180
+ ctx,
1181
+ cloudApiService
1182
+ }) {
1183
+ try {
1184
+ const { data: cliConfig2 } = await cloudApiService.config();
1185
+ return cliConfig2;
1186
+ } catch (e) {
1187
+ ctx.logger.debug("Failed to get cli config", e);
1188
+ return null;
1189
+ }
1190
+ }
1191
+ const action$3 = async (ctx) => {
907
1192
  const { getValidToken } = await tokenServiceFactory(ctx);
908
- const cloudApiService = await cloudApiFactory();
909
- const token = await getValidToken();
1193
+ const token = await getValidToken(ctx, promptLogin);
910
1194
  if (!token) {
911
1195
  return;
912
1196
  }
@@ -914,14 +1198,51 @@ const action$2 = async (ctx) => {
914
1198
  if (!project) {
915
1199
  return;
916
1200
  }
1201
+ const cloudApiService = await cloudApiFactory(ctx, token);
917
1202
  try {
918
- await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
1203
+ const {
1204
+ data: { data: projectData, metadata }
1205
+ } = await cloudApiService.getProject({ name: project.name });
1206
+ const isProjectSuspended = projectData.suspendedAt;
1207
+ if (isProjectSuspended) {
1208
+ ctx.logger.log(
1209
+ "\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
1210
+ );
1211
+ ctx.logger.log(chalk__default.default.underline(`${metadata.dashboardUrls.project}`));
1212
+ return;
1213
+ }
919
1214
  } catch (e) {
920
- ctx.logger.debug("Failed to track willDeploy", e);
1215
+ if (e instanceof axios.AxiosError && e.response?.data) {
1216
+ if (e.response.status === 404) {
1217
+ ctx.logger.warn(
1218
+ `The project associated with this folder does not exist in Strapi Cloud.
1219
+ Please link your local project to an existing Strapi Cloud project using the ${chalk__default.default.cyan(
1220
+ "link"
1221
+ )} command before deploying.`
1222
+ );
1223
+ } else {
1224
+ ctx.logger.error(e.response.data);
1225
+ }
1226
+ } else {
1227
+ ctx.logger.error(
1228
+ "An error occurred while retrieving the project's information. Please try again later."
1229
+ );
1230
+ }
1231
+ ctx.logger.debug(e);
1232
+ return;
921
1233
  }
1234
+ await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
1235
+ projectInternalName: project.name
1236
+ });
922
1237
  const notificationService = notificationServiceFactory(ctx);
923
1238
  const buildLogsService = buildLogsServiceFactory(ctx);
924
- const { data: cliConfig2 } = await cloudApiService.config();
1239
+ const cliConfig2 = await getConfig({ ctx, cloudApiService });
1240
+ if (!cliConfig2) {
1241
+ ctx.logger.error(
1242
+ "An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
1243
+ );
1244
+ return;
1245
+ }
925
1246
  let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
926
1247
  if (Number.isNaN(maxSize)) {
927
1248
  ctx.logger.debug(
@@ -943,10 +1264,11 @@ const action$2 = async (ctx) => {
943
1264
  chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
944
1265
  );
945
1266
  } catch (e) {
1267
+ ctx.logger.debug(e);
946
1268
  if (e instanceof Error) {
947
1269
  ctx.logger.error(e.message);
948
1270
  } else {
949
- throw e;
1271
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
950
1272
  }
951
1273
  }
952
1274
  };
@@ -977,185 +1299,175 @@ const runAction = (name2, action2) => (...args) => {
977
1299
  process.exit(1);
978
1300
  });
979
1301
  };
980
- const command$3 = ({ command: command2, ctx }) => {
981
- command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$2)(ctx));
1302
+ const command$5 = ({ command: command2, ctx }) => {
1303
+ command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$3)(ctx));
982
1304
  };
983
1305
  const deployProject = {
984
1306
  name: "deploy-project",
985
1307
  description: "Deploy a Strapi Cloud project",
986
- action: action$2,
987
- command: command$3
1308
+ action: action$3,
1309
+ command: command$5
988
1310
  };
989
- const openModule = import("open");
990
- const action$1 = async (ctx) => {
991
- const { logger } = ctx;
992
- const tokenService = await tokenServiceFactory(ctx);
993
- const existingToken = await tokenService.retrieveToken();
994
- const cloudApiService = await cloudApiFactory(existingToken || void 0);
995
- const trackFailedLogin = async () => {
996
- try {
997
- await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
998
- } catch (e) {
999
- logger.debug("Failed to track failed login", e);
1000
- }
1001
- };
1002
- if (existingToken) {
1003
- const isTokenValid = await tokenService.isTokenValid(existingToken);
1004
- if (isTokenValid) {
1005
- try {
1006
- const userInfo = await cloudApiService.getUserInfo();
1007
- const { email } = userInfo.data.data;
1008
- if (email) {
1009
- logger.log(`You are already logged into your account (${email}).`);
1010
- } else {
1011
- logger.log("You are already logged in.");
1012
- }
1013
- logger.log(
1014
- "To access your dashboard, please copy and paste the following URL into your web browser:"
1015
- );
1016
- logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
1017
- return true;
1018
- } catch (e) {
1019
- logger.debug("Failed to fetch user info", e);
1311
+ const QUIT_OPTION = "Quit";
1312
+ async function getExistingConfig(ctx) {
1313
+ try {
1314
+ return await retrieve();
1315
+ } catch (e) {
1316
+ ctx.logger.debug("Failed to get project config", e);
1317
+ ctx.logger.error("An error occurred while retrieving config data from your local project.");
1318
+ return null;
1319
+ }
1320
+ }
1321
+ async function promptForRelink(ctx, cloudApiService, existingConfig) {
1322
+ if (existingConfig && existingConfig.project) {
1323
+ const { shouldRelink } = await inquirer__default.default.prompt([
1324
+ {
1325
+ type: "confirm",
1326
+ name: "shouldRelink",
1327
+ message: `A project named ${chalk__default.default.cyan(
1328
+ existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
1329
+ )} is already linked to this local folder. Do you want to update the link?`,
1330
+ default: false
1020
1331
  }
1332
+ ]);
1333
+ if (!shouldRelink) {
1334
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1335
+ currentProjectName: existingConfig.project?.name
1336
+ });
1337
+ return false;
1021
1338
  }
1022
1339
  }
1023
- let cliConfig2;
1340
+ return true;
1341
+ }
1342
+ async function getProjectsList(ctx, cloudApiService, existingConfig) {
1343
+ const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
1024
1344
  try {
1025
- logger.info("🔌 Connecting to the Strapi Cloud API...");
1026
- const config = await cloudApiService.config();
1027
- cliConfig2 = config.data;
1345
+ const {
1346
+ data: { data: projectList }
1347
+ } = await cloudApiService.listLinkProjects();
1348
+ spinner.succeed();
1349
+ if (!Array.isArray(projectList)) {
1350
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1351
+ return null;
1352
+ }
1353
+ const projects = projectList.filter(
1354
+ (project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
1355
+ ).map((project) => {
1356
+ return {
1357
+ name: project.displayName,
1358
+ value: { name: project.name, displayName: project.displayName }
1359
+ };
1360
+ });
1361
+ if (projects.length === 0) {
1362
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1363
+ return null;
1364
+ }
1365
+ return projects;
1028
1366
  } catch (e) {
1029
- logger.error("🥲 Oops! Something went wrong while logging you in. Please try again.");
1030
- logger.debug(e);
1031
- return false;
1367
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1368
+ ctx.logger.debug("Failed to list projects", e);
1369
+ return null;
1032
1370
  }
1371
+ }
1372
+ async function getUserSelection(ctx, projects) {
1373
+ const { logger } = ctx;
1033
1374
  try {
1034
- await cloudApiService.track("willLoginAttempt", {});
1375
+ const answer = await inquirer__default.default.prompt([
1376
+ {
1377
+ type: "list",
1378
+ name: "linkProject",
1379
+ message: "Which project do you want to link?",
1380
+ choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
1381
+ }
1382
+ ]);
1383
+ if (!answer.linkProject) {
1384
+ return null;
1385
+ }
1386
+ return answer;
1035
1387
  } catch (e) {
1036
- logger.debug("Failed to track login attempt", e);
1388
+ logger.debug("Failed to get user input", e);
1389
+ logger.error("An error occurred while trying to get your input.");
1390
+ return null;
1037
1391
  }
1038
- logger.debug("🔐 Creating device authentication request...", {
1039
- client_id: cliConfig2.clientId,
1040
- scope: cliConfig2.scope,
1041
- audience: cliConfig2.audience
1042
- });
1043
- const deviceAuthResponse = await axios__default.default.post(cliConfig2.deviceCodeAuthUrl, {
1044
- client_id: cliConfig2.clientId,
1045
- scope: cliConfig2.scope,
1046
- audience: cliConfig2.audience
1047
- }).catch((e) => {
1048
- logger.error("There was an issue with the authentication process. Please try again.");
1049
- if (e.message) {
1050
- logger.debug(e.message, e);
1051
- } else {
1052
- logger.debug(e);
1053
- }
1054
- });
1055
- openModule.then((open) => {
1056
- open.default(deviceAuthResponse.data.verification_uri_complete).catch((e) => {
1057
- logger.error("We encountered an issue opening the browser. Please try again later.");
1058
- logger.debug(e.message, e);
1059
- });
1060
- });
1061
- logger.log("If a browser tab does not open automatically, please follow the next steps:");
1062
- logger.log(
1063
- `1. Open this url in your device: ${deviceAuthResponse.data.verification_uri_complete}`
1064
- );
1065
- logger.log(
1066
- `2. Enter the following code: ${deviceAuthResponse.data.user_code} and confirm to login.
1067
- `
1392
+ }
1393
+ const action$2 = async (ctx) => {
1394
+ const { getValidToken } = await tokenServiceFactory(ctx);
1395
+ const token = await getValidToken(ctx, promptLogin);
1396
+ const { logger } = ctx;
1397
+ if (!token) {
1398
+ return;
1399
+ }
1400
+ const cloudApiService = await cloudApiFactory(ctx, token);
1401
+ const existingConfig = await getExistingConfig(ctx);
1402
+ const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
1403
+ if (!shouldRelink) {
1404
+ return;
1405
+ }
1406
+ await trackEvent(ctx, cloudApiService, "willLinkProject", {});
1407
+ const projects = await getProjectsList(
1408
+ ctx,
1409
+ cloudApiService,
1410
+ existingConfig
1068
1411
  );
1069
- const tokenPayload = {
1070
- grant_type: "urn:ietf:params:oauth:grant-type:device_code",
1071
- device_code: deviceAuthResponse.data.device_code,
1072
- client_id: cliConfig2.clientId
1073
- };
1074
- let isAuthenticated = false;
1075
- const authenticate = async () => {
1076
- const spinner = logger.spinner("Waiting for authentication");
1077
- spinner.start();
1078
- const spinnerFail = () => spinner.fail("Authentication failed!");
1079
- while (!isAuthenticated) {
1080
- try {
1081
- const tokenResponse = await axios__default.default.post(cliConfig2.tokenUrl, tokenPayload);
1082
- const authTokenData = tokenResponse.data;
1083
- if (tokenResponse.status === 200) {
1084
- try {
1085
- logger.debug("🔐 Validating token...");
1086
- await tokenService.validateToken(authTokenData.id_token, cliConfig2.jwksUrl);
1087
- logger.debug("🔐 Token validation successful!");
1088
- } catch (e) {
1089
- logger.debug(e);
1090
- spinnerFail();
1091
- throw new Error("Unable to proceed: Token validation failed");
1092
- }
1093
- logger.debug("🔍 Fetching user information...");
1094
- const cloudApiServiceWithToken = await cloudApiFactory(authTokenData.access_token);
1095
- await cloudApiServiceWithToken.getUserInfo();
1096
- logger.debug("🔍 User information fetched successfully!");
1097
- try {
1098
- logger.debug("📝 Saving login information...");
1099
- await tokenService.saveToken(authTokenData.access_token);
1100
- logger.debug("📝 Login information saved successfully!");
1101
- isAuthenticated = true;
1102
- } catch (e) {
1103
- logger.error(
1104
- "There was a problem saving your login information. Please try logging in again."
1105
- );
1106
- logger.debug(e);
1107
- spinnerFail();
1108
- return false;
1109
- }
1110
- }
1111
- } catch (e) {
1112
- if (e.message === "Unable to proceed: Token validation failed") {
1113
- logger.error(
1114
- "There seems to be a problem with your login information. Please try logging in again."
1115
- );
1116
- spinnerFail();
1117
- await trackFailedLogin();
1118
- return false;
1119
- }
1120
- if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
1121
- logger.debug(e);
1122
- spinnerFail();
1123
- await trackFailedLogin();
1124
- return false;
1125
- }
1126
- await new Promise((resolve) => {
1127
- setTimeout(resolve, deviceAuthResponse.data.interval * 1e3);
1128
- });
1412
+ if (!projects) {
1413
+ return;
1414
+ }
1415
+ const answer = await getUserSelection(ctx, projects);
1416
+ if (!answer) {
1417
+ return;
1418
+ }
1419
+ try {
1420
+ const { confirmAction } = await inquirer__default.default.prompt([
1421
+ {
1422
+ type: "confirm",
1423
+ name: "confirmAction",
1424
+ message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
1425
+ default: false
1129
1426
  }
1427
+ ]);
1428
+ if (!confirmAction) {
1429
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1430
+ cancelledProjectName: answer.linkProject.name,
1431
+ currentProjectName: existingConfig ? existingConfig.project?.name : null
1432
+ });
1433
+ return;
1130
1434
  }
1131
- spinner.succeed("Authentication successful!");
1132
- logger.log("You are now logged into Strapi Cloud.");
1133
- logger.log(
1134
- "To access your dashboard, please copy and paste the following URL into your web browser:"
1135
- );
1136
- logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
1137
- try {
1138
- await cloudApiService.track("didLogin", { loginMethod: "cli" });
1139
- } catch (e) {
1140
- logger.debug("Failed to track login", e);
1141
- }
1142
- };
1143
- await authenticate();
1144
- return isAuthenticated;
1435
+ await save({ project: answer.linkProject });
1436
+ logger.log(`Project ${chalk__default.default.cyan(answer.linkProject.displayName)} linked successfully.`);
1437
+ await trackEvent(ctx, cloudApiService, "didLinkProject", {
1438
+ projectInternalName: answer.linkProject
1439
+ });
1440
+ } catch (e) {
1441
+ logger.debug("Failed to link project", e);
1442
+ logger.error("An error occurred while linking the project.");
1443
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1444
+ projectInternalName: answer.linkProject
1445
+ });
1446
+ }
1145
1447
  };
1146
- const command$2 = ({ command: command2, ctx }) => {
1448
+ const command$4 = ({ command: command2, ctx }) => {
1449
+ command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$2)(ctx));
1450
+ };
1451
+ const link = {
1452
+ name: "link-project",
1453
+ description: "Link a local directory to a Strapi Cloud project",
1454
+ action: action$2,
1455
+ command: command$4
1456
+ };
1457
+ const command$3 = ({ command: command2, ctx }) => {
1147
1458
  command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
1148
1459
  "after",
1149
1460
  "\nAfter running this command, you will be prompted to enter your authentication information."
1150
- ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", action$1)(ctx));
1461
+ ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
1151
1462
  };
1152
1463
  const login = {
1153
1464
  name: "login",
1154
1465
  description: "Strapi Cloud Login",
1155
- action: action$1,
1156
- command: command$2
1466
+ action: loginAction,
1467
+ command: command$3
1157
1468
  };
1158
- const action = async (ctx) => {
1469
+ const openModule = import("open");
1470
+ const action$1 = async (ctx) => {
1159
1471
  const { logger } = ctx;
1160
1472
  const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
1161
1473
  const token = await retrieveToken();
@@ -1163,9 +1475,21 @@ const action = async (ctx) => {
1163
1475
  logger.log("You're already logged out.");
1164
1476
  return;
1165
1477
  }
1166
- const cloudApiService = await cloudApiFactory(token);
1478
+ const cloudApiService = await cloudApiFactory(ctx, token);
1479
+ const config = await cloudApiService.config();
1480
+ const cliConfig2 = config.data;
1167
1481
  try {
1168
1482
  await eraseToken();
1483
+ openModule.then((open) => {
1484
+ open.default(
1485
+ `${cliConfig2.baseUrl}/oidc/logout?client_id=${encodeURIComponent(
1486
+ cliConfig2.clientId
1487
+ )}&logout_hint=${encodeURIComponent(token)}
1488
+ `
1489
+ ).catch((e) => {
1490
+ logger.debug(e.message, e);
1491
+ });
1492
+ });
1169
1493
  logger.log(
1170
1494
  "🔌 You have been logged out from the CLI. If you are on a shared computer, please make sure to log out from the Strapi Cloud Dashboard as well."
1171
1495
  );
@@ -1173,37 +1497,64 @@ const action = async (ctx) => {
1173
1497
  logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
1174
1498
  logger.debug(e);
1175
1499
  }
1176
- try {
1177
- await cloudApiService.track("didLogout", { loginMethod: "cli" });
1178
- } catch (e) {
1179
- logger.debug("Failed to track logout event", e);
1180
- }
1500
+ await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
1181
1501
  };
1182
- const command$1 = ({ command: command2, ctx }) => {
1183
- command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action)(ctx));
1502
+ const command$2 = ({ command: command2, ctx }) => {
1503
+ command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$1)(ctx));
1184
1504
  };
1185
1505
  const logout = {
1186
1506
  name: "logout",
1187
1507
  description: "Strapi Cloud Logout",
1188
- action,
1189
- command: command$1
1508
+ action: action$1,
1509
+ command: command$2
1190
1510
  };
1191
- const command = ({ command: command2, ctx }) => {
1192
- command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$3)(ctx));
1511
+ const command$1 = ({ command: command2, ctx }) => {
1512
+ command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$4)(ctx));
1193
1513
  };
1194
1514
  const createProject = {
1195
1515
  name: "create-project",
1196
1516
  description: "Create a new project",
1197
- action: action$3,
1517
+ action: action$4,
1518
+ command: command$1
1519
+ };
1520
+ const action = async (ctx) => {
1521
+ const { getValidToken } = await tokenServiceFactory(ctx);
1522
+ const token = await getValidToken(ctx, promptLogin);
1523
+ const { logger } = ctx;
1524
+ if (!token) {
1525
+ return;
1526
+ }
1527
+ const cloudApiService = await cloudApiFactory(ctx, token);
1528
+ const spinner = logger.spinner("Fetching your projects...").start();
1529
+ try {
1530
+ const {
1531
+ data: { data: projectList }
1532
+ } = await cloudApiService.listProjects();
1533
+ spinner.succeed();
1534
+ logger.log(projectList);
1535
+ } catch (e) {
1536
+ ctx.logger.debug("Failed to list projects", e);
1537
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1538
+ }
1539
+ };
1540
+ const command = ({ command: command2, ctx }) => {
1541
+ command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action)(ctx));
1542
+ };
1543
+ const listProjects = {
1544
+ name: "list-projects",
1545
+ description: "List Strapi Cloud projects",
1546
+ action,
1198
1547
  command
1199
1548
  };
1200
1549
  const cli = {
1201
1550
  deployProject,
1551
+ link,
1202
1552
  login,
1203
1553
  logout,
1204
- createProject
1554
+ createProject,
1555
+ listProjects
1205
1556
  };
1206
- const cloudCommands = [deployProject, login, logout];
1557
+ const cloudCommands = [deployProject, link, login, logout, listProjects];
1207
1558
  async function initCloudCLIConfig() {
1208
1559
  const localConfig = await getLocalConfig();
1209
1560
  if (!localConfig.deviceId) {