Skip to content

Commit 9f47a51

Browse files
mythzmythz
committed
Remove AuthFields / preconfigured names on AuthUserSession
1 parent 2ab87ae commit 9f47a51

2 files changed

Lines changed: 58 additions & 182 deletions

File tree

‎src/ServiceStack/AuthFields.cs‎

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎src/ServiceStack/AuthUserSession.cs‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -20,71 +20,71 @@ public AuthUserSession()
2020
this.Meta = new Dictionary<string, string>();
2121
}
2222

23-
[DataMember(Order = 01, Name = AuthFields.ReferrerUrl)] public string ReferrerUrl { get; set; }
24-
[DataMember(Order = 02, Name = AuthFields.Id)] public string Id { get; set; }
25-
[DataMember(Order = 03, Name = AuthFields.UserAuthId)] public string UserAuthId { get; set; }
23+
[DataMember(Order = 01)] public string ReferrerUrl { get; set; }
24+
[DataMember(Order = 02)] public string Id { get; set; }
25+
[DataMember(Order = 03)] public string UserAuthId { get; set; }
2626
/// <summary>
2727
/// User chosen Username when available or Email
2828
/// </summary>
29-
[DataMember(Order = 04, Name = AuthFields.UserAuthName)] public string UserAuthName { get; set; }
30-
[DataMember(Order = 05, Name = AuthFields.UserName)] public string UserName { get; set; }
31-
[DataMember(Order = 06, Name = AuthFields.TwitterUserId)] public string TwitterUserId { get; set; }
32-
[DataMember(Order = 07, Name = AuthFields.TwitterScreenName)] public string TwitterScreenName { get; set; }
33-
[DataMember(Order = 08, Name = AuthFields.FacebookUserId)] public string FacebookUserId { get; set; }
34-
[DataMember(Order = 09, Name = AuthFields.FacebookUserName)] public string FacebookUserName { get; set; }
35-
[DataMember(Order = 10, Name = AuthFields.FirstName)] public string FirstName { get; set; }
36-
[DataMember(Order = 11, Name = AuthFields.LastName)] public string LastName { get; set; }
37-
[DataMember(Order = 12, Name = AuthFields.DisplayName)] public string DisplayName { get; set; }
38-
[DataMember(Order = 13, Name = AuthFields.Company)] public string Company { get; set; }
39-
[DataMember(Order = 14, Name = AuthFields.Email)] public string Email { get; set; }
40-
[DataMember(Order = 15, Name = AuthFields.PrimaryEmail)] public string PrimaryEmail { get; set; }
41-
[DataMember(Order = 16, Name = AuthFields.PhoneNumber)] public string PhoneNumber { get; set; }
42-
[DataMember(Order = 17, Name = AuthFields.BirthDate)] public DateTime? BirthDate { get; set; }
43-
[DataMember(Order = 18, Name = AuthFields.BirthDateRaw)] public string BirthDateRaw { get; set; }
44-
[DataMember(Order = 19, Name = AuthFields.Address)] public string Address { get; set; }
45-
[DataMember(Order = 20, Name = AuthFields.Address2)] public string Address2 { get; set; }
46-
[DataMember(Order = 21, Name = AuthFields.City)] public string City { get; set; }
47-
[DataMember(Order = 22, Name = AuthFields.State)] public string State { get; set; }
48-
[DataMember(Order = 23, Name = AuthFields.Country)] public string Country { get; set; }
49-
[DataMember(Order = 24, Name = AuthFields.Culture)] public string Culture { get; set; }
50-
[DataMember(Order = 25, Name = AuthFields.FullName)] public string FullName { get; set; }
51-
[DataMember(Order = 26, Name = AuthFields.Gender)] public string Gender { get; set; }
52-
[DataMember(Order = 27, Name = AuthFields.Language)] public string Language { get; set; }
53-
[DataMember(Order = 28, Name = AuthFields.MailAddress)] public string MailAddress { get; set; }
54-
[DataMember(Order = 29, Name = AuthFields.Nickname)] public string Nickname { get; set; }
55-
[DataMember(Order = 30, Name = AuthFields.PostalCode)] public string PostalCode { get; set; }
56-
[DataMember(Order = 31, Name = AuthFields.TimeZone)] public string TimeZone { get; set; }
57-
[DataMember(Order = 32, Name = AuthFields.RequestTokenSecret)] public string RequestTokenSecret { get; set; }
58-
[DataMember(Order = 33, Name = AuthFields.CreatedAt)] public DateTime CreatedAt { get; set; }
59-
[DataMember(Order = 34, Name = AuthFields.LastModified)] public DateTime LastModified { get; set; }
60-
[DataMember(Order = 35, Name = AuthFields.Roles)] public List<string> Roles { get; set; }
61-
[DataMember(Order = 36, Name = AuthFields.Permissions)] public List<string> Permissions { get; set; }
62-
[DataMember(Order = 37, Name = AuthFields.IsAuthenticated)] public bool IsAuthenticated { get; set; }
63-
[DataMember(Order = 38, Name = AuthFields.FromToken)] public bool FromToken { get; set; }
64-
[DataMember(Order = 39, Name = AuthFields.ProfileUrl)] public string ProfileUrl { get; set; } //Avatar
65-
[DataMember(Order = 40, Name = AuthFields.Sequence)] public string Sequence { get; set; }
66-
[DataMember(Order = 41, Name = AuthFields.Tag)] public long Tag { get; set; }
67-
[DataMember(Order = 42, Name = AuthFields.AuthProvider)] public string AuthProvider { get; set; }
68-
[DataMember(Order = 43, Name = AuthFields.ProviderOAuthAccess)] public List<IAuthTokens> ProviderOAuthAccess { get; set; }
69-
[DataMember(Order = 44, Name = AuthFields.Meta)] public Dictionary<string, string> Meta { get; set; }
29+
[DataMember(Order = 04)] public string UserAuthName { get; set; }
30+
[DataMember(Order = 05)] public string UserName { get; set; }
31+
[DataMember(Order = 06)] public string TwitterUserId { get; set; }
32+
[DataMember(Order = 07)] public string TwitterScreenName { get; set; }
33+
[DataMember(Order = 08)] public string FacebookUserId { get; set; }
34+
[DataMember(Order = 09)] public string FacebookUserName { get; set; }
35+
[DataMember(Order = 10)] public string FirstName { get; set; }
36+
[DataMember(Order = 11)] public string LastName { get; set; }
37+
[DataMember(Order = 12)] public string DisplayName { get; set; }
38+
[DataMember(Order = 13)] public string Company { get; set; }
39+
[DataMember(Order = 14)] public string Email { get; set; }
40+
[DataMember(Order = 15)] public string PrimaryEmail { get; set; }
41+
[DataMember(Order = 16)] public string PhoneNumber { get; set; }
42+
[DataMember(Order = 17)] public DateTime? BirthDate { get; set; }
43+
[DataMember(Order = 18)] public string BirthDateRaw { get; set; }
44+
[DataMember(Order = 19)] public string Address { get; set; }
45+
[DataMember(Order = 20)] public string Address2 { get; set; }
46+
[DataMember(Order = 21)] public string City { get; set; }
47+
[DataMember(Order = 22)] public string State { get; set; }
48+
[DataMember(Order = 23)] public string Country { get; set; }
49+
[DataMember(Order = 24)] public string Culture { get; set; }
50+
[DataMember(Order = 25)] public string FullName { get; set; }
51+
[DataMember(Order = 26)] public string Gender { get; set; }
52+
[DataMember(Order = 27)] public string Language { get; set; }
53+
[DataMember(Order = 28)] public string MailAddress { get; set; }
54+
[DataMember(Order = 29)] public string Nickname { get; set; }
55+
[DataMember(Order = 30)] public string PostalCode { get; set; }
56+
[DataMember(Order = 31)] public string TimeZone { get; set; }
57+
[DataMember(Order = 32)] public string RequestTokenSecret { get; set; }
58+
[DataMember(Order = 33)] public DateTime CreatedAt { get; set; }
59+
[DataMember(Order = 34)] public DateTime LastModified { get; set; }
60+
[DataMember(Order = 35)] public List<string> Roles { get; set; }
61+
[DataMember(Order = 36)] public List<string> Permissions { get; set; }
62+
[DataMember(Order = 37)] public bool IsAuthenticated { get; set; }
63+
[DataMember(Order = 38)] public bool FromToken { get; set; }
64+
[DataMember(Order = 39)] public string ProfileUrl { get; set; } //Avatar
65+
[DataMember(Order = 40)] public string Sequence { get; set; }
66+
[DataMember(Order = 41)] public long Tag { get; set; }
67+
[DataMember(Order = 42)] public string AuthProvider { get; set; }
68+
[DataMember(Order = 43)] public List<IAuthTokens> ProviderOAuthAccess { get; set; }
69+
[DataMember(Order = 44)] public Dictionary<string, string> Meta { get; set; }
7070

7171
//Claims https://docs.microsoft.com/en-us/previous-versions/windows-identity-foundation/ee727097(v=msdn.10)
72-
[DataMember(Order = 45, Name = AuthFields.Audiences)] public List<string> Audiences { get; set; }
73-
[DataMember(Order = 46, Name = AuthFields.Scopes)] public List<string> Scopes { get; set; }
74-
[DataMember(Order = 47, Name = AuthFields.Dns)] public string Dns { get; set; }
75-
[DataMember(Order = 48, Name = AuthFields.Rsa)] public string Rsa { get; set; }
76-
[DataMember(Order = 49, Name = AuthFields.Sid)] public string Sid { get; set; }
77-
[DataMember(Order = 50, Name = AuthFields.Hash)] public string Hash { get; set; }
78-
[DataMember(Order = 51, Name = AuthFields.HomePhone)] public string HomePhone { get; set; }
79-
[DataMember(Order = 52, Name = AuthFields.MobilePhone)] public string MobilePhone { get; set; }
80-
[DataMember(Order = 53, Name = AuthFields.Webpage)] public string Webpage { get; set; }
72+
[DataMember(Order = 45)] public List<string> Audiences { get; set; }
73+
[DataMember(Order = 46)] public List<string> Scopes { get; set; }
74+
[DataMember(Order = 47)] public string Dns { get; set; }
75+
[DataMember(Order = 48)] public string Rsa { get; set; }
76+
[DataMember(Order = 49)] public string Sid { get; set; }
77+
[DataMember(Order = 50)] public string Hash { get; set; }
78+
[DataMember(Order = 51)] public string HomePhone { get; set; }
79+
[DataMember(Order = 52)] public string MobilePhone { get; set; }
80+
[DataMember(Order = 53)] public string Webpage { get; set; }
8181

8282
//IdentityUser<TKey>
83-
[DataMember(Order = 54, Name = AuthFields.EmailConfirmed)] public bool? EmailConfirmed { get; set; }
84-
[DataMember(Order = 55, Name = AuthFields.PhoneNumberConfirmed)] public bool? PhoneNumberConfirmed { get; set; }
85-
[DataMember(Order = 56, Name = AuthFields.TwoFactorEnabled)] public bool? TwoFactorEnabled { get; set; }
86-
[DataMember(Order = 57, Name = AuthFields.SecurityStamp)] public string SecurityStamp { get; set; }
87-
[DataMember(Order = 58, Name = AuthFields.Type)] public string Type { get; set; }
83+
[DataMember(Order = 54)] public bool? EmailConfirmed { get; set; }
84+
[DataMember(Order = 55)] public bool? PhoneNumberConfirmed { get; set; }
85+
[DataMember(Order = 56)] public bool? TwoFactorEnabled { get; set; }
86+
[DataMember(Order = 57)] public string SecurityStamp { get; set; }
87+
[DataMember(Order = 58)] public string Type { get; set; }
8888

8989
public virtual bool IsAuthorized(string provider)
9090
{

0 commit comments

Comments
 (0)