@singularsystems/neo-core 1.0.4 → 1.0.5

package/dist/Model/IModelBase.d.ts

@@ -46,6 +46,9 @@ export type PartialPlainNonTrackedObject<T> = PartialPlainObject<T> & {
 export interface NeoModelConstructor extends Function {
     neo: NeoTypeInfo;
 }
+export interface NeoModelConstructorInternal extends Function {
+    addBusinessRules?(validationRules: ValidationRules<IModelBase>): void;
+}
 export interface IMakeBindableOptions {
     /**
      * Specifies whether properties should be observable

package/dist/Model/ModelBase.d.ts

@@ -79,10 +79,15 @@ export default abstract class ModelBase extends BindableBase implements IModelBa
      * @param shouldSerialise The value determined by the serialiser.
      */
     protected canSerialise(shouldSerialise: boolean): boolean;
+    /** @deprecated Make your addBusinessRules method `static`. E.g.
+     * ```
+     * protected static addBusinessRules(rules: ValidationRules<MyType>) {
+     * ```  */
+    protected addBusinessRules(validationRules: ValidationRules<this>): void;
     /**
-     * Add custom business rules. Note, this will be called once per type and should be treated as static.
+     * Add custom business rules for this type.
      */
-    protected addBusinessRules(validationRules: ValidationRules<this>): void;
+    protected static addBusinessRules(rules: ValidationRules<ModelBase>): void;
     /** The server side type name used to find this type. Include the namespace if there is more than one type with the same name. */
     static typeName: string | null;
 }

package/dist/Model/ModelBase.js

@@ -142,10 +142,16 @@ var ModelBase = /** @class */ (function (_super) {
     ModelBase.prototype.canSerialise = function (shouldSerialise) {
         return shouldSerialise;
     };
+    /** @deprecated Make your addBusinessRules method `static`. E.g.
+     * ```
+     * protected static addBusinessRules(rules: ValidationRules<MyType>) {
+     * ```  */
+    ModelBase.prototype.addBusinessRules = function (validationRules) {
+    };
     /**
-     * Add custom business rules. Note, this will be called once per type and should be treated as static.
+     * Add custom business rules for this type.
      */
-    ModelBase.prototype.addBusinessRules = function (validationRules) {
+    ModelBase.addBusinessRules = function (rules) {
     };
     /** The server side type name used to find this type. Include the namespace if there is more than one type with the same name. */
     ModelBase.typeName = null;

package/dist/Model/NeoTypeInfo.js

@@ -125,22 +125,24 @@ var NeoTypeInfo = /** @class */ (function () {
         }
     };
     NeoTypeInfo.prototype.addRules = function (instance) {
-        if (instance.addBusinessRules !== undefined) {
+        var _a;
+        var addRulesMethod = (_a = this.objectConstructor.addBusinessRules) !== null && _a !== void 0 ? _a : instance.addBusinessRules;
+        if (addRulesMethod !== undefined) {
             var validationRules = new ValidationRules();
-            instance.addBusinessRules(validationRules);
+            addRulesMethod(validationRules);
             if (validationRules.rules.some(function (c) { return c instanceof CallbackRule && c.hasArrowFunction; })) {
                 console.error("Warning: ".concat(this.objectConstructor.name, " has rules which have been added using an arrow function."));
             }
             var modelProxy = new ModelProxy(instance);
-            for (var _i = 0, _a = validationRules.rules; _i < _a.length; _i++) {
-                var rule = _a[_i];
+            for (var _i = 0, _b = validationRules.rules; _i < _b.length; _i++) {
+                var rule = _b[_i];
                 var properties = rule.getDisplayProperties(this.propertyMap);
                 if (properties === undefined && rule instanceof ExpressionRule) {
                     properties = modelProxy.tryExtractProperties(rule);
                 }
                 if (properties && properties.length) {
-                    for (var _b = 0, properties_1 = properties; _b < properties_1.length; _b++) {
-                        var property = properties_1[_b];
+                    for (var _c = 0, properties_1 = properties; _c < properties_1.length; _c++) {
+                        var property = properties_1[_c];
                         property.rules.push(rule);
                     }
                 }

package/dist/Security/IAuthenticationService.d.ts

@@ -26,8 +26,6 @@ export default interface IAuthenticationService {
     tryCompleteSignIn(): Promise<ISignInResult>;
     signinSilent(): Promise<any>;
     endSignInSilent(): Promise<any>;
-    /** Clears the user locally */
-    signOutLocal(): void;
     beginSignOut(): void;
     endSignOut(): Promise<any>;
     /** Returns true if there is a user, and the token has not expired */

package/dist/Security/Oidc/OidcAuthService.d.ts

@@ -11,6 +11,7 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
     protected userManager: IUserManager;
     private axios;
     private _user;
+    private isRedirecting;
     private afterUserLoadedPromise;
     /**
      * Creates an Oidc auth service
@@ -18,6 +19,7 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
      * @param user User which existed in storage at startup
      */
     constructor(userManager: IUserManager, axios: AxiosInstance);
+    isSigningOut: boolean;
     loadUserFromToken(): Promise<TUser | null>;
     loadUserFromSession(): Promise<TUser | null>;
     ensureSignedIn(redirectLocal?: string): boolean;
@@ -45,7 +47,7 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
     signinSilent(): Promise<IOidcUser | null>;
     beginSignOut(): void;
     endSignOut(): Promise<any>;
-    signOutLocal(): void;
+    private signOutLocal;
     get user(): TUser | null;
     get isAuthenticated(): boolean;
     static createIdentityServerMetadata(identityServerUrl: string): {

package/dist/Security/Oidc/OidcAuthService.js

@@ -18,6 +18,8 @@ var OidcAuthService = /** @class */ (function () {
         this.userManager = userManager;
         this.axios = axios;
         this._user = null;
+        this.isRedirecting = false;
+        this.isSigningOut = false;
         this.userManager = userManager;
         this.userManager.events.addUserLoaded(this.onUserLoaded.bind(this));
         this.userManager.events.addUserUnloaded(this.onUserUnloaded.bind(this));
@@ -64,7 +66,11 @@ var OidcAuthService = /** @class */ (function () {
      * @param redirectPath Local path to redirect to once login is complete.
      */
     OidcAuthService.prototype.beginSignIn = function (redirectPath) {
-        return this.userManager.signinRedirect({ state: redirectPath });
+        if (!this.isRedirecting) {
+            this.isRedirecting = true;
+            return this.userManager.signinRedirect({ state: redirectPath });
+        }
+        return Promise.resolve();
     };
     ;
     /**
@@ -77,6 +83,7 @@ var OidcAuthService = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
+                        this.isRedirecting = false;
                         return [4 /*yield*/, this.userManager.signinRedirectCallback()];
                     case 1:
                         user = _a.sent();
@@ -168,14 +175,20 @@ var OidcAuthService = /** @class */ (function () {
         return this.userManager.signinSilent();
     };
     OidcAuthService.prototype.beginSignOut = function () {
-        if (this._user) {
-            this.userManager.signoutRedirect({ id_token_hint: this._user.userData.id_token });
-            this.signOutLocal();
+        if (!this.isRedirecting) {
+            if (this._user) {
+                this.isRedirecting = true;
+                this.isSigningOut = true;
+                this.userManager.signoutRedirect({ id_token_hint: this._user.userData.id_token });
+                this.signOutLocal();
+            }
+            this.userManager.clearStaleState();
         }
-        this.userManager.clearStaleState();
     };
     ;
     OidcAuthService.prototype.endSignOut = function () {
+        this.isRedirecting = false;
+        this.isSigningOut = false;
         return this.userManager.signoutRedirectCallback();
     };
     ;

package/dist/Validation/ValidationRules.d.ts

@@ -5,10 +5,12 @@ export declare class ValidationRules<T extends IModelBase> {
     rules: CustomRule<T>[];
     /**
      * Registers a custom rule.
-     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function:**, either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
-     * @param ruleFunction
+     * - Pass in the address of a function: `add(MyType.prototype.myRule)`
+     * - or pass an anonymous function: `add(function(context) {})`
+     *
+     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function**.
      */
-    add(ruleFunction: (context: IRuleContext) => void): ICustomRule<T>;
+    add(ruleFunction: (this: T, context: IRuleContext) => void): ICustomRule<T>;
     failWhen(failCondition: RuleExpression<T>, errorTextExpression: ErrorExpression<T>): IExpressionRule<T>;
     failWhen(failCondition: RuleExpression<T>, errorText: string): IExpressionRule<T>;
     warnWhen(condition: RuleExpression<T>, warningTextExpression: ErrorExpression<T>): IExpressionRule<T>;

package/dist/Validation/ValidationRules.js

@@ -6,8 +6,10 @@ var ValidationRules = /** @class */ (function () {
     }
     /**
      * Registers a custom rule.
-     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function:**, either pass in the address of a function: add(this.myRule), or pass an anonymous function: add(function(context) {}).
-     * @param ruleFunction
+     * - Pass in the address of a function: `add(MyType.prototype.myRule)`
+     * - or pass an anonymous function: `add(function(context) {})`
+     *
+     * **NOTE: Do not use `.bind(this)`, and do not use an arrow function**.
      */
     ValidationRules.prototype.add = function (ruleFunction) {
         var rule = new CallbackRule(ruleFunction);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-core",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Core functionality for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",