Skip to content
Snippets Groups Projects
Commit be93dd3e authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge remote-tracking branch 'remotes/origin/Sprint/2020-22' into...

Merge remote-tracking branch 'remotes/origin/Sprint/2020-22' into Product/1154-resourceTypeDefinition
parents 3d9bc4b9 1e429828
No related branches found
No related tags found
2 merge requests!106Product/1154 resource type definition,!105Sprint/2020 22
......@@ -4,7 +4,7 @@
<#@ include file="$(ProjectDir)\LinqToDB.Templates\PluralizationService.ttinclude" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll"#>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.9.0-topic-1159-rtdap0003\lib\net461\Coscine.Migrations.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.9.0-sprint-2020-22-0007\lib\net461\Coscine.Migrations.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll" #>
<#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll"#>
......
......@@ -50,7 +50,7 @@
<HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
</Reference>
<Reference Include="Coscine.Migrations, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.9.0-topic-1159-rtdap0003\lib\net461\Coscine.Migrations.dll</HintPath>
<HintPath>..\packages\Coscine.Migrations.1.9.0-sprint-2020-22-0007\lib\net461\Coscine.Migrations.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
<HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
......@@ -112,8 +112,8 @@
<Reference Include="FluentMigrator.Runner.SqlServerCe, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
<HintPath>..\packages\FluentMigrator.Runner.SqlServerCe.3.2.8\lib\net461\FluentMigrator.Runner.SqlServerCe.dll</HintPath>
</Reference>
<Reference Include="linq2db, Version=3.1.1.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL">
<HintPath>..\packages\linq2db.3.1.1\lib\net46\linq2db.dll</HintPath>
<Reference Include="linq2db, Version=3.1.0.0, Culture=neutral, PublicKeyToken=e41013125f9e410a, processorArchitecture=MSIL">
<HintPath>..\packages\linq2db.3.1.0\lib\net46\linq2db.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Sqlite, Version=3.1.5.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.Sqlite.Core.3.1.5\lib\netstandard2.0\Microsoft.Data.Sqlite.dll</HintPath>
......@@ -186,7 +186,6 @@
</ItemGroup>
<Import Project="CustomT4.targets" />
<ItemGroup>
<None Include="amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
<None Include="CustomT4.targets" />
<Compile Include="DataModel\CsDatabase.generated.cs">
<AutoGen>True</AutoGen>
......@@ -194,7 +193,6 @@
<DependentUpon>CsDatabase.tt</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<None Include="x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
......@@ -226,26 +224,7 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<Content Include="amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="amd64\sqlceca40.dll" />
<Content Include="amd64\sqlcecompact40.dll" />
<Content Include="amd64\sqlceer40EN.dll" />
<Content Include="amd64\sqlceme40.dll" />
<Content Include="amd64\sqlceqp40.dll" />
<Content Include="amd64\sqlcese40.dll" />
<Content Include="LinqToDB.Templates\CopyMe.SqlServer.tt.txt" />
<Content Include="runtimes\win-arm\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x64\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x86\native\e_sqlite3.dll" />
<Content Include="x86\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="x86\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="x86\sqlceca40.dll" />
<Content Include="x86\sqlcecompact40.dll" />
<Content Include="x86\sqlceer40EN.dll" />
<Content Include="x86\sqlceme40.dll" />
<Content Include="x86\sqlceqp40.dll" />
<Content Include="x86\sqlcese40.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
......
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.T4")]
[assembly: AssemblyVersion("1.27.0")]
[assembly: AssemblyFileVersion("1.27.0")]
[assembly: AssemblyInformationalVersion("1.27.0-topic-1159-rtdap0003")]
[assembly: AssemblyInformationalVersion("1.27.0-product-1154-res0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
......@@ -3,7 +3,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.9.0-topic-1159-rtdap0003" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.9.0-sprint-2020-22-0007" targetFramework="net461" />
<package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
......@@ -24,7 +24,7 @@
<package id="FluentMigrator.Runner.SQLite" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Runner.SqlServer" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Runner.SqlServerCe" version="3.2.8" targetFramework="net461" />
<package id="linq2db" version="3.1.1" targetFramework="net461" />
<package id="linq2db" version="3.1.0" targetFramework="net461" />
<package id="linq2db.SqlServer" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Data.Sqlite" version="3.1.5" targetFramework="net461" />
<package id="Microsoft.Data.Sqlite.Core" version="3.1.5" targetFramework="net461" />
......
......@@ -44,7 +44,7 @@
<HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
</Reference>
<Reference Include="Coscine.Migrations, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Migrations.1.9.0-topic-1159-rtdap0003\lib\net461\Coscine.Migrations.dll</HintPath>
<HintPath>..\packages\Coscine.Migrations.1.9.0-sprint-2020-22-0007\lib\net461\Coscine.Migrations.dll</HintPath>
</Reference>
<Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
<HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
......@@ -189,10 +189,8 @@
<Compile Include="TestCoscineDB.cs" />
</ItemGroup>
<ItemGroup>
<None Include="amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
<None Include="app.config" />
<None Include="packages.config" />
<None Include="x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
......@@ -203,27 +201,6 @@
<Name>Database</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="amd64\sqlceca40.dll" />
<Content Include="amd64\sqlcecompact40.dll" />
<Content Include="amd64\sqlceer40EN.dll" />
<Content Include="amd64\sqlceme40.dll" />
<Content Include="amd64\sqlceqp40.dll" />
<Content Include="amd64\sqlcese40.dll" />
<Content Include="runtimes\win-arm\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x64\native\e_sqlite3.dll" />
<Content Include="runtimes\win-x86\native\e_sqlite3.dll" />
<Content Include="x86\Microsoft.VC90.CRT\msvcr90.dll" />
<Content Include="x86\Microsoft.VC90.CRT\README_ENU.txt" />
<Content Include="x86\sqlceca40.dll" />
<Content Include="x86\sqlcecompact40.dll" />
<Content Include="x86\sqlceer40EN.dll" />
<Content Include="x86\sqlceme40.dll" />
<Content Include="x86\sqlceqp40.dll" />
<Content Include="x86\sqlcese40.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
......
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.Tests")]
[assembly: AssemblyVersion("1.27.0")]
[assembly: AssemblyFileVersion("1.27.0")]
[assembly: AssemblyInformationalVersion("1.27.0-topic-1159-rtdap0003")]
[assembly: AssemblyInformationalVersion("1.27.0-product-1154-res0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
......@@ -3,7 +3,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.9.0-topic-1159-rtdap0003" targetFramework="net461" />
<package id="Coscine.Migrations" version="1.9.0-sprint-2020-22-0007" targetFramework="net461" />
<package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
<package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
......
......@@ -83,6 +83,7 @@
<Compile Include="Models\KpiModel.cs" />
<Compile Include="Models\ProjectQuotasModel.cs" />
<Compile Include="Models\LinkedResourceTypeModel.cs" />
<Compile Include="Models\ApiTokenModel.cs" />
<Compile Include="Models\TOSModel.cs" />
<Compile Include="ReturnObjects\ActivatedFeatureObject.cs" />
<Compile Include="Models\LogModel.cs" />
......@@ -105,6 +106,7 @@
<Compile Include="ReturnObjects\ResourceObject.cs" />
<Compile Include="ReturnObjects\ResourceTypeObject.cs" />
<Compile Include="ReturnObjects\ResourceTypeOptionObject.cs" />
<Compile Include="ReturnObjects\ApiTokenObject.cs" />
<Compile Include="ReturnObjects\RoleObject.cs" />
<Compile Include="ReturnObjects\S3ResourceTypeObject.cs" />
<Compile Include="ReturnObjects\TitleObject.cs" />
......
using Coscine.Database.DataModel;
using Coscine.Database.ReturnObjects;
using LinqToDB;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Linq;
namespace Coscine.Database.Models
{
public class ApiTokenModel : DatabaseModel<ApiToken>
{
public override Expression<Func<ApiToken, Guid>> GetIdFromObject()
{
return databaseObject => databaseObject.Id;
}
public override ITable<ApiToken> GetITableFromDatabase(CoscineDB db)
{
return db.ApiTokens;
}
public override void SetObjectId(ApiToken databaseObject, Guid id)
{
databaseObject.Id = id;
}
public IEnumerable<ApiTokenObject> GetTokens(string userId)
{
return GetTokens(new Guid(userId));
}
public IEnumerable<ApiTokenObject> GetTokens(User user)
{
return GetTokens(user.Id);
}
public IEnumerable<ApiTokenObject> GetTokens(Guid userId)
{
return GetAllWhere((tableEntry) => tableEntry.UserId == userId)
.Select(x => new ApiTokenObject { TokenId = x.Id, Created = x.IssuedAt, Expires = x.Expiration, Name = x.Name })
.OrderBy(x => x.Created);
}
public ApiTokenObject GetToken(Guid userId, Guid tokenId)
{
var t = GetWhere(x => x.UserId == userId && x.Id == tokenId);
if (t == null)
{
return null;
}
return new ApiTokenObject { TokenId = t.Id, Created = t.IssuedAt, Expires = t.Expiration, Name = t.Name };
}
public User GetUser(Guid tokenId)
{
return GetUser(GetById(tokenId));
}
public User GetUser(ApiToken token)
{
var userModel = new UserModel();
return userModel.GetWhere(x => x.Id == token.UserId);
}
public void InsertToken(Guid tokenId, DateTime issuedAt, DateTime expires, Guid userId, string name)
{
Insert(new ApiToken
{
Id = tokenId,
IssuedAt = issuedAt,
Expiration = expires,
UserId = userId,
Name = name
});
}
public int Revoke(Guid userId, Guid tokenId)
{
var apiToken = GetById(tokenId);
if (apiToken.UserId == userId)
{
return Delete(apiToken);
}
else
{
return 0;
}
}
}
}
......@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database")]
[assembly: AssemblyVersion("1.27.0")]
[assembly: AssemblyFileVersion("1.27.0")]
[assembly: AssemblyInformationalVersion("1.27.0-topic-1159-rtdap0003")]
[assembly: AssemblyInformationalVersion("1.27.0-product-1154-res0002")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
using System;
namespace Coscine.Database.ReturnObjects
{
[Serializable]
public class ApiTokenObject : IReturnObject
{
public Guid TokenId { get; set; }
public string Name { get; set; }
public DateTime Created { get; set; }
public DateTime Expires { get; set; }
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment