@@ -24,7 +24,8 @@ public JwtSecurityToken Build()
24
24
{
25
25
EnsureArguments ( ) ;
26
26
27
- claims . Add ( new Claim ( JwtRegisteredClaimNames . Jti , Guid . NewGuid ( ) . ToString ( ) ) ) ;
27
+ AddClaim ( JwtRegisteredClaimNames . Jti , Guid . NewGuid ( ) . ToString ( ) ) ;
28
+ AddClaim ( JwtRegisteredClaimNames . Iat , DateTime . UtcNow . ToString ( ) ) ;
28
29
29
30
var token = new JwtSecurityToken (
30
31
issuer : issuer ,
@@ -69,7 +70,7 @@ public JwtTokenBuilder AddSecurityKey(SecurityKey securityKey)
69
70
public JwtTokenBuilder AddSubject ( string subject )
70
71
{
71
72
this . subject = subject ;
72
- claims . Add ( new Claim ( JwtRegisteredClaimNames . Sub , this . subject ) ) ;
73
+ AddClaim ( JwtRegisteredClaimNames . Sub , this . subject ) ;
73
74
return this ;
74
75
}
75
76
@@ -79,6 +80,7 @@ public JwtTokenBuilder AddSubject(string subject)
79
80
public JwtTokenBuilder AddIssuer ( string issuer )
80
81
{
81
82
this . issuer = issuer ;
83
+ AddClaim ( JwtRegisteredClaimNames . Iss , issuer ) ;
82
84
return this ;
83
85
}
84
86
@@ -88,6 +90,7 @@ public JwtTokenBuilder AddIssuer(string issuer)
88
90
public JwtTokenBuilder AddAudience ( string audience )
89
91
{
90
92
this . audience = audience ;
93
+ AddClaim ( JwtRegisteredClaimNames . Aud , audience ) ;
91
94
return this ;
92
95
}
93
96
@@ -109,11 +112,7 @@ public JwtTokenBuilder AddExpiry(int expiryInDays)
109
112
/// <returns></returns>
110
113
public JwtTokenBuilder AddRole ( string value )
111
114
{
112
- if ( value != null )
113
- {
114
- claims . Add ( new Claim ( ClaimTypes . Role , value ) ) ;
115
- }
116
- return this ;
115
+ return AddClaim ( ClaimTypes . Role , value ) ;
117
116
}
118
117
119
118
/// <summary>
@@ -123,31 +122,19 @@ public JwtTokenBuilder AddRole(string value)
123
122
/// <returns></returns>
124
123
public JwtTokenBuilder AddName ( string value )
125
124
{
126
- if ( value != null )
127
- {
128
- claims . Add ( new Claim ( ClaimTypes . Name , value ) ) ;
129
- }
130
- return this ;
125
+ return AddClaim ( ClaimTypes . Name , value ) ;
131
126
}
132
127
133
128
#region [Custom Claims]
134
129
135
130
public JwtTokenBuilder AddUserId ( string value )
136
131
{
137
- if ( value != null )
138
- {
139
- claims . Add ( new Claim ( CustomClaims . UserIdentifier , value ) ) ;
140
- }
141
- return this ;
132
+ return AddClaim ( CustomClaims . UserIdentifier , value ) ;
142
133
}
143
134
144
135
public JwtTokenBuilder AddCompanyId ( string value )
145
136
{
146
- if ( value != null )
147
- {
148
- claims . Add ( new Claim ( CustomClaims . CompanyIdentifier , value ) ) ;
149
- }
150
- return this ;
137
+ return AddClaim ( CustomClaims . CompanyIdentifier , value ) ;
151
138
}
152
139
153
140
#endregion [Custom Claims]
@@ -162,7 +149,7 @@ public JwtTokenBuilder AddCompanyId(string value)
162
149
/// <returns></returns>
163
150
public JwtTokenBuilder AddClaim ( string type , string value )
164
151
{
165
- if ( value != null )
152
+ if ( value != null && type != null )
166
153
{
167
154
claims . Add ( new Claim ( type , value ) ) ;
168
155
}
0 commit comments