diff options
| author | Roy <roy.mail.net@gmail.com> | 2018-02-23 12:03:18 +0200 |
|---|---|---|
| committer | Roy <roy.mail.net@gmail.com> | 2018-02-23 12:03:18 +0200 |
| commit | fadf83a50071ffba21db05eceff10c51c18f5fb3 (patch) | |
| tree | 9a568aae8d298bfbc2135afaff0b91f9de711793 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService | |
| parent | 042b4d3e7b0af729792ca20e086756c36d2f5768 (diff) | |
| download | Tango-fadf83a50071ffba21db05eceff10c51c18f5fb3.tar.gz Tango-fadf83a50071ffba21db05eceff10c51c18f5fb3.zip | |
Machine Studio Update & Publish.
Improved user roles & permissions structure.
Added permission for version publish.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService')
3 files changed, 6 insertions, 6 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs index e573a0d77..bf737c7a9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs @@ -31,7 +31,7 @@ namespace Tango.MachineStudio.UpdateService private static List<PendingUpload> _pendingUploads; - MachineStudioUpdateService() + static MachineStudioUpdateService() { _pendingUploads = new List<PendingUpload>(); } @@ -50,7 +50,7 @@ namespace Tango.MachineStudio.UpdateService var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); - if (user != null) + if (user != null && user.HasPermission(Permissions.RunMachineStudio)) { var latestVersion = db.MachineStudioVersions.FirstOrDefault(); Version currentVersion = Version.Parse(request.Version); @@ -93,7 +93,7 @@ namespace Tango.MachineStudio.UpdateService var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); - if (user != null) + if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion)) { var latestVersion = db.MachineStudioVersions.FirstOrDefault(); Version currentVersion = Version.Parse(request.Version); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj index c9400b2d1..0b4d78195 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Tango.MachineStudio.UpdateService.csproj @@ -26,7 +26,7 @@ <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\Build\Debug\Web\Machine Studio Update Service\</OutputPath> + <OutputPath>bin\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -118,7 +118,7 @@ <VisualStudio> <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}"> <WebProjectProperties> - <UseIIS>True</UseIIS> + <UseIIS>False</UseIIS> <AutoAssignPort>True</AutoAssignPort> <DevelopmentServerPort>65206</DevelopmentServerPort> <DevelopmentServerVPath>/</DevelopmentServerVPath> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config index da6e960b8..d2da57796 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/Web.Release.config @@ -15,7 +15,7 @@ </connectionStrings> --> <system.web> - <compilation xdt:Transform="RemoveAttributes(debug)" /> + <!--<compilation xdt:Transform="RemoveAttributes(debug)" />--> <!-- In the example below, the "Replace" transform will replace the entire <customErrors> section of your web.config file. |