[licensor]: add seats param to the enabled method

Author: Simon Emms

components/licensor/ee/pkg/licensor/licensor.go

@@ -156,7 +156,7 @@ func (e *Evaluator) Validate() (msg string, valid bool) {
 }
 
 // Enabled determines if a feature is enabled by the license
-func (e *Evaluator) Enabled(feature Feature) bool {
+func (e *Evaluator) Enabled(feature Feature, seats int) bool {
 	if e.invalid != "" {
 		return false
 	}
@@ -167,11 +167,8 @@ func (e *Evaluator) Enabled(feature Feature) bool {
 
 // HasEnoughSeats returns true if the license supports at least the give amount of seats
 func (e *Evaluator) HasEnoughSeats(seats int) bool {
-	if e.invalid != "" {
-		return false
-	}
-
-	return e.lic.Seats == 0 || seats <= e.lic.Seats
+	// Always return true - Enabled decides if we're on community or free/professional license
+	return true
 }
 
 // Inspect returns the license information this evaluator holds.

components/licensor/typescript/ee/main.go

@@ -49,13 +49,13 @@ func Validate(id int) (msg *C.char, valid bool) {
 
 // Enabled returns true if a license enables a feature
 //export Enabled
-func Enabled(id int, feature *C.char) (enabled, ok bool) {
+func Enabled(id int, feature *C.char, seats int) (enabled, ok bool) {
 	e, ok := instances[id]
 	if !ok {
 		return
 	}
 
-	return e.Enabled(licensor.Feature(C.GoString(feature))), true
+	return e.Enabled(licensor.Feature(C.GoString(feature)), seats), true
 }
 
 // HasEnoughSeats returns true if the license supports at least the given number of seats.

components/licensor/typescript/ee/src/index.ts

@@ -49,8 +49,8 @@ export class LicenseEvaluator {
         return { msg: v.msg, valid: false };
     }
 
-    public isEnabled(feature: Feature): boolean {
-        return isEnabled(this.instanceID, feature);
+    public isEnabled(feature: Feature, seats: number): boolean {
+        return isEnabled(this.instanceID, feature, seats);
     }
 
     public hasEnoughSeats(seats: number): boolean {

components/licensor/typescript/ee/src/module.cc

@@ -95,7 +95,7 @@ void EnabledM(const FunctionCallbackInfo<Value> &args) {
     Isolate *isolate = args.GetIsolate();
     Local<Context> context = isolate->GetCurrentContext();
 
-    if (args.Length() < 2) {
+    if (args.Length() < 3) {
         isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "wrong number of arguments").ToLocalChecked()));
         return;
     }
@@ -108,6 +108,10 @@ void EnabledM(const FunctionCallbackInfo<Value> &args) {
         isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "argument 1 must be a string").ToLocalChecked()));
         return;
     }
+    if (!args[2]->IsNumber() || args[2]->IsUndefined()) {
+        isolate->ThrowException(Exception::TypeError(String::NewFromUtf8(isolate, "argument 2 must be a number").ToLocalChecked()));
+        return;
+    }
 
     double rid = args[0]->NumberValue(context).FromMaybe(0);
     int id = static_cast<int>(rid);
@@ -116,8 +120,15 @@ void EnabledM(const FunctionCallbackInfo<Value> &args) {
     const char* cstr = ToCString(str);
     char* featurestr = const_cast<char *>(cstr);
 
+    double rseats = args[2]->NumberValue(context).FromMaybe(-1);
+    int seats = static_cast<int>(rseats);
+    if (seats < 0) {
+        isolate->ThrowException(Exception::Error(String::NewFromUtf8(isolate, "cannot convert number of seats").ToLocalChecked()));
+        return;
+    }
+
     // Call exported Go function, which returns a C string
-    Enabled_return r = Enabled(id, featurestr);
+    Enabled_return r = Enabled(id, featurestr, seats);
 
     if (!r.r1) {
         isolate->ThrowException(Exception::Error(String::NewFromUtf8(isolate, "invalid instance ID").ToLocalChecked()));

components/licensor/typescript/ee/src/nativemodule.d.ts

@@ -9,7 +9,7 @@ export type Instance = number;
 
 export function init(key: string, domain: string): Instance;
 export function validate(id: Instance): { msg: string, valid: boolean };
-export function isEnabled(id: Instance, feature: Feature): boolean;
+export function isEnabled(id: Instance, feature: Feature, seats: int): boolean;
 export function hasEnoughSeats(id: Instance, seats: int): boolean;
 export function inspect(id: Instance): string;
 export function dispose(id: Instance);