@moonbase.sh/licensing 1.0.6 → 1.0.11

package/dist/index.cjs

@@ -74,6 +74,8 @@ var licenseSchema = import_zod.z.object({
   trial: import_zod.z.boolean(),
   activationMethod: import_zod.z.nativeEnum(ActivationMethod),
   product: productSchema,
+  ownedSubProductIds: import_zod.z.array(import_zod.z.string()).default([]),
+  subscriptionId: import_zod.z.string().nullish(),
   issuedAt: import_zod.z.coerce.date(),
   issuedTo: userSchema,
   expiresAt: import_zod.z.coerce.date().nullish(),
@@ -127,6 +129,22 @@ var LicenseClient = class {
     if (response.status === 204 || response.status === 404) return null;
     return await this.handleLicenseResponse(response);
   }
+  async requestTrial() {
+    const content = {
+      deviceName: await this.deviceIdResolver.resolveDeviceName(),
+      deviceSignature: await this.deviceIdResolver.resolveDeviceId()
+    };
+    const response = await (0, import_cross_fetch.default)(this.configuration.endpoint + `/api/client/trials/${this.configuration.productId}/request?format=JWT`, {
+      ...defaultFetchOptions,
+      method: "POST",
+      headers: {
+        ...defaultFetchOptions.headers,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(content)
+    });
+    return await this.handleLicenseResponse(response);
+  }
   async validateLicense(license) {
     const response = await (0, import_cross_fetch.default)(this.configuration.endpoint + `/api/client/licenses/${this.configuration.productId}/validate?format=JWT`, {
       ...defaultFetchOptions,
@@ -291,6 +309,8 @@ var licenseClaimsSchema = import_zod2.z.object({
   ["p:id" /* ProductId */]: import_zod2.z.string(),
   ["p:name" /* ProductName */]: import_zod2.z.string(),
   ["p:rel" /* ProductReleaseVersion */]: import_zod2.z.string().nullish(),
+  ["sp:owned" /* OwnedSubProducts */]: import_zod2.z.string().nullish().transform((v) => v ? v.split(",") : []),
+  ["s:id" /* SubscriptionId */]: import_zod2.z.string().nullish(),
   ["u:id" /* UserId */]: import_zod2.z.string(),
   ["u:name" /* UserName */]: import_zod2.z.string(),
   ["u:email" /* UserEmail */]: import_zod2.z.string()
@@ -326,7 +346,7 @@ var LicenseValidator = class {
         issuer: this.configuration.accountId,
         audience: this.configuration.productId
       }, (err, decoded) => {
-        var _a;
+        var _a, _b;
         if (err) {
           reject(new MoonbaseError(
             "Could not validate license",
@@ -355,6 +375,8 @@ var LicenseValidator = class {
               name: claims["p:name" /* ProductName */],
               currentReleaseVersion: (_a = claims["p:rel" /* ProductReleaseVersion */]) != null ? _a : void 0
             },
+            ownedSubProductIds: claims["sp:owned" /* OwnedSubProducts */],
+            subscriptionId: (_b = claims["s:id" /* SubscriptionId */]) != null ? _b : void 0,
             issuedTo: {
               id: claims["u:id" /* UserId */],
               name: claims["u:name" /* UserName */],

package/dist/index.d.cts

@@ -65,6 +65,8 @@ declare const licenseSchema: z.ZodObject<{
         name: string;
         currentReleaseVersion?: string | null | undefined;
     }>;
+    ownedSubProductIds: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    subscriptionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     issuedAt: z.ZodDate;
     issuedTo: z.ZodObject<{
         id: z.ZodString;
@@ -91,6 +93,7 @@ declare const licenseSchema: z.ZodObject<{
         name: string;
         currentReleaseVersion?: string | null | undefined;
     };
+    ownedSubProductIds: string[];
     issuedAt: Date;
     issuedTo: {
         id: string;
@@ -99,6 +102,7 @@ declare const licenseSchema: z.ZodObject<{
     };
     validatedAt: Date;
     token: string;
+    subscriptionId?: string | null | undefined;
     expiresAt?: Date | null | undefined;
 }, {
     id: string;
@@ -117,6 +121,8 @@ declare const licenseSchema: z.ZodObject<{
     };
     validatedAt: Date;
     token: string;
+    ownedSubProductIds?: string[] | undefined;
+    subscriptionId?: string | null | undefined;
     expiresAt?: Date | null | undefined;
 }>;
 
@@ -159,6 +165,15 @@ interface ILicenseClient {
      * @returns A license if the request has been fulfilled, else null
      */
     getRequestedActivation(request: ActivationRequestResponse): Promise<License | null>;
+    /**
+     * Requests a trial license for the product.
+     * This can only be done once per product per device, and skips
+     * the browser activation process. This currently requires that
+     * the product allows anonymous trials, since there is no authentication.
+     *
+     * @returns The allocated trial license, throws if the trial license cannot be allocated (e.g. user already had a trial) or if the request failed
+     */
+    requestTrial(): Promise<License>;
     /**
      * Checks if the given license is still valid, not revoked
      * and returns an updated license if still active.
@@ -194,6 +209,7 @@ declare class LicenseClient implements ILicenseClient {
     constructor(configuration: MoonbaseConfiguration, deviceIdResolver: IDeviceIdResolver, licenseValidator: ILicenseValidator);
     requestActivation(): Promise<ActivationRequestResponse>;
     getRequestedActivation(request: ActivationRequestResponse): Promise<License | null>;
+    requestTrial(): Promise<License>;
     validateLicense(license: License): Promise<License>;
     validateRawLicense(rawLicense: Buffer): Promise<License>;
     revokeLicense(license: License): Promise<void>;

package/dist/index.d.ts

@@ -65,6 +65,8 @@ declare const licenseSchema: z.ZodObject<{
         name: string;
         currentReleaseVersion?: string | null | undefined;
     }>;
+    ownedSubProductIds: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    subscriptionId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     issuedAt: z.ZodDate;
     issuedTo: z.ZodObject<{
         id: z.ZodString;
@@ -91,6 +93,7 @@ declare const licenseSchema: z.ZodObject<{
         name: string;
         currentReleaseVersion?: string | null | undefined;
     };
+    ownedSubProductIds: string[];
     issuedAt: Date;
     issuedTo: {
         id: string;
@@ -99,6 +102,7 @@ declare const licenseSchema: z.ZodObject<{
     };
     validatedAt: Date;
     token: string;
+    subscriptionId?: string | null | undefined;
     expiresAt?: Date | null | undefined;
 }, {
     id: string;
@@ -117,6 +121,8 @@ declare const licenseSchema: z.ZodObject<{
     };
     validatedAt: Date;
     token: string;
+    ownedSubProductIds?: string[] | undefined;
+    subscriptionId?: string | null | undefined;
     expiresAt?: Date | null | undefined;
 }>;
 
@@ -159,6 +165,15 @@ interface ILicenseClient {
      * @returns A license if the request has been fulfilled, else null
      */
     getRequestedActivation(request: ActivationRequestResponse): Promise<License | null>;
+    /**
+     * Requests a trial license for the product.
+     * This can only be done once per product per device, and skips
+     * the browser activation process. This currently requires that
+     * the product allows anonymous trials, since there is no authentication.
+     *
+     * @returns The allocated trial license, throws if the trial license cannot be allocated (e.g. user already had a trial) or if the request failed
+     */
+    requestTrial(): Promise<License>;
     /**
      * Checks if the given license is still valid, not revoked
      * and returns an updated license if still active.
@@ -194,6 +209,7 @@ declare class LicenseClient implements ILicenseClient {
     constructor(configuration: MoonbaseConfiguration, deviceIdResolver: IDeviceIdResolver, licenseValidator: ILicenseValidator);
     requestActivation(): Promise<ActivationRequestResponse>;
     getRequestedActivation(request: ActivationRequestResponse): Promise<License | null>;
+    requestTrial(): Promise<License>;
     validateLicense(license: License): Promise<License>;
     validateRawLicense(rawLicense: Buffer): Promise<License>;
     revokeLicense(license: License): Promise<void>;

package/dist/index.js

@@ -30,6 +30,8 @@ var licenseSchema = z.object({
   trial: z.boolean(),
   activationMethod: z.nativeEnum(ActivationMethod),
   product: productSchema,
+  ownedSubProductIds: z.array(z.string()).default([]),
+  subscriptionId: z.string().nullish(),
   issuedAt: z.coerce.date(),
   issuedTo: userSchema,
   expiresAt: z.coerce.date().nullish(),
@@ -83,6 +85,22 @@ var LicenseClient = class {
     if (response.status === 204 || response.status === 404) return null;
     return await this.handleLicenseResponse(response);
   }
+  async requestTrial() {
+    const content = {
+      deviceName: await this.deviceIdResolver.resolveDeviceName(),
+      deviceSignature: await this.deviceIdResolver.resolveDeviceId()
+    };
+    const response = await fetch(this.configuration.endpoint + `/api/client/trials/${this.configuration.productId}/request?format=JWT`, {
+      ...defaultFetchOptions,
+      method: "POST",
+      headers: {
+        ...defaultFetchOptions.headers,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(content)
+    });
+    return await this.handleLicenseResponse(response);
+  }
   async validateLicense(license) {
     const response = await fetch(this.configuration.endpoint + `/api/client/licenses/${this.configuration.productId}/validate?format=JWT`, {
       ...defaultFetchOptions,
@@ -247,6 +265,8 @@ var licenseClaimsSchema = z2.object({
   ["p:id" /* ProductId */]: z2.string(),
   ["p:name" /* ProductName */]: z2.string(),
   ["p:rel" /* ProductReleaseVersion */]: z2.string().nullish(),
+  ["sp:owned" /* OwnedSubProducts */]: z2.string().nullish().transform((v) => v ? v.split(",") : []),
+  ["s:id" /* SubscriptionId */]: z2.string().nullish(),
   ["u:id" /* UserId */]: z2.string(),
   ["u:name" /* UserName */]: z2.string(),
   ["u:email" /* UserEmail */]: z2.string()
@@ -282,7 +302,7 @@ var LicenseValidator = class {
         issuer: this.configuration.accountId,
         audience: this.configuration.productId
       }, (err, decoded) => {
-        var _a;
+        var _a, _b;
         if (err) {
           reject(new MoonbaseError(
             "Could not validate license",
@@ -311,6 +331,8 @@ var LicenseValidator = class {
               name: claims["p:name" /* ProductName */],
               currentReleaseVersion: (_a = claims["p:rel" /* ProductReleaseVersion */]) != null ? _a : void 0
             },
+            ownedSubProductIds: claims["sp:owned" /* OwnedSubProducts */],
+            subscriptionId: (_b = claims["s:id" /* SubscriptionId */]) != null ? _b : void 0,
             issuedTo: {
               id: claims["u:id" /* UserId */],
               name: claims["u:name" /* UserName */],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/licensing",
   "type": "module",
-  "version": "1.0.6",
+  "version": "1.0.11",
   "description": "Package to add sotftware licensing using Moonbase.sh to your node.js apps",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",