Merge branch 'master' of github.com:Squidex/squidex

Squidex · Dec 23, 2018 · 1131e4f · 1131e4f
2 parents c249ad0 + 9b5c903
commit 1131e4f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/src/Squidex.Domain.Apps.Entities/Apps/RoleExtensions.cs b/src/Squidex.Domain.Apps.Entities/Apps/RoleExtensions.cs
@@ -30,7 +30,7 @@ public static string[] Prefix(this string[] permissions, string name)
                 }
             }
 
-            permissions = result;
+            permissions = result.Distinct().ToArray();
 
             return permissions;
         }

diff --git a/src/Squidex.Domain.Users/UserWithClaims.cs b/src/Squidex.Domain.Users/UserWithClaims.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
@@ -30,6 +31,11 @@ public string Email
             get { return Identity.Email; }
         }
 
+        public bool IsLocked
+        {
+            get { return Identity.LockoutEnd > DateTime.Now.ToUniversalTime(); }
+        }
+
         IReadOnlyList<Claim> IUser.Claims
         {
             get { return Claims; }

diff --git a/src/Squidex.Shared/Users/IUser.cs b/src/Squidex.Shared/Users/IUser.cs
@@ -16,6 +16,8 @@ public interface IUser
 
         string Email { get; }
 
+        bool IsLocked { get; }
+
         IReadOnlyList<Claim> Claims { get; }
     }
 }
diff --git a/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts b/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts
@@ -65,7 +65,7 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni
                         this.isInitialized = true;
 
                         if (this.plugin.contentWindow && Types.isFunction(this.plugin.contentWindow.postMessage)) {
-                            this.plugin.contentWindow.postMessage({ type: 'disabled', disabled: this.isDisabled }, '*');
+                            this.plugin.contentWindow.postMessage({ type: 'disabled', isDisabled: this.isDisabled }, '*');
                             this.plugin.contentWindow.postMessage({ type: 'valueChanged', value: this.value }, '*');
                         }
                     } else if (type === 'resize') {
@@ -99,7 +99,7 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni
         this.isDisabled = isDisabled;
 
         if (this.isInitialized && this.plugin.contentWindow && Types.isFunction(this.plugin.contentWindow.postMessage)) {
-            this.plugin.contentWindow.postMessage({ type: 'disabled', disabled: this.isDisabled }, '*');
+            this.plugin.contentWindow.postMessage({ type: 'disabled', isDisabled: this.isDisabled }, '*');
         }
     }
 

diff --git a/...ntities.Tests/Apps/RoleExtensionsRests.cs → ...ntities.Tests/Apps/RoleExtensionsTests.cs b/...ntities.Tests/Apps/RoleExtensionsRests.cs → ...ntities.Tests/Apps/RoleExtensionsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Squidex.Domain.Apps.Entities.Apps
 {
-    public class RoleExtensionsRests
+    public class RoleExtensionsTests
     {
         [Fact]
         public void Should_add_common_permission()
@@ -23,6 +23,15 @@ public void Should_add_common_permission()
             Assert.Equal(new[] { "squidex.apps.my-app.common" }, result);
         }
 
+        [Fact]
+        public void Should_not_have_duplicate_permission()
+        {
+            var source = new[] { "common", "common", "common" };
+            var result = source.Prefix("my-app");
+
+            Assert.Single(result);
+        }
+
         [Fact]
         public void Should_prefix_permission()
         {