Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/27/10 10:48:24 (14 years ago)
Author:
mjesner
Message:

#1196

Location:
branches/UserManagement
Files:
8 added
1 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/HeuristicLab.Services.Authentication.ServiceClient.csproj

    r4940 r4962  
    77    <SchemaVersion>2.0</SchemaVersion>
    88    <ProjectGuid>{8E698904-936D-4C7A-AB0D-6225778D2968}</ProjectGuid>
    9     <OutputType>Exe</OutputType>
     9    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Services.Authentication.ServiceClients</RootNamespace>
     11    <RootNamespace>HeuristicLab.Services.Authentication</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Services.Authentication.ServiceClients</AssemblyName>
    1313    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    … …  
    3737    <Reference Include="System" />
    3838    <Reference Include="System.Core" />
     39    <Reference Include="System.Data.Linq" />
    3940    <Reference Include="System.Runtime.Serialization" />
    4041    <Reference Include="System.ServiceModel" />
    … …  
    4647  </ItemGroup>
    4748  <ItemGroup>
    48     <Compile Include="Client.cs" />
     49    <Compile Include="AuthenticationClient.cs" />
     50    <Compile Include="ClientFactory.cs" />
    4951    <Compile Include="ServiceClients\Application.cs" />
    5052    <Compile Include="ServiceClients\AuthenticationServiceClient.cs" />
    … …  
    5860    <None Include="ServiceClients\GenerateServiceClients.cmd" />
    5961  </ItemGroup>
     62  <ItemGroup>
     63    <ProjectReference Include="..\HeuristicLab.Services.Authentication\HeuristicLab.Services.Authentication.csproj">
     64      <Project>{0E7ADDD6-C7EA-45F6-A7ED-48041ABF1A87}</Project>
     65      <Name>HeuristicLab.Services.Authentication</Name>
     66    </ProjectReference>
     67  </ItemGroup>
     68  <ItemGroup>
     69    <WCFMetadata Include="Service References\" />
     70  </ItemGroup>
    6071  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    6172  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Application.cs

    r4927 r4962  
    44using System.Text;
    55
    6 namespace HeuristicLab.Services.Authentication.ServiceClient
     6namespace HeuristicLab.Services.Authentication
    77{
    88    public partial class Application

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/AuthenticationServiceClient.cs

    r4927 r4962  
    99//------------------------------------------------------------------------------
    1010
    11 namespace HeuristicLab.Services.Authentication.ServiceClient
     11namespace HeuristicLab.Services.Authentication
    1212{
    1313    using System.Runtime.Serialization;
    … …  
    1818    [System.Runtime.Serialization.DataContractAttribute(Name="AuthItem", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
    1919        "Transfer")]
    20     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.NamedAuthItem))]
    21     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.Role))]
    22     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.Application))]
    23     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.User))]
     20    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.NamedAuthItem))]
     21    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Role))]
     22    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Application))]
     23    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.User))]
    2424    public partial class AuthItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
    2525    {
    … …  
    7474    [System.Runtime.Serialization.DataContractAttribute(Name="NamedAuthItem", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
    7575        "Transfer")]
    76     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.Role))]
    77     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.Application))]
    78     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.ServiceClient.User))]
    79     public partial class NamedAuthItem : HeuristicLab.Services.Authentication.ServiceClient.AuthItem
     76    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Role))]
     77    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.Application))]
     78    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Services.Authentication.User))]
     79    public partial class NamedAuthItem : HeuristicLab.Services.Authentication.AuthItem
    8080    {
    8181       
    … …  
    104104    [System.Runtime.Serialization.DataContractAttribute(Name="Role", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
    105105        "Transfer")]
    106     public partial class Role : HeuristicLab.Services.Authentication.ServiceClient.NamedAuthItem
     106    public partial class Role : HeuristicLab.Services.Authentication.NamedAuthItem
    107107    {
    108108       
    … …  
    169169    [System.Runtime.Serialization.DataContractAttribute(Name="Application", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
    170170        "Transfer")]
    171     public partial class Application : HeuristicLab.Services.Authentication.ServiceClient.NamedAuthItem
     171    public partial class Application : HeuristicLab.Services.Authentication.NamedAuthItem
    172172    {
    173173       
    … …  
    215215    [System.Runtime.Serialization.DataContractAttribute(Name="User", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Authentication.Data" +
    216216        "Transfer")]
    217     public partial class User : HeuristicLab.Services.Authentication.ServiceClient.NamedAuthItem
     217    public partial class User : HeuristicLab.Services.Authentication.NamedAuthItem
    218218    {
    219219       
    … …  
    448448   
    449449    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    450     [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HeuristicLab.Services.Authentication.ServiceClient.IAuthenticationService")]
     450    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HeuristicLab.Services.Authentication.IAuthenticationService")]
    451451    public interface IAuthenticationService
    452452    {
    453453       
    454454        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUser", ReplyAction="http://tempuri.org/IAuthenticationService/GetUserResponse")]
    455         HeuristicLab.Services.Authentication.ServiceClient.User GetUser(System.Guid id);
     455        HeuristicLab.Services.Authentication.User GetUser(System.Guid id);
    456456       
    457457        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUsers", ReplyAction="http://tempuri.org/IAuthenticationService/GetUsersResponse")]
    458         HeuristicLab.Services.Authentication.ServiceClient.User[] GetUsers(System.Guid applicationId);
     458        HeuristicLab.Services.Authentication.User[] GetUsers(System.Guid applicationId);
    459459       
    460460        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/InsertUser", ReplyAction="http://tempuri.org/IAuthenticationService/InsertUserResponse")]
    461         bool InsertUser(HeuristicLab.Services.Authentication.ServiceClient.User user);
     461        System.Guid InsertUser(HeuristicLab.Services.Authentication.User user);
    462462       
    463463        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteUser", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteUserResponse")]
    … …  
    465465       
    466466        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateUser", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateUserResponse")]
    467         bool UpdateUser(HeuristicLab.Services.Authentication.ServiceClient.User user);
     467        bool UpdateUser(HeuristicLab.Services.Authentication.User user);
    468468       
    469469        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/AddUserToRole", ReplyAction="http://tempuri.org/IAuthenticationService/AddUserToRoleResponse")]
    … …  
    474474       
    475475        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRolesForUser", ReplyAction="http://tempuri.org/IAuthenticationService/GetRolesForUserResponse")]
    476         HeuristicLab.Services.Authentication.ServiceClient.Role[] GetRolesForUser(System.Guid userId);
     476        HeuristicLab.Services.Authentication.Role[] GetRolesForUser(System.Guid userId);
    477477       
    478478        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRole", ReplyAction="http://tempuri.org/IAuthenticationService/GetRoleResponse")]
    479         HeuristicLab.Services.Authentication.ServiceClient.Role GetRole(System.Guid id);
     479        HeuristicLab.Services.Authentication.Role GetRole(System.Guid id);
    480480       
    481481        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetRoles", ReplyAction="http://tempuri.org/IAuthenticationService/GetRolesResponse")]
    482         HeuristicLab.Services.Authentication.ServiceClient.Role[] GetRoles(System.Guid applicationId);
     482        HeuristicLab.Services.Authentication.Role[] GetRoles(System.Guid applicationId);
    483483       
    484484        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/InsertRole", ReplyAction="http://tempuri.org/IAuthenticationService/InsertRoleResponse")]
    485         bool InsertRole(HeuristicLab.Services.Authentication.ServiceClient.Role role);
     485        System.Guid InsertRole(HeuristicLab.Services.Authentication.Role role);
    486486       
    487487        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateRole", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateRoleResponse")]
    488         bool UpdateRole(HeuristicLab.Services.Authentication.ServiceClient.Role role);
     488        bool UpdateRole(HeuristicLab.Services.Authentication.Role role);
    489489       
    490490        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteRole", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteRoleResponse")]
    … …  
    492492       
    493493        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetUsersInRole", ReplyAction="http://tempuri.org/IAuthenticationService/GetUsersInRoleResponse")]
    494         HeuristicLab.Services.Authentication.ServiceClient.User[] GetUsersInRole(System.Guid roleId);
     494        HeuristicLab.Services.Authentication.User[] GetUsersInRole(System.Guid roleId);
    495495       
    496496        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetApplication", ReplyAction="http://tempuri.org/IAuthenticationService/GetApplicationResponse")]
    497         HeuristicLab.Services.Authentication.ServiceClient.Application GetApplication(System.Guid id);
     497        HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id);
    498498       
    499499        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/InsertApplication", ReplyAction="http://tempuri.org/IAuthenticationService/InsertApplicationResponse")]
    500         bool InsertApplication(HeuristicLab.Services.Authentication.ServiceClient.Application application);
     500        System.Guid InsertApplication(HeuristicLab.Services.Authentication.Application application);
    501501       
    502502        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/DeleteApplication", ReplyAction="http://tempuri.org/IAuthenticationService/DeleteApplicationResponse")]
    … …  
    504504       
    505505        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/GetApplications", ReplyAction="http://tempuri.org/IAuthenticationService/GetApplicationsResponse")]
    506         HeuristicLab.Services.Authentication.ServiceClient.Application[] GetApplications();
     506        HeuristicLab.Services.Authentication.Application[] GetApplications();
     507       
     508        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAuthenticationService/UpdateApplication", ReplyAction="http://tempuri.org/IAuthenticationService/UpdateApplicationResponse")]
     509        bool UpdateApplication(HeuristicLab.Services.Authentication.Application application);
    507510    }
    508511   
    509512    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    510     public interface IAuthenticationServiceChannel : HeuristicLab.Services.Authentication.ServiceClient.IAuthenticationService, System.ServiceModel.IClientChannel
     513    public interface IAuthenticationServiceChannel : HeuristicLab.Services.Authentication.IAuthenticationService, System.ServiceModel.IClientChannel
    511514    {
    512515    }
    … …  
    514517    [System.Diagnostics.DebuggerStepThroughAttribute()]
    515518    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    516     public partial class AuthenticationServiceClient : System.ServiceModel.ClientBase<HeuristicLab.Services.Authentication.ServiceClient.IAuthenticationService>, HeuristicLab.Services.Authentication.ServiceClient.IAuthenticationService
     519    public partial class AuthenticationServiceClient : System.ServiceModel.ClientBase<HeuristicLab.Services.Authentication.IAuthenticationService>, HeuristicLab.Services.Authentication.IAuthenticationService
    517520    {
    518521       
    … …  
    541544        }
    542545       
    543         public HeuristicLab.Services.Authentication.ServiceClient.User GetUser(System.Guid id)
     546        public HeuristicLab.Services.Authentication.User GetUser(System.Guid id)
    544547        {
    545548            return base.Channel.GetUser(id);
    546549        }
    547550       
    548         public HeuristicLab.Services.Authentication.ServiceClient.User[] GetUsers(System.Guid applicationId)
     551        public HeuristicLab.Services.Authentication.User[] GetUsers(System.Guid applicationId)
    549552        {
    550553            return base.Channel.GetUsers(applicationId);
    551554        }
    552555       
    553         public bool InsertUser(HeuristicLab.Services.Authentication.ServiceClient.User user)
     556        public System.Guid InsertUser(HeuristicLab.Services.Authentication.User user)
    554557        {
    555558            return base.Channel.InsertUser(user);
    … …  
    561564        }
    562565       
    563         public bool UpdateUser(HeuristicLab.Services.Authentication.ServiceClient.User user)
     566        public bool UpdateUser(HeuristicLab.Services.Authentication.User user)
    564567        {
    565568            return base.Channel.UpdateUser(user);
    … …  
    576579        }
    577580       
    578         public HeuristicLab.Services.Authentication.ServiceClient.Role[] GetRolesForUser(System.Guid userId)
     581        public HeuristicLab.Services.Authentication.Role[] GetRolesForUser(System.Guid userId)
    579582        {
    580583            return base.Channel.GetRolesForUser(userId);
    581584        }
    582585       
    583         public HeuristicLab.Services.Authentication.ServiceClient.Role GetRole(System.Guid id)
     586        public HeuristicLab.Services.Authentication.Role GetRole(System.Guid id)
    584587        {
    585588            return base.Channel.GetRole(id);
    586589        }
    587590       
    588         public HeuristicLab.Services.Authentication.ServiceClient.Role[] GetRoles(System.Guid applicationId)
     591        public HeuristicLab.Services.Authentication.Role[] GetRoles(System.Guid applicationId)
    589592        {
    590593            return base.Channel.GetRoles(applicationId);
    591594        }
    592595       
    593         public bool InsertRole(HeuristicLab.Services.Authentication.ServiceClient.Role role)
     596        public System.Guid InsertRole(HeuristicLab.Services.Authentication.Role role)
    594597        {
    595598            return base.Channel.InsertRole(role);
    596599        }
    597600       
    598         public bool UpdateRole(HeuristicLab.Services.Authentication.ServiceClient.Role role)
     601        public bool UpdateRole(HeuristicLab.Services.Authentication.Role role)
    599602        {
    600603            return base.Channel.UpdateRole(role);
    … …  
    606609        }
    607610       
    608         public HeuristicLab.Services.Authentication.ServiceClient.User[] GetUsersInRole(System.Guid roleId)
     611        public HeuristicLab.Services.Authentication.User[] GetUsersInRole(System.Guid roleId)
    609612        {
    610613            return base.Channel.GetUsersInRole(roleId);
    611614        }
    612615       
    613         public HeuristicLab.Services.Authentication.ServiceClient.Application GetApplication(System.Guid id)
     616        public HeuristicLab.Services.Authentication.Application GetApplication(System.Guid id)
    614617        {
    615618            return base.Channel.GetApplication(id);
    616619        }
    617620       
    618         public bool InsertApplication(HeuristicLab.Services.Authentication.ServiceClient.Application application)
     621        public System.Guid InsertApplication(HeuristicLab.Services.Authentication.Application application)
    619622        {
    620623            return base.Channel.InsertApplication(application);
    … …  
    626629        }
    627630       
    628         public HeuristicLab.Services.Authentication.ServiceClient.Application[] GetApplications()
     631        public HeuristicLab.Services.Authentication.Application[] GetApplications()
    629632        {
    630633            return base.Channel.GetApplications();
    631634        }
     635       
     636        public bool UpdateApplication(HeuristicLab.Services.Authentication.Application application)
     637        {
     638            return base.Channel.UpdateApplication(application);
     639        }
    632640    }
    633641}

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/GenerateServiceClients.cmd

    r4789 r4962  
    11echo off
    22
    3 echo.
     3echo
    44echo *******************************************************************************************
    55echo Generating OKBService client
    6 echo.
     6echo
    77
    88svcutil.exe ^
    9 http://localhost:8732/Design_Time_Addresses/OKB-3.3/AuthenticationService/mex ^
     9http://localhost:8732/Design_Time_Addresses/HeuristicLab.Services.Authentication/AuthenticationService/mex ^
    1010/out:AuthenticationServiceClient ^
    11 /namespace:*,HeuristicLab.Services.Authentication.ServiceClient ^
     11/namespace:*,HeuristicLab.Services.Authentication ^
    1212/targetClientVersion:Version35 ^
    1313/enableDataBinding ^
    1414/config:..\app.config
    1515
    16 echo.
     16echo
    1717echo ---------------------------------------------------------------------------------------
    1818echo !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!!
    19 echo.
     19echo
    2020echo Following modifications have to be done manually in generated data contracts:
    2121echo  * Remove method "protected void RaisePropertyChanged(string propertyName)" in OKBItem
    22 echo.
     22echo
    2323echo !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!! ATTENTION !!!
    2424echo ---------------------------------------------------------------------------------------
    25 echo.
     25echo
    2626echo Generation of OKBService client finished.
    2727echo *******************************************************************************************
    28 echo.
    29 echo.
     28echo
     29echo
    3030echo *******************************************************************************************
    3131echo Generating AuthenticationService client
    32 echo.
     32echo
    3333
    3434

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/Role.cs

    r4927 r4962  
    44using System.Text;
    55
    6 namespace HeuristicLab.Services.Authentication.ServiceClient
     6namespace HeuristicLab.Services.Authentication
    77{
    88    public partial class Role
    99    {
     10
     11        //  IEnumerable<User> Users;
     12
    1013    }
    1114}

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/ServiceClients/User.cs

    r4927 r4962  
    44using System.Text;
    55
    6 namespace HeuristicLab.Services.Authentication.ServiceClient
     6namespace HeuristicLab.Services.Authentication
    77{
    88    public partial class User
    99    {
     10        // IEnumerable<Role> Roles
     11
    1012    }
    1113}

  • branches/UserManagement/HeuristicLab.Services.Authentication.ServiceClients/app.config

    r4927 r4962  
    1 <?xml version="1.0" encoding="utf-8"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    3   <system.serviceModel>
    4     <bindings>
    5       <wsHttpBinding>
    6      
    7         <binding name="WSHttpBinding_IAuthenticationService" closeTimeout="00:01:00"
    8             openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    9             bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    10             maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    11             messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
    12             allowCookies="false">
    13           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    14               maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    15           <reliableSession ordered="true" inactivityTimeout="00:10:00"
    16               enabled="false" />
    17           <security mode="Message">
    18             <transport clientCredentialType="Windows" proxyCredentialType="None"
    19                 realm="" />
    20             <message clientCredentialType="UserName" negotiateServiceCredential="true"
    21                 algorithmSuite="Default" />
    22           </security>
    23         </binding>
    24       </wsHttpBinding>
    25     </bindings>
    26     <client>
    27      
    28       <endpoint address="http://localhost:8732/Design_Time_Addresses/HeuristicLab.Services.Authentication/AuthenticationService"
    29           binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAuthenticationService"
    30           contract="HeuristicLab.Services.Authentication.IAuthenticationService"
    31           name="WSHttpBinding_IAuthenticationService">
    32         <identity>
    33           <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
    34         </identity>
    35       </endpoint>
    36     </client>
    37   </system.serviceModel>
     3    <system.serviceModel>
     4        <bindings>
     5            <wsHttpBinding>
     6                <binding name="WSHttpBinding_IAuthenticationService" closeTimeout="00:01:00"
     7                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
     8                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
     9                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
     10                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
     11                    allowCookies="false">
     12                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
     13                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
     14                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
     15                        enabled="false" />
     16                    <security mode="Message">
     17                        <transport clientCredentialType="Windows" proxyCredentialType="None"
     18                            realm="" />
     19                        <message clientCredentialType="UserName" negotiateServiceCredential="true"
     20                            algorithmSuite="Default" />
     21                    </security>
     22                </binding>
     23            </wsHttpBinding>
     24        </bindings>
     25        <client>
     26            <endpoint address="http://localhost:8732/Design_Time_Addresses/HeuristicLab.Services.Authentication/AuthenticationService"
     27                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAuthenticationService"
     28                contract="HeuristicLab.Services.Authentication.IAuthenticationService"
     29                name="WSHttpBinding_IAuthenticationService">
     30                <identity>
     31                    <certificate encodedValue="AwAAAAEAAAAUAAAAAV7xMfFtgnY5+8sJyWRHHa0QvTcgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhBXQX+6QCO6m0LTqFCaKnh3MAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDkyNzE5MTIxNFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDa4H45oXaRry7PwK3dI6AJWpxyEqmDBP+SnIZelLsPfWQ1oFPqH1zygaza0ZP+Gq5kxrL2cRrS9eiq/AlacWMOFsIEM6SZ/HBsaA9IiHssv3KH4uKwjcOWP1/TwL1OlwGDJszXrGmslrdFXg6I3grFlks8nYPVmuIzwVfmUKO+nwIDAQABo0kwRzBFBgNVHQEEPjA8gBDRH5aGMOUZ99XrCILH02uuoRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghBXQX+6QCO6m0LTqFCaKnh3MAkGBSsOAwIdBQADgYEAtRZiYmZ7mKH0wkDd8v+33g8KU8mFiBS26hUowCpcCvYpG23FaVXbBua+zTt45RIBcEQUVdLOdtIAMogymV4sq9JafaU2Y9Dh9gnSqOF2KplC/xyf5f+QWwCZ4Yljr9g1BizWoOE6SF1TcjL66iZ09JMwYJKO9V3iuOosnzJ8DEA=" />
     32                </identity>
     33            </endpoint>
     34        </client>
     35    </system.serviceModel>
    3836</configuration>

  • branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/HeuristicLab.Services.Authentication.TestClient2.csproj

    r4789 r4962  
    3838    <Reference Include="System.Core" />
    3939    <Reference Include="System.Drawing" />
     40    <Reference Include="System.Runtime.Serialization" />
     41    <Reference Include="System.ServiceModel" />
    4042    <Reference Include="System.Windows.Forms" />
    4143    <Reference Include="System.Xml.Linq" />
    … …  
    6062      <Name>HeuristicLab.Services.Authentication.DataTransfer</Name>
    6163    </ProjectReference>
     64    <ProjectReference Include="..\HeuristicLab.Services.Authentication.ServiceClients\HeuristicLab.Services.Authentication.ServiceClient.csproj">
     65      <Project>{8E698904-936D-4C7A-AB0D-6225778D2968}</Project>
     66      <Name>HeuristicLab.Services.Authentication.ServiceClient</Name>
     67    </ProjectReference>
    6268    <ProjectReference Include="..\HeuristicLab.Services.Authentication\HeuristicLab.Services.Authentication.csproj">
    6369      <Project>{9FD3F26D-B051-4F4C-9C66-4A361EE357AD}</Project>
    … …  
    7177  </ItemGroup>
    7278  <ItemGroup>
     79    <None Include="app.config" />
     80    <None Include="HeuristicLab.snk" />
    7381    <None Include="Properties\DataSources\HeuristicLab.Services.Authentication.DataTransfer.Application.datasource" />
    7482    <None Include="Properties\DataSources\HeuristicLab.Services.Authentication.DataTransfer.Role.datasource" />
    7583    <None Include="Properties\DataSources\HeuristicLab.Services.Authentication.DataTransfer.User.datasource" />
     84  </ItemGroup>
     85  <ItemGroup>
     86    <WCFMetadata Include="Service References\" />
    7687  </ItemGroup>
    7788  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/UserManagement/HeuristicLab.Services.Authentication.TestClient2/Program.cs

    r4789 r4962  
    44using System.Text;
    55using HeuristicLab.Services.Authentication.DataTransfer;
     6using HeuristicLab.Services.Authentication;
     7using System.ServiceModel.Security;
     8using HeuristicLab.Services.Authentication.ServiceClients;
    69
    710namespace HeuristicLab.Services.Authentication.TestClient2
    … …  
    1114        static void Main(string[] args)
    1215        {
    13             System.Windows.Forms.Application.Run(new UserManagement());
     16            IEnumerable<Application> apps = AuthenticationClient.Instance.Applications;
     17
     18            foreach (Application app in apps)
     19            {
     20                Console.WriteLine(app.Name);
     21            }
     22            Console.ReadLine();
     23
     24            //System.Windows.Forms.Application.Run(new UserManagement());
    1425        }
    1526    }

  • branches/UserManagement/HeuristicLab.Services.Authentication/AuthenticationService.cs

    r4926 r4962  
    5252        }
    5353
    54         public bool InsertUser(User user)
     54        public Guid InsertUser(User user)
    5555        {
    5656            if (user != null)
    … …  
    7171                    catch (Exception ex)
    7272                    {
    73                         return false;
    74                     }
    75 
    76                     return true;
    77 
    78 
    79                 }
    80 
    81             }
    82             return false;
     73                        return Guid.Empty;
     74                    }
     75
     76                    return user.Id;
     77
     78
     79                }
     80
     81            }
     82            return Guid.Empty;
    8383        }
    8484
    … …  
    170170        }
    171171
    172         public bool InsertRole(Role role)
     172        public Guid InsertRole(Role role)
    173173        {
    174174
    … …  
    188188                    catch (Exception ex)
    189189                    {
    190                         return false;
    191                     }
    192 
    193                     return true;
    194                 }
    195 
    196             }
    197             return false;
     190                        return Guid.Empty;
     191                    }
     192
     193                    return role.Id;
     194                }
     195
     196            }
     197            return Guid.Empty;
    198198        }
    199199
    … …  
    353353        #region Application
    354354
    355         public bool InsertApplication(Application application)
     355        public Guid InsertApplication(Application application)
    356356        {
    357357            if (application != null)
    … …  
    370370                    catch (Exception ex)
    371371                    {
    372                         return false;
    373                     }
    374 
    375                     return true;
    376 
    377                 }
    378 
    379             }
    380             return false;
     372                        return Guid.Empty;
     373                    }
     374
     375                    return application.Id;
     376
     377                }
     378
     379            }
     380            return Guid.Empty;
    381381        }
    382382

  • branches/UserManagement/HeuristicLab.Services.Authentication/HeuristicLab.Services.Authentication.csproj

    r4940 r4962  
    5151  </ItemGroup>
    5252  <ItemGroup>
    53     <None Include="App.config" />
     53    <None Include="App.config">
     54      <SubType>Designer</SubType>
     55    </None>
    5456    <None Include="HeuristicLab.snk" />
    5557  </ItemGroup>

  • branches/UserManagement/HeuristicLab.Services.Authentication/Interfaces/IAuthenticationService.cs

    r4926 r4962  
    2020
    2121        [OperationContract]
    22         bool InsertUser(User user);
     22        Guid InsertUser(User user);
    2323
    2424        [OperationContract]
    … …  
    5050
    5151        [OperationContract]
    52         bool InsertRole(Role role);
     52        Guid InsertRole(Role role);
    5353
    5454        [OperationContract]
    … …  
    6969
    7070        [OperationContract]
    71         bool InsertApplication(Application application);
     71        Guid InsertApplication(Application application);
    7272
    7373        [OperationContract]
    … …  
    7777        IEnumerable<DataTransfer.Application> GetApplications();
    7878
     79
     80        [OperationContract]
     81        bool UpdateApplication(Application application);
     82
    7983        #endregion
    8084

  • branches/UserManagement/HeuristicLab.Services.Authentication/app.config

    r4926 r4962  
    2828  <system.serviceModel>
    2929    <bindings>
    30       <netTcpBinding>
    31         <binding name="DefaultNetTcpBinding" openTimeout="00:00:30" receiveTimeout="00:00:30"
    32           sendTimeout="00:00:30" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
    33           <readerQuotas maxArrayLength="2147483647" />
    34           <reliableSession inactivityTimeout="00:00:30" enabled="false" />
    35           <security mode="Message">
    36             <message clientCredentialType="UserName" />
    37           </security>
    38         </binding>
    39       </netTcpBinding>
    4030      <wsHttpBinding>
    41         <binding name="DefaultWsHttpBinding" maxReceivedMessageSize="200000000">
    42           <readerQuotas maxArrayLength="200000000" maxBytesPerRead="200000000" />
     31        <binding name="DefaultWSHttpBinding">
    4332          <security mode="Message">
    4433            <message clientCredentialType="UserName" />
    … …  
    4635        </binding>
    4736      </wsHttpBinding>
     37
    4838      <mexHttpBinding>
    49         <binding name="DefaultMexHttpBinding" />
     39        <binding name="DefaultMexBinding" />
    5040      </mexHttpBinding>
    5141    </bindings>
    5242
    53    
     43
    5444    <behaviors>
    5545      <serviceBehaviors>
    56         <behavior name="DefaultServiceBehavior">
     46        <behavior name="DefaultBehavior">
    5747          <serviceMetadata httpGetEnabled="true" />
    5848          <serviceDebug includeExceptionDetailInFaults="true" />
    59           <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
     49          <serviceAuthorization principalPermissionMode="UseAspNetRoles"
     50            roleProviderName="AspNetSqlRoleProvider" />
    6051          <serviceCredentials>
    6152            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
    62             <userNameAuthentication  userNamePasswordValidationMode="Windows" />
     53            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider"
     54              membershipProviderName="AspNetSqlMembershipProvider" />
    6355          </serviceCredentials>
    6456        </behavior>
    … …  
    6759
    6860    <services>
    69       <service behaviorConfiguration="DefaultServiceBehavior" name="HeuristicLab.Services.Authentication.AuthenticationService">
    70         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding"
    71           name="mexHttpBinding" contract="IMetadataExchange">
    72           <identity>
    73             <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
    74           </identity>
     61      <service behaviorConfiguration="DefaultBehavior" name="HeuristicLab.Services.Authentication.AuthenticationService">
     62        <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWSHttpBinding"
     63          contract="HeuristicLab.Services.Authentication.IAuthenticationService" listenUriMode="Explicit">
    7564        </endpoint>
    76         <endpoint binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding"
    77           name="wsHttpBinding" contract="HeuristicLab.Services.Authentication.IAuthenticationService">
    78           <identity>
    79             <certificate encodedValue="AwAAAAEAAAAUAAAAD/AlkYJw/OUhl6D/9w8mjJBh39kgAAAAAQAAAPIBAAAwggHuMIIBW6ADAgECAhAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQAwFDESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTEwMDgyMDIyMzIwOFoXDTM5MTIzMTIzNTk1OVowFDESMBAGA1UEAxMJbG9jYWxob3N0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPkfCSLRX8/4F+Z4ys43yZ4MMzjB44cMakPz4Nri+mEB5n2z/0GFatCYzkI2f/nniWqVrBYjHkjsZy2EZioHu4wa99c1XEGJnFNDuNn6ESkfEyhyF4+OqKGnpK9HNrw7OWMuqn2oOh0iFd9fl6FTAm+Y0p3LP+38BuYzpCniqqdwIDAQABo0kwRzBFBgNVHQEEPjA8gBDvi8Rgio9v+mr58TiAvqF5oRYwFDESMBAGA1UEAxMJbG9jYWxob3N0ghAdEzTisaf2sEZxrqYZfYtCMAkGBSsOAwIdBQADgYEANdGlvHKeUptfNu9I0wgA5qjmVB+JDldOAkrfM0R+4IcVQ06y5K7P07uxQAV7+rhnDLgLyFJunUHgzbfjsjFy7vjwtoieXA5j0AYlm4AHR7dHt4HVgkIMYt8XOCqMw5jjFX91xJ89tC7mM9zYR48N9T5QSeMGo+f+JzybeLWxnNs=" />
    80           </identity>
     65       
     66        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexBinding"
     67          contract="IMetadataExchange" listenUriMode="Explicit">
    8168        </endpoint>
    8269        <host>
    … …  
    8774      </service>
    8875    </services>
     76   
    8977  </system.serviceModel>
    9078
Note: See TracChangeset for help on using the changeset viewer.