@pronto-tools-and-more/pronto 3.16.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/pronto",
-  "version": "3.16.0",
+  "version": "4.0.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -13,10 +13,10 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@pronto-tools-and-more/file-watcher": "3.16.0",
-    "@pronto-tools-and-more/files": "3.16.0",
-    "@pronto-tools-and-more/network-process": "3.16.0",
-    "@pronto-tools-and-more/sass-compiler": "3.16.0",
+    "@pronto-tools-and-more/file-watcher": "4.0.0",
+    "@pronto-tools-and-more/files": "4.0.0",
+    "@pronto-tools-and-more/network-process": "4.0.0",
+    "@pronto-tools-and-more/sass-compiler": "4.0.0",
     "@lvce-editor/assert": "^1.2.0",
     "@lvce-editor/ipc": "^9.3.0",
     "@lvce-editor/json-rpc": "^1.3.0",

package/src/parts/Config/Config.js

@@ -31,7 +31,8 @@ export const platform = config.platform || defaultPlatform;
 
 // TODO use direct backend url
 export const loginUrl =
-  config.loginUrl || `https://builder.purplemanager.com/api/user/login`;
+  config.loginUrl ||
+  `https://identity.purplemanager.com/realms/purple/protocol/openid-connect/token`;
 
 export const listVersionsUrl =
   config.listVersionsUrl || "https://builder.purplemanager.com/api/versions";

package/src/parts/GetSessionId/GetSessionId.js

@@ -0,0 +1,16 @@
+import * as Login from "../Login/Login.js";
+
+export const getSessionId = async ({ loginUrl, userEmail, userPassword }) => {
+  const result = await Login.login({
+    loginUrl,
+    userEmail,
+    userPassword,
+  });
+  if (result.access_token) {
+    return result.access_token;
+  }
+  if (result.sessionID) {
+    return result.sessionID;
+  }
+  throw new Error("failed to get session id");
+};

package/src/parts/PullCode/PullCode.js

@@ -5,8 +5,8 @@ import * as Config from "../Config/Config.js";
 import * as Cwd from "../Cwd/Cwd.js";
 import * as DownloadZipFile from "../DownloadZipFile/DownloadZipFile.js";
 import * as ExtractZip from "../ExtractZip/ExtractZip.js";
+import * as GetSessionId from "../GetSessionId/GetSessionId.js";
 import * as ListContentZipFiles from "../ListContentZipFiles/ListContentZipFiles.js";
-import * as Login from "../Login/Login.js";
 import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
 
 export const pullCode = async () => {
@@ -23,12 +23,11 @@ export const pullCode = async () => {
     const outDir = join(Cwd.cwd, ".tmp", "update");
     const src = join(Cwd.cwd, "src");
     const oldSrc = join(Cwd.cwd, ".tmp", "old-src");
-    const sessionInfo = await Login.login({
+    const sessionId = await GetSessionId.getSessionId({
       loginUrl,
       userEmail,
       userPassword,
     });
-    const sessionId = sessionInfo.sessionID;
     const zipFile = await ListContentZipFiles.listContentZipFiles({
       listResourcesUrl,
       sessionId,

package/src/parts/PushCode/PushCode.js

@@ -3,8 +3,8 @@ import { join } from "node:path";
 import * as Config from "../Config/Config.js";
 import * as CreateZip from "../CreateZip/CreateZip.js";
 import * as Cwd from "../Cwd/Cwd.js";
+import * as GetSessionId from "../GetSessionId/GetSessionId.js";
 import * as GetZipUploadMessage from "../GetZipUploadMessage/GetZipUploadMessage.js";
-import * as Login from "../Login/Login.js";
 import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
 import * as UploadZip from "../UploadZip/UploadZip.js";
 
@@ -27,12 +27,11 @@ export const pushCode = async () => {
     }
     const outFile = join(Cwd.cwd, ".tmp", "upload.zip");
     const src = join(Cwd.cwd, "src");
-    const sessionInfo = await Login.login({
+    const sessionId = await GetSessionId.getSessionId({
       loginUrl,
       userEmail,
       userPassword,
     });
-    const sessionId = sessionInfo.sessionID;
     const message = await GetZipUploadMessage.getZipUploadMessage();
 
     await CreateZip.createZip({

package/src/parts/Upgrade/Upgrade.js

@@ -5,8 +5,8 @@ import * as Cwd from "../Cwd/Cwd.js";
 import * as DiffSimple from "../DiffSimple/DiffSimple.js";
 import * as DownloadDiffFiles from "../DownloadDiffFiles/DownloadDiffFiles.js";
 import * as GetLatestStableVersion from "../GetLatestStableVersion/GetLatestStableVersion.js";
+import * as GetSessionId from "../GetSessionId/GetSessionId.js";
 import * as ListExperienceVersions from "../ListExperienceVersions/ListExperienceVersions.js";
-import * as Login from "../Login/Login.js";
 import * as MakeUpgradeRequest from "../MakeUpgradeRequest/MakeUpgradeRequest.js";
 import * as NetworkProcess from "../NetworkProcess/NetworkProcess.js";
 import * as PullWorkingCopy from "../PullWorkingCopy/PullWorkingCopy.js";
@@ -25,7 +25,7 @@ export const upgrade = async () => {
       pullWorkingCopyUrl,
     } = Config;
     const src = join(Cwd.cwd, "src");
-    const sessionInfo = await Login.login({
+    const sessionInfo = await GetSessionId.getSessionId({
       loginUrl,
       userEmail,
       userPassword,