tsai
/
openiddict-core
mirror of https://github.com/openiddict/openiddict-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Rename GenericException to ProtocolException

pull/1483/head
Kévin Chalet 4 years ago
parent
69cd85e552
commit
3b801f0326
3 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/OpenIddict.Abstractions/OpenIddictExceptions.cs
  2. 38
      src/OpenIddict.Client/OpenIddictClientService.cs
  3. 26
      src/OpenIddict.Validation/OpenIddictValidationService.cs

20
src/OpenIddict.Abstractions/OpenIddictExceptions.cs
View File

@ -34,48 +34,48 @@ public static class OpenIddictExceptions
} }
/// <summary> /// <summary>
/// Represents a generic OpenIddict exception. /// Represents an OpenIddict protocol exception.
/// </summary> /// </summary>
public class GenericException : Exception public class ProtocolException : Exception
{ {
/// <summary> /// <summary>
/// Creates a new <see cref="GenericException"/>. /// Creates a new <see cref="ProtocolException"/>.
/// </summary> /// </summary>
/// <param name="message">The exception message.</param> /// <param name="message">The exception message.</param>
public GenericException(string? message) public ProtocolException(string? message)
: this(message, null) : this(message, null)
{ {
} }
/// <summary> /// <summary>
/// Creates a new <see cref="GenericException"/>. /// Creates a new <see cref="ProtocolException"/>.
/// </summary> /// </summary>
/// <param name="message">The exception message.</param> /// <param name="message">The exception message.</param>
/// <param name="error">The error type.</param> /// <param name="error">The error type.</param>
public GenericException(string? message, string? error) public ProtocolException(string? message, string? error)
: this(message, error, description: null) : this(message, error, description: null)
{ {
} }
/// <summary> /// <summary>
/// Creates a new <see cref="GenericException"/>. /// Creates a new <see cref="ProtocolException"/>.
/// </summary> /// </summary>
/// <param name="message">The exception message.</param> /// <param name="message">The exception message.</param>
/// <param name="error">The error type.</param> /// <param name="error">The error type.</param>
/// <param name="description">The error description.</param> /// <param name="description">The error description.</param>
public GenericException(string? message, string? error, string? description) public ProtocolException(string? message, string? error, string? description)
: this(message, error, description, uri: null) : this(message, error, description, uri: null)
{ {
} }
/// <summary> /// <summary>
/// Creates a new <see cref="GenericException"/>. /// Creates a new <see cref="ProtocolException"/>.
/// </summary> /// </summary>
/// <param name="message">The exception message.</param> /// <param name="message">The exception message.</param>
/// <param name="error">The error type.</param> /// <param name="error">The error type.</param>
/// <param name="description">The error description.</param> /// <param name="description">The error description.</param>
/// <param name="uri">The error URI.</param> /// <param name="uri">The error URI.</param>
public GenericException(string? message, string? error, string? description, string? uri) public ProtocolException(string? message, string? error, string? description, string? uri)
: base(message) : base(message)
{ {
Error = error; Error = error;

38
src/OpenIddict.Client/OpenIddictClientService.cs
View File

@ -86,7 +86,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -108,7 +108,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -132,7 +132,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -159,7 +159,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -245,7 +245,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -267,7 +267,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -291,7 +291,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -318,7 +318,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -391,7 +391,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -483,7 +483,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -568,7 +568,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0319(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -668,7 +668,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0320(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0320(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -691,7 +691,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0321(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0321(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -716,7 +716,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0322(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0322(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -744,7 +744,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0323(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0323(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -839,7 +839,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0324(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0324(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -862,7 +862,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0325(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0325(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -887,7 +887,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0326(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0326(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -916,7 +916,7 @@ public class OpenIddictClientService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0327(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0327(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }

26
src/OpenIddict.Validation/OpenIddictValidationService.cs
View File

@ -76,7 +76,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0148(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -96,7 +96,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0149(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -118,7 +118,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0150(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -143,7 +143,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0151(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -220,7 +220,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0152(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -240,7 +240,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0153(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -262,7 +262,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0154(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -286,7 +286,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0155(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -382,7 +382,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0158(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0158(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -402,7 +402,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0159(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0159(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -424,7 +424,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0160(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0160(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -450,7 +450,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0161(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0161(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }
@ -513,7 +513,7 @@ public class OpenIddictValidationService
if (context.IsRejected) if (context.IsRejected)
{ {
throw new OpenIddictExceptions.GenericException( throw new OpenIddictExceptions.ProtocolException(
SR.FormatID0163(context.Error, context.ErrorDescription, context.ErrorUri), SR.FormatID0163(context.Error, context.ErrorDescription, context.ErrorUri),
context.Error, context.ErrorDescription, context.ErrorUri); context.Error, context.ErrorDescription, context.ErrorUri);
} }

Write Preview
Loading…
Cancel
Save