Merge pull request #1 from SyrnaAbp/dev

blazor modules implemented

Author: dolunay

.github/workflows/publish.yml

@@ -57,15 +57,16 @@ jobs:
           rm -f *.HttpApi.Client.ConsoleTestApp.*
           rm -f *.Tests.*
           rm -f *.TestBase.*
+          rm -f *.MainDemo.*
           ls
 
       - name: dotnet nuget push to GitHub
         uses: tanaka-takayoshi/[email protected]
         with:
           nupkg-path:  '${{ github.workspace }}/nugetPackages/*.nupkg'
           repo-owner:  'SyrnaAbp'
-          gh-user:  'SyrnaAbp'
-          token:  ${{ secrets.GITHUB_TOKEN }}
+          gh-user:  'dolunay'
+          token:  ${{ secrets.NUGET_PACKAGE_TOKEN }}
 
       - name: dotnet nuget push to NuGet
         run: dotnet nuget push ${{ github.workspace }}/nugetPackages/*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
@@ -76,11 +77,11 @@ jobs:
         with:
           tag: ${{ steps.getVersion.outputs.first_match }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.NUGET_PACKAGE_TOKEN }}
 
       - name: add git tag
         if: ${{ steps.checkTag.outputs.exists == 'false' }}
         uses: tvdias/[email protected]
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.NUGET_PACKAGE_TOKEN }}
           tag: ${{ steps.getVersion.outputs.first_match }}

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Changelog
 These are the list of changes to each version that has been released.
 
-## 9.0
+## 2024-12-22
 - [x] Initial release, .Net9 based

PACKS_README.md

@@ -0,0 +1,30 @@
+# Syrna.DynamicPermission
+Dynamic permission module for ABP framework.
+
+An ABP module that allows you to define and grant dynamic permissions in runtime.
+
+## Installation
+
+1. Install the following NuGet packages. ([see how](https://github.com/SyrnaAbp/SyrnaAbpGuide/blob/master/docs/How-To.md#add-nuget-packages))
+
+    * Syrna.DynamicPermission.Application
+    * Syrna.DynamicPermission.Application.Contracts
+    * Syrna.DynamicPermission.Domain
+    * Syrna.DynamicPermission.Domain.Shared
+    * Syrna.DynamicPermission.EntityFrameworkCore
+    * Syrna.DynamicPermission.HttpApi
+    * Syrna.DynamicPermission.HttpApi.Client
+    * Syrna.DynamicPermission.Web
+    * Syrna.DynamicPermission.Blazor
+    * Syrna.DynamicPermission.Blazor.Server
+    * Syrna.DynamicPermission.Blazor.WebAssembly
+
+1. Add `DependsOn(typeof(SyrnaDynamicPermissionXxxModule))` attribute to configure the module dependencies. ([see how](https://github.com/SyrnaAbp/SyrnaAbpGuide/blob/master/docs/How-To.md#add-module-dependencies))
+
+1. Add `builder.ConfigureDynamicPermission();` to the `OnModelCreating()` method in **MyProjectMigrationsDbContext.cs**.
+
+1. Add EF Core migrations and update your database. See: [ABP document](https://docs.abp.io/en/abp/latest/Tutorials/Part-1?UI=MVC&DB=EF#add-database-migration).
+
+
+
+

README.md

@@ -1,12 +1,12 @@
 # Syrna.DynamicPermission
-Private Messaging module for ABP framework.
+Dynamic permission module for ABP framework.
 
 [![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FVoloAbpPackageVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FSyrnaAbp%2FSyrna.DynamicPermission%2Fmaster%2FDirectory.Packages.props)](https://abp.io)
 ![build and test](https://img.shields.io/github/actions/workflow/status/SyrnaAbp/Syrna.DynamicPermission/build-all.yml?branch=dev&style=flat-square)
 [![NuGet Download](https://img.shields.io/nuget/dt/Syrna.DynamicPermission.Application.svg?style=flat-square)](https://www.nuget.org/packages/Syrna.DynamicPermission.Application)
 [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Syrna.DynamicPermission.Application.svg?style=flat-square)](https://www.nuget.org/packages/Syrna.DynamicPermission.Application) 
 
-An abp application module that allows users to send private messages to each other.
+An ABP module that allows you to define and grant dynamic permissions in runtime.
 
 ## Installation
 
@@ -32,6 +32,11 @@ An abp application module that allows users to send private messages to each oth
 
 ## Usage
 
+![Dynamic Permission Definitions](docs/images/DynamicPermissionDefinitions.png)
+
+![Dynamic Permission Definitions Editing](docs/images/DynamicPermissionDefinitions_Editing.png)
+
+![Edit Role Permissions](docs/images/EditRolePermissions.png)
 
 ## Reference
 
@@ -42,5 +47,8 @@ An abp application module that allows users to send private messages to each oth
 1. Demo project created for OpenIddict
 2. Demo project extended modules added
 3. Blazor modules added
+4. Db schema refatored
+5. Blazor modules implemented
+6. AspNetCore Web refactored
 
 

Syrna.DynamicPermission.sln

@@ -105,6 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solutio
 		LICENSE = LICENSE
 		NuGet.Config = NuGet.Config
 		packing.props = packing.props
+		PACKS_README.md = PACKS_README.md
 		README.md = README.md
 	EndProjectSection
 EndProject

demos/MainDemo/src/Syrna.DynamicPermission.MainDemo.Domain/Data/MainDemoDataSeedContributor.cs

@@ -1,41 +1,41 @@
-using System.Threading.Tasks;
-using Syrna.DynamicPermission.PermissionDefinitions;
-using Volo.Abp.Data;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Uow;
-
-namespace Syrna.DynamicPermission.MainDemo.Data
-{
-    public class MainDemoDataSeedContributor : IDataSeedContributor, ITransientDependency
-    {
-        protected const string PermissionDefinitionDemo1Name = "Permission1";
+using System.Threading.Tasks;
+using Syrna.DynamicPermission.PermissionDefinitions;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
+
+namespace Syrna.DynamicPermission.MainDemo.Data
+{
+    public class MainDemoDataSeedContributor : IDataSeedContributor, ITransientDependency
+    {
+        protected const string PermissionDefinitionDemo1Name = "Permission1";
         protected const string PermissionDefinitionDemo2Name = "Permission2";
 
-        private readonly IPermissionDefinitionRepository _permissionDefinitionRepository;
-
-        public MainDemoDataSeedContributor(
-            IPermissionDefinitionRepository permissionDefinitionRepository)
-        {
-            _permissionDefinitionRepository = permissionDefinitionRepository;
+        private readonly IPermissionDefinitionRepository _permissionDefinitionRepository;
+
+        public MainDemoDataSeedContributor(
+            IPermissionDefinitionRepository permissionDefinitionRepository)
+        {
+            _permissionDefinitionRepository = permissionDefinitionRepository;
         }
 
-        [UnitOfWork]
-        public async Task SeedAsync(DataSeedContext context)
-        {
-            if (!await _permissionDefinitionRepository.AnyAsync(x => x.Name == PermissionDefinitionDemo1Name))
-            {
-                await _permissionDefinitionRepository.InsertAsync(
-                    new PermissionDefinition(PermissionDefinitionDemo1Name, PermissionDefinitionDemo1Name, "A demo",
-                        true), true);
+        [UnitOfWork]
+        public async Task SeedAsync(DataSeedContext context)
+        {
+            if (!await _permissionDefinitionRepository.AnyAsync(x => x.Id == PermissionDefinitionDemo1Name))
+            {
+                await _permissionDefinitionRepository.InsertAsync(
+                    new PermissionDefinition(PermissionDefinitionDemo1Name, PermissionDefinitionDemo1Name, "A demo",
+                        true), true);
             }
 
-            if (!await _permissionDefinitionRepository.AnyAsync(x => x.Name == PermissionDefinitionDemo2Name))
-            {
-                await _permissionDefinitionRepository.InsertAsync(
-                    new PermissionDefinition(PermissionDefinitionDemo2Name, PermissionDefinitionDemo2Name, "A demo",
-                        false), true);
-            }
-        }
-    }
+            if (!await _permissionDefinitionRepository.AnyAsync(x => x.Id == PermissionDefinitionDemo2Name))
+            {
+                await _permissionDefinitionRepository.InsertAsync(
+                    new PermissionDefinition(PermissionDefinitionDemo2Name, PermissionDefinitionDemo2Name, "A demo",
+                        false), true);
+            }
+        }
+    }
 }

demos/MainDemo/src/Syrna.DynamicPermission.MainDemo.SqlServer.EntityFrameworkCore/Migrations/20241218080608_Initial.Designer.cs renamed to demos/MainDemo/src/Syrna.DynamicPermission.MainDemo.SqlServer.EntityFrameworkCore/Migrations/20241221231426_Initial.Designer.cs

@@ -458,9 +458,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 name: "SyrnaPermissionDefinitions",
                 columns: table => new
                 {
-                    Name = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    DisplayName = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Id = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    DisplayName = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: true),
+                    Description = table.Column<string>(type: "nvarchar(max)", maxLength: 2147483647, nullable: true),
                     IsPublic = table.Column<bool>(type: "bit", nullable: false),
                     ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: false),
                     ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: false),
@@ -471,7 +471,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_SyrnaPermissionDefinitions", x => x.Name);
+                    table.PrimaryKey("PK_SyrnaPermissionDefinitions", x => x.Id);
                 });
 
             migrationBuilder.CreateTable(

demos/MainDemo/src/Syrna.DynamicPermission.MainDemo.SqlServer.EntityFrameworkCore/Migrations/20241218080608_Initial.cs renamed to demos/MainDemo/src/Syrna.DynamicPermission.MainDemo.SqlServer.EntityFrameworkCore/Migrations/20241221231426_Initial.cs

@@ -26,7 +26,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
             modelBuilder.Entity("Syrna.DynamicPermission.PermissionDefinitions.PermissionDefinition", b =>
                 {
-                    b.Property<string>("Name")
+                    b.Property<string>("Id")
                         .HasColumnType("nvarchar(450)");
 
                     b.Property<string>("ConcurrencyStamp")
@@ -45,10 +45,12 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnName("CreatorId");
 
                     b.Property<string>("Description")
+                        .HasMaxLength(2147483647)
                         .HasColumnType("nvarchar(max)");
 
                     b.Property<string>("DisplayName")
-                        .HasColumnType("nvarchar(max)");
+                        .HasMaxLength(255)
+                        .HasColumnType("nvarchar(255)");
 
                     b.Property<string>("ExtraProperties")
                         .IsRequired()
@@ -66,7 +68,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
-                    b.HasKey("Name");
+                    b.HasKey("Id");
 
                     b.ToTable("SyrnaPermissionDefinitions", (string)null);
                 });