Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/08/11 14:39:29 (14 years ago)
Author:
mjesner
Message:

#1196

Location:
branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r4979 r5257  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    222using System.Collections.Generic;
    323using System.Linq;
    … …  
    525using System.Runtime.Serialization;
    626
    7 namespace HeuristicLab.Services.Authentication.DataTransfer
    8 {
     27namespace HeuristicLab.Services.Authentication.DataTransfer {
     28
    929  [DataContract]
    10   public class Application : NamedAuthenticationItem {
    11    
    12    
    13    
    14     //[DataMember]
    15     //public string LoweredApplicationName { get; set; } // !!! REMOVE
     30  public class Application : AuthenticationItem {
     31  }
    1632
    17     [DataMember]
    18     public string Description { get; set; }
    19 
    20   }
    21     //[DataContract]
    22     //public class Application : NamedAuthItem {
    23     //    [DataMember]
    24     //    public Guid ApplicationId { get; set; }
    25     //    [DataMember]
    26     //    public string ApplicationName { get; set; }
    27     //    [DataMember]
    28     //    public string LoweredApplicationName { get; set; }
    29     //    [DataMember]
    30     //    public string Description { get; set; }
    31     //}
    3233}

  • branches/UserManagement/HeuristicLab.Services.Authentication.DataTransfer/AuthenticationItem.cs

    r4979 r5257  
    1 using System.Runtime.Serialization;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System.Runtime.Serialization;
    222
    3 namespace HeuristicLab.Services.Authentication.DataTransfer
    4 {
     23namespace HeuristicLab.Services.Authentication.DataTransfer {
     24
    525  [DataContract]
    6   public abstract class AuthenticationItem{
    7 
     26  public abstract class AuthenticationItem {
    827
    928    [DataMember]
    1029    public System.Guid Id { get; set; }
     30
     31    [DataMember]
     32    public string Name { get; set; }
     33
     34    [DataMember]
     35    public string Description { get; set; }
    1136  }
    1237}

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

    r4979 r5257  
    4444    <Compile Include="Application.cs" />
    4545    <Compile Include="AuthenticationItem.cs" />
    46     <Compile Include="NamedAuthenticationItem.cs" />
    4746    <Compile Include="Role.cs" />
    4847    <Compile Include="User.cs" />

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

    r4979 r5257  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    222using System.Collections.Generic;
    323using System.Linq;
    … …  
    525using System.Runtime.Serialization;
    626
    7 namespace HeuristicLab.Services.Authentication.DataTransfer
    8 {
     27namespace HeuristicLab.Services.Authentication.DataTransfer {
     28
    929  [DataContract]
    10   public class Role : NamedAuthenticationItem {
     30  public class Role : AuthenticationItem {
    1131
    12       public Role()
    13       {
    14           Name = "";
    15       }
     32    public Role() {
     33      ApplicationId = Guid.Empty;
     34    }
    1635
    1736    [DataMember]
    1837    public Guid ApplicationId { get; set; }
    19     //[DataMember]
    20     //public string LoweredRoleName { get; set; } // !!! REMOVE
    21     [DataMember]
    22     public string Description { get; set; }
    2338  }
    24     //[DataContract]
    25     //public class Role
    26     //{
    27     //    [DataMember]
    28     //    public Guid ApplicationId { get; set; }
    29     //    [DataMember]
    30     //    public Guid RoleId { get; set; }
    31     //    [DataMember]
    32     //    public string RoleName { get; set; }
    33         //[DataMember]
    34         //public string LoweredRoleName { get; set; }
    35     //    [DataMember]
    36     //    public string Description { get; set; }
    37     //}
    3839}

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

    r4979 r5257  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21using System;
    222using System.Collections.Generic;
    323using System.Linq;
    … …  
    525using System.Runtime.Serialization;
    626
    7 namespace HeuristicLab.Services.Authentication.DataTransfer
    8 {
     27namespace HeuristicLab.Services.Authentication.DataTransfer {
     28
    929  [DataContract]
    10   public class User : NamedAuthenticationItem {
     30  public class User : AuthenticationItem {
    1131
    12       public User()
    13       {
    14           Password = "";
    15           PasswordSalt = "";
    16           Name = "";
    17           CreateDate = DateTime.Now;
    18           LastActivityDate = DateTime.Now;
    19           LastLoginDate = DateTime.Now;
    20           LastLockoutDate = DateTime.Now;
    21           LastPasswordChangeDate = DateTime.Now;
    22       }
     32    public User() {
     33      Name = string.Empty;
     34      Email = string.Empty;
     35      ApplicationId = Guid.Empty;
     36      CreateDate = DateTime.Now;
     37      LastActivityDate = DateTime.Now;
     38      LastLoginDate = DateTime.Now;
     39      LastLockoutDate = DateTime.Now;
     40      LastPasswordChangeDate = DateTime.Now;
     41    }
    2342
    24     // Member of Membership
    2543    [DataMember]
    26     public Guid ApplicationId { get; set; } // Membership
     44    public Guid ApplicationId { get; set; }
     45
    2746    [DataMember]
    28     public string Password { get; set; } // Membership
    29     //[DataMember]
    30     //public string PasswordFormat { get; set; } // Membership
     47    public string Email { get; set; }
     48
    3149    [DataMember]
    32     public string PasswordSalt { get; set; } // Membership
    33    
    34     /// Change PW ?! welcher Hash in DB
     50    public bool IsApproved { get; set; }
    3551
     52    [DataMember]
     53    public bool IsLookedOut { get; set; }
    3654
    37     //[DataMember]
    38     //public string MobilePIN { get; set; } // Membership
    3955    [DataMember]
    40     public string Email { get; set; } // Membership
    41     //[DataMember]
    42     //public string LoweredEmail { get; set; } // Membership
    43     //[DataMember]
    44     //public string PasswordQuestion { get; set; } // Membership
    45     //[DataMember]
    46     //public string PasswordAnswer { get; set; } // Membership
     56    public DateTime CreateDate { get; set; }
     57
    4758    [DataMember]
    48     public bool IsApproved { get; set; } // Membership
     59    public DateTime LastLoginDate { get; set; }
     60
    4961    [DataMember]
    50     public bool IsLookedOut { get; set; } // Membership
     62    public DateTime LastPasswordChangeDate { get; set; }
     63
    5164    [DataMember]
    52     public DateTime CreateDate { get; set; } // Membership
     65    public DateTime LastLockoutDate { get; set; }
     66
    5367    [DataMember]
    54     public DateTime LastLoginDate { get; set; } // Membership
    55     [DataMember]
    56     public DateTime LastPasswordChangeDate { get; set; } // Memership
    57     [DataMember]
    58     public DateTime LastLockoutDate { get; set; } // Membership
    59     //[DataMember]
    60     //public int FailedPasswordAttemptCount { get; set; } // Membership
    61     //[DataMember]
    62     //public DateTime FailedPasswordAttemptWindowStart { get; set; } // Membership
    63     //[DataMember]
    64     //public int FailedPasswordAnswerAttemptCount { get; set; } // Membership
    65     //[DataMember]
    66     //public DateTime FailedPasswordAnswerAttemptWindowStart { get; set; } // Membership
    67     [DataMember]
    68     public string Comment { get; set; } // Membership
    69     // Members of User
    70     //[DataMember]
    71     //public string LoweredUserName { get; set; } // User
    72     //[DataMember]
    73     //public string MobileAlias { get; set; } // User
    74     //[DataMember]
    75     //public bool IsAnonymous { get; set; } // User
    76     [DataMember]
    77     public DateTime LastActivityDate { get; set; } // User
    78 
     68    public DateTime LastActivityDate { get; set; }
    7969  }
    80 
    81 
    82 
    83     //[DataContract]
    84     //public class User
    85     //{
    86 
    87     //    public User()
    88     //    {
    89     //        Membership = new Membership();
    90     //    }
    91 
    92     //    [DataMember]
    93     //    public Membership Membership { get; set; }
    94 
    95     //    [DataMember]
    96     //    public string Email
    97     //    {
    98     //        get { return Membership.Email; }
    99     //        set { Membership.Email = value; }
    100     //    }
    101     //    [DataMember]
    102     //    public string Password
    103     //    {
    104     //        get { return Membership.Password; }
    105     //        set { Membership.Password = value; }
    106     //    }
    107     //    [DataMember]
    108     //    public string PasswordQuestion
    109     //    {
    110     //        get { return Membership.PasswordQuestion; }
    111     //        set { this.Membership.PasswordQuestion = value; }
    112     //    }
    113     //    [DataMember]
    114     //    public Guid ApplicationId { get; set; }
    115     //    [DataMember]
    116     //    public Guid UserId { get; set; }
    117     //    [DataMember]
    118     //    public string UserName { get; set; }
    119     //    [DataMember]
    120     //    public string LoweredUserName { get; set; }
    121     //    [DataMember]
    122     //    public string MobileAlias { get; set; }
    123     //    [DataMember]
    124     //    public bool IsAnonymous { get; set; }
    125     //    [DataMember]
    126     //    public DateTime LastActivityDate { get; set; }
    127 
    128     //}
    12970}
Note: See TracChangeset for help on using the changeset viewer.