Skip to content

Commit 09eecdf

Browse files
author
Leonid
committed
Added save tags functionality
1 parent 1fe79ad commit 09eecdf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+510
-109
lines changed

‎eFormAPI/eFormAPI/App_Start/AutofacConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Web.Http;
33
using Autofac;
44
using Autofac.Integration.WebApi;
5+
using eFormAPI.Web.Infrastructure.Data;
56
using eFormAPI.Web.Infrastructure.Identity;
6-
using eFormApi.BasePn.Infrastructure.Data;
77

88
namespace eFormAPI.Web
99
{

‎eFormAPI/eFormAPI/App_Start/Startup.Auth.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System.Linq;
66
using Castle.Core.Internal;
77
using eFormAPI.Web.Infrastructure.Attributes;
8+
using eFormAPI.Web.Infrastructure.Data;
89
using eFormAPI.Web.Infrastructure.Helpers;
910
using eFormAPI.Web.Infrastructure.Identity;
1011
using eFormAPI.Web.Infrastructure.Identity.Providers;
11-
using eFormApi.BasePn.Infrastructure.Data;
1212
using Microsoft.Owin;
1313
using Microsoft.Owin.Security.Cookies;
1414
using Microsoft.Owin.Security.OAuth;

‎eFormAPI/eFormAPI/App_Start/SwaggerConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static void Register(HttpConfiguration configuration)
1515
configuration.EnableSwagger(c =>
1616
{
1717
c.SingleApiVersion("v1", "Eform API");
18-
c.IncludeXmlComments($@"{System.AppDomain.CurrentDomain.BaseDirectory}\bin\API.docs.xml");
18+
c.IncludeXmlComments($@"{AppDomain.CurrentDomain.BaseDirectory}\bin\API.docs.xml");
1919
c.DescribeAllEnumsAsStrings();
2020
c.DocumentFilter<AuthTokenOperation>();
2121
c.OperationFilter<AddAuthorizationHeader>();

‎eFormAPI/eFormAPI/Controllers/AccountController.cs‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
using System.Configuration;
1+

2+
using System.Configuration;
23
using System.Data.Entity;
34
using System.Linq;
45
using System.Net.Http;
56
using System.Threading.Tasks;
67
using System.Web.Configuration;
78
using System.Web.Http;
89
using Castle.Core.Internal;
10+
using eFormAPI.Web.Infrastructure.Data;
911
using eFormAPI.Web.Infrastructure.Identity;
1012
using eFormAPI.Web.Infrastructure.Models.Auth;
1113
using eFormAPI.Web.Infrastructure.Models.Settings.User;
1214
using eFormAPI.Web.Infrastructure.Models.User;
13-
using eFormApi.BasePn.Consts;
14-
using eFormApi.BasePn.Infrastructure.Data;
15-
using eFormApi.BasePn.Infrastructure.Data.Entities;
16-
using eFormApi.BasePn.Infrastructure.Helpers;
17-
using eFormApi.BasePn.Infrastructure.Models.API;
1815
using Microsoft.AspNet.Identity;
16+
using Microsoft.AspNet.Identity.EntityFramework;
1917
using Microsoft.AspNet.Identity.Owin;
18+
using Microting.eFormApi.BasePn.Consts;
19+
using Microting.eFormApi.BasePn.Infrastructure.Data.Entities;
20+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
21+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
2022

2123
namespace eFormAPI.Web.Controllers
2224
{
@@ -31,7 +33,7 @@ public class AccountController : ApiController
3133
public AccountController(BaseDbContext dbContext)
3234
{
3335
_eformRoleManager = new EformRoleManager(
34-
new EformRoleStore(new BaseDbContext()));
36+
new RoleStore<EformRole, int, EformUserRole>(new BaseDbContext()));
3537
_dbContext = dbContext;
3638
}
3739

@@ -47,7 +49,7 @@ public UserInfoViewModel GetUserInfo()
4749
{
4850
return null;
4951
}
50-
var rolemanager = new EformRoleManager(new EformRoleStore(BaseDbContext.Create()));
52+
var rolemanager = new EformRoleManager(new RoleStore<EformRole, int, EformUserRole>(BaseDbContext.Create()));
5153
var roleId = user.Roles.FirstOrDefault()?.RoleId;
5254
string role = null;
5355
if (roleId != null) role = rolemanager.FindById((int) roleId)?.Name;

‎eFormAPI/eFormAPI/Controllers/AdminController.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
using System.Linq;
66
using System.Net.Http;
77
using System.Web.Http;
8+
using eFormAPI.Web.Infrastructure.Data;
89
using eFormAPI.Web.Infrastructure.Helpers;
910
using eFormAPI.Web.Infrastructure.Identity;
1011
using eFormAPI.Web.Infrastructure.Models.Common;
1112
using eFormAPI.Web.Infrastructure.Models.User;
12-
using eFormApi.BasePn.Consts;
13-
using eFormApi.BasePn.Infrastructure.Data;
14-
using eFormApi.BasePn.Infrastructure.Data.Entities;
15-
using eFormApi.BasePn.Infrastructure.Helpers;
16-
using eFormApi.BasePn.Infrastructure.Models.API;
1713
using Microsoft.AspNet.Identity;
14+
using Microsoft.AspNet.Identity.EntityFramework;
1815
using Microsoft.AspNet.Identity.Owin;
16+
using Microting.eFormApi.BasePn.Consts;
17+
using Microting.eFormApi.BasePn.Infrastructure.Data.Entities;
18+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
19+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
1920
using NLog;
2021

2122
namespace eFormAPI.Web.Controllers
@@ -41,7 +42,7 @@ public EformUserManager UserManager
4142

4243
public EformRoleManager RoleManager
4344
{
44-
get => _eformRoleManager ?? new EformRoleManager(new EformRoleStore(BaseDbContext.Create()));
45+
get => _eformRoleManager ?? new EformRoleManager(new RoleStore<EformRole, int, EformUserRole>(BaseDbContext.Create()));
4546
set => _eformRoleManager = value;
4647
}
4748

‎eFormAPI/eFormAPI/Controllers/AuthController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
using eFormAPI.Web.Infrastructure.Helpers;
77
using eFormAPI.Web.Infrastructure.Identity;
88
using eFormAPI.Web.Infrastructure.Models.Auth;
9-
using eFormApi.BasePn.Infrastructure.Helpers;
10-
using eFormApi.BasePn.Infrastructure.Models.API;
119
using Microsoft.AspNet.Identity;
1210
using Microsoft.AspNet.Identity.Owin;
1311
using Microsoft.Owin.Security;
1412
using Microsoft.Owin.Security.Cookies;
1513
using Microsoft.Owin.Security.OAuth;
14+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
15+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
1616
using OtpSharp;
1717

1818
namespace eFormAPI.Web.Controllers

‎eFormAPI/eFormAPI/Controllers/CasesController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
using eFormAPI.Web.Infrastructure.Helpers;
55
using eFormAPI.Web.Infrastructure.Models.Cases.Request;
66
using eFormAPI.Web.Infrastructure.Models.Cases.Response;
7-
using eFormShared;
87
using eFormData;
9-
using eFormApi.BasePn.Infrastructure;
10-
using eFormApi.BasePn.Infrastructure.Helpers;
11-
using eFormApi.BasePn.Infrastructure.Models.API;
8+
using eFormShared;
9+
using Microting.eFormApi.BasePn.Infrastructure;
10+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
11+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
1212

1313
namespace eFormAPI.Web.Controllers
1414
{

‎eFormAPI/eFormAPI/Controllers/EntitySearchController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
using eFormAPI.Web.Infrastructure.Models.SearchableList;
77
using eFormData;
88
using eFormShared;
9-
using eFormApi.BasePn.Infrastructure;
10-
using eFormApi.BasePn.Infrastructure.Helpers;
11-
using eFormApi.BasePn.Infrastructure.Models.API;
9+
using Microting.eFormApi.BasePn.Infrastructure;
10+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
11+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
1212

1313
namespace eFormAPI.Web.Controllers
1414
{

‎eFormAPI/eFormAPI/Controllers/EntitySelectController.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
using System.Web.Http;
55
using eFormAPI.Web.Infrastructure.Models.Common;
66
using eFormAPI.Web.Infrastructure.Models.SelectableList;
7-
using eFormData;
8-
using eFormShared;
9-
using eFormApi.BasePn.Infrastructure;
10-
using eFormApi.BasePn.Infrastructure.Helpers;
11-
using eFormApi.BasePn.Infrastructure.Models.API;
127
using eFormAPI.Web.Infrastructure.Helpers.ExchangeTokenValidation;
138
using System.Web.Http.Cors;
9+
using eFormData;
10+
using eFormShared;
11+
using Microting.eFormApi.BasePn.Infrastructure;
12+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
13+
using Microting.eFormApi.BasePn.Infrastructure.Models.API;
1414

1515
namespace eFormAPI.Web.Controllers
1616
{

‎eFormAPI/eFormAPI/Controllers/ImagesController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
using System.Net.Http.Headers;
55
using System.Web;
66
using System.Web.Http;
7-
using eFormApi.BasePn.Consts;
8-
using eFormApi.BasePn.Infrastructure.Helpers;
7+
using Microting.eFormApi.BasePn.Consts;
8+
using Microting.eFormApi.BasePn.Infrastructure.Helpers;
99

1010
namespace eFormAPI.Web.Controllers
1111
{

0 commit comments

Comments
 (0)