casualos 3.4.0-alpha.13932534773 → 3.4.0-alpha.14070378151

package/dist/cli.js

@@ -98073,7 +98073,7 @@ var trace = TraceAPI.getInstance();
 function hashLowEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   );
   return tracer.startActiveSpan(
     "hashLowEntropyPasswordWithSalt",
@@ -98091,7 +98091,7 @@ function hashLowEntropyPasswordWithSalt2(password, salt) {
 function hashHighEntropyPasswordWithSalt2(password, salt) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   );
   return tracer.startActiveSpan(
     "hashHighEntropyPasswordWithSalt",
@@ -98109,7 +98109,7 @@ function hashHighEntropyPasswordWithSalt2(password, salt) {
 function verifyPasswordAgainstHashes2(password, salt, hashes) {
   const tracer = trace.getTracer(
     "InstrumentedHashHelpers",
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   );
   return tracer.startActiveSpan(
     "verifyPasswordAgainstHashes",
@@ -105061,7 +105061,7 @@ var import_semantic_conventions = __toESM(require_src3());
 function traced(tracerName, options = {}, metricOptions = {}) {
   const tracer = trace.getTracer(
     tracerName,
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   );
   return function(target, propertyKey, descriptor) {
     const originalMethod = descriptor.value;
@@ -105139,7 +105139,7 @@ function getHistogram(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   ).createHistogram(meter.name, meter.options);
 }
 function getCounter(meter) {
@@ -105148,7 +105148,7 @@ function getCounter(meter) {
   }
   return metrics.getMeter(
     meter.meter,
-    false ? void 0 : "v3.4.0-alpha.13932534773"
+    false ? void 0 : "v3.4.0-alpha.14070378151"
   ).createCounter(meter.name, meter.options);
 }
 function traceHttpResponse(options = {}) {
@@ -108208,6 +108208,7 @@ var RecordsController = class {
     this._metrics = config2.metrics;
     this._config = config2.config;
     this._messenger = config2.messenger;
+    this._privo = config2.privo;
   }
   async createRecord(request2) {
     try {
@@ -109242,10 +109243,43 @@ var RecordsController = class {
       } else {
         role = userAssignment.role;
       }
+      const resultMembers = await Promise.all(
+        members.map(async (m2) => {
+          if (this._privo && m2.user.privoServiceId) {
+            const result = await this._privo.getUserInfo(
+              m2.user.privoServiceId
+            );
+            return {
+              studioId: m2.studioId,
+              userId: m2.userId,
+              isPrimaryContact: m2.isPrimaryContact,
+              role: m2.role,
+              user: {
+                id: m2.user.id,
+                name: result.givenName,
+                displayName: result.displayName
+              }
+            };
+          } else {
+            return {
+              studioId: m2.studioId,
+              userId: m2.userId,
+              isPrimaryContact: m2.isPrimaryContact,
+              role: m2.role,
+              user: {
+                id: m2.user.id,
+                name: m2.user.name,
+                email: m2.user.email,
+                phoneNumber: m2.user.phoneNumber
+              }
+            };
+          }
+        })
+      );
       if (role === "admin") {
         return {
           success: true,
-          members: members.map((m2) => ({
+          members: resultMembers.map((m2) => ({
             studioId: m2.studioId,
             userId: m2.userId,
             isPrimaryContact: m2.isPrimaryContact,
@@ -109254,21 +109288,23 @@ var RecordsController = class {
               id: m2.user.id,
               name: m2.user.name,
               email: m2.user.email,
-              phoneNumber: m2.user.phoneNumber
+              phoneNumber: m2.user.phoneNumber,
+              displayName: m2.user.displayName
             }
           }))
         };
       }
       return {
         success: true,
-        members: members.map((m2) => ({
+        members: resultMembers.map((m2) => ({
           studioId: m2.studioId,
           userId: m2.userId,
           isPrimaryContact: m2.isPrimaryContact,
           role: m2.role,
           user: {
             id: m2.user.id,
-            name: m2.user.name
+            name: m2.user.name,
+            displayName: m2.user.displayName
           }
         }))
       };
@@ -109318,19 +109354,43 @@ var RecordsController = class {
           request2.addedEmail ?? request2.addedPhoneNumber,
           request2.addedEmail ? "email" : "phone"
         );
-        if (!addedUser) {
+        if (addedUser) {
+          addedUserId = addedUser.id;
+        }
+      }
+      if (!addedUserId && this._privo && (request2.addedEmail || request2.addedPhoneNumber || request2.addedDisplayName)) {
+        const privoServiceId = await this._privo.lookupServiceId({
+          displayName: request2.addedDisplayName ?? void 0,
+          email: request2.addedEmail ?? void 0,
+          phoneNumber: request2.addedPhoneNumber ?? void 0
+        });
+        if (privoServiceId) {
+          const user = await this._auth.findUserByPrivoServiceId(
+            privoServiceId
+          );
+          if (user) {
+            addedUserId = user.id;
+          }
+        }
+      }
+      if (!addedUserId) {
+        if (this._privo && !request2.addedEmail && !request2.addedPhoneNumber && !request2.addedUserId && !request2.addedDisplayName) {
           return {
             success: false,
-            errorCode: "user_not_found",
-            errorMessage: "The user was not able to be found."
+            errorCode: "unacceptable_request",
+            errorMessage: "You must provide a display name, email, phone number, or user ID to add a studio member."
+          };
+        } else if (!this._privo && !request2.addedEmail && !request2.addedPhoneNumber && !request2.addedUserId) {
+          return {
+            success: false,
+            errorCode: "unacceptable_request",
+            errorMessage: "You must provide an email, phone number, or user ID to add a studio member."
           };
         }
-        addedUserId = addedUser.id;
-      } else {
         return {
           success: false,
-          errorCode: "unacceptable_request",
-          errorMessage: "You must provide an email, phone number, or user ID to add a studio member."
+          errorCode: "user_not_found",
+          errorMessage: "The user was not able to be found."
         };
       }
       await this._store.addStudioAssignment({
@@ -117168,7 +117228,7 @@ var RecordsServer = class {
     this._notificationsController = notificationsController;
     this._tracer = trace.getTracer(
       "RecordsServer",
-      false ? void 0 : "v3.4.0-alpha.13932534773"
+      false ? void 0 : "v3.4.0-alpha.14070378151"
     );
     this._procedures = this._createProcedures();
     this._setupRoutes();
@@ -119134,6 +119194,10 @@ var RecordsServer = class {
             invalid_type_error: "addedPhoneNumber must be a string.",
             required_error: "addedPhoneNumber is required."
           }).nonempty("addedPhoneNumber must not be empty").optional(),
+          addedDisplayName: z.string({
+            invalid_type_error: "addedDisplayName must be a string.",
+            required_error: "addedDisplayName is required."
+          }).nonempty("addedDisplayName must not be empty").optional(),
           role: z.union([
             z.literal("admin"),
             z.literal("member")
@@ -119145,6 +119209,7 @@ var RecordsServer = class {
           addedUserId,
           addedEmail,
           addedPhoneNumber,
+          addedDisplayName,
           role
         }, context) => {
           const sessionKeyValidation = await this._validateSessionKey(context.sessionKey);
@@ -119160,7 +119225,8 @@ var RecordsServer = class {
             role,
             addedUserId,
             addedEmail,
-            addedPhoneNumber
+            addedPhoneNumber,
+            addedDisplayName
           });
           return result;
         }
@@ -119502,8 +119568,8 @@ var RecordsServer = class {
         return {
           success: true,
           ...metadata,
-          version: true ? "v3.4.0-alpha.13932534773" : void 0,
-          versionHash: true ? "c29ac410999d28bc7ef0b3df5cd1c9dc183e07ad" : void 0
+          version: true ? "v3.4.0-alpha.14070378151" : void 0,
+          versionHash: true ? "92e0eca4c5e780d97a3c6af86db6390f517bdc90" : void 0
         };
       })
     };
@@ -147081,7 +147147,7 @@ var config = new Conf({
   projectName: "casualos-cli"
 });
 var program2 = new Command();
-program2.name("casualos").description("A CLI for CasualOS").version("v3.4.0-alpha.13932534773").option(
+program2.name("casualos").description("A CLI for CasualOS").version("v3.4.0-alpha.14070378151").option(
   "-e, --endpoint <url>",
   "The endpoint to use for queries. Can be used to override the current endpoint."
 );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "casualos",
-    "version": "3.4.0-alpha.13932534773",
+    "version": "3.4.0-alpha.14070378151",
     "description": "Command line interface for CasualOS.",
     "main": "./dist/index.js",
     "types": "index.d.ts",
@@ -35,8 +35,8 @@
         "access": "public"
     },
     "dependencies": {
-        "@casual-simulation/aux-common": "^3.4.0-alpha.13932534773",
-        "@casual-simulation/aux-records": "^3.4.0-alpha.13932534773",
+        "@casual-simulation/aux-common": "^3.4.0-alpha.14070378151",
+        "@casual-simulation/aux-records": "^3.4.0-alpha.14070378151",
         "@octokit/app": "^15.1.0",
         "@octokit/auth-oauth-device": "^7.1.1",
         "@octokit/core": "^6.1.2",
@@ -63,5 +63,5 @@
         "**/*.def",
         "templates/**"
     ],
-    "gitHead": "c29ac410999d28bc7ef0b3df5cd1c9dc183e07ad"
+    "gitHead": "92e0eca4c5e780d97a3c6af86db6390f517bdc90"
 }