From 9bc08731aad112f100bcbc105f2cca910948651f Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Sun, 20 Oct 2019 16:24:11 +0800 Subject: ... --- .../Resources/Controllers/TokenController.en.resx | 153 +++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 Timeline/Resources/Controllers/TokenController.en.resx (limited to 'Timeline/Resources/Controllers/TokenController.en.resx') diff --git a/Timeline/Resources/Controllers/TokenController.en.resx b/Timeline/Resources/Controllers/TokenController.en.resx new file mode 100644 index 00000000..7309ea6a --- /dev/null +++ b/Timeline/Resources/Controllers/TokenController.en.resx @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Username or password is invalid. + + + The token is of bad format. It might not be created by the server. + + + The token is expired. + + + Token has an old version. User might have update some info. + + + User does not exist. Administrator might have deleted this user. + + + The password is wrong. + + + A user failed to create a token. + + + A user succeeded to create a token. + + + The user does not exist. + + + A token failed to be verified. + + + A token succeeded to be verified. + + \ No newline at end of file -- cgit v1.2.3 From bd7eaa3c7f605ec1234ca5a8c664ec165e581b70 Mon Sep 17 00:00:00 2001 From: 杨宇千 Date: Sun, 20 Oct 2019 16:59:33 +0800 Subject: ... --- Timeline.Tests/IntegratedTests/TokenUnitTest.cs | 4 +- Timeline/Controllers/TokenController.cs | 26 ++-- .../Controllers/TokenController.Designer.cs | 153 +++++++++++++++++++++ .../Controllers/TokenController.en.Designer.cs | 72 ---------- .../Resources/Controllers/TokenController.en.resx | 18 --- .../Resources/Controllers/TokenController.resx | 150 ++++++++++++++++++++ .../Resources/Controllers/TokenController.zh.resx | 135 ++++++++++++++++++ Timeline/Timeline.csproj | 14 +- 8 files changed, 466 insertions(+), 106 deletions(-) create mode 100644 Timeline/Resources/Controllers/TokenController.Designer.cs delete mode 100644 Timeline/Resources/Controllers/TokenController.en.Designer.cs create mode 100644 Timeline/Resources/Controllers/TokenController.resx create mode 100644 Timeline/Resources/Controllers/TokenController.zh.resx (limited to 'Timeline/Resources/Controllers/TokenController.en.resx') diff --git a/Timeline.Tests/IntegratedTests/TokenUnitTest.cs b/Timeline.Tests/IntegratedTests/TokenUnitTest.cs index 6a60a1a3..d30b9311 100644 --- a/Timeline.Tests/IntegratedTests/TokenUnitTest.cs +++ b/Timeline.Tests/IntegratedTests/TokenUnitTest.cs @@ -94,7 +94,7 @@ namespace Timeline.Tests.IntegratedTests } [Fact] - public async Task VerifyToken_BadToken() + public async Task VerifyToken_BadFormat() { using var client = _factory.CreateDefaultClient(); var response = await client.PostAsJsonAsync(VerifyTokenUrl, @@ -105,7 +105,7 @@ namespace Timeline.Tests.IntegratedTests } [Fact] - public async Task VerifyToken_BadVersion() + public async Task VerifyToken_OldVersion() { using var client = _factory.CreateDefaultClient(); var token = (await client.CreateUserTokenAsync(MockUser.User.Username, MockUser.User.Password)).Token; diff --git a/Timeline/Controllers/TokenController.cs b/Timeline/Controllers/TokenController.cs index eba69319..d708127a 100644 --- a/Timeline/Controllers/TokenController.cs +++ b/Timeline/Controllers/TokenController.cs @@ -127,29 +127,31 @@ namespace Timeline.Controllers { if (e.ErrorCode == JwtTokenVerifyException.ErrorCodes.Expired) { - string message = _localizer["ErrorVerifyExpire"]; var innerException = e.InnerException as SecurityTokenExpiredException; - LogFailure(message, e, ("Expires", innerException?.Expires), ("Current Time", _clock.GetCurrentTime())); - return BadRequest(new CommonResponse(ErrorCodes.Http.Token.Verify.Expired, message)); + LogFailure(_localizer["LogVerifyExpire"], e, ("Expires", innerException?.Expires), + ("Current Time", _clock.GetCurrentTime())); + return BadRequest(new CommonResponse( + ErrorCodes.Http.Token.Verify.Expired, _localizer["ErrorVerifyExpire"])); } else { - string message = _localizer["ErrorVerifyBadFormat"]; - LogFailure(message, e); - return BadRequest(new CommonResponse(ErrorCodes.Http.Token.Verify.BadFormat, message)); + LogFailure(_localizer["LogVerifyBadFormat"], e); + return BadRequest(new CommonResponse( + ErrorCodes.Http.Token.Verify.BadFormat, _localizer["ErrorVerifyBadFormat"])); } } catch (UserNotExistException e) { - string message = _localizer["ErrorVerifyUserNotExist"]; - LogFailure(message, e); - return BadRequest(new CommonResponse(ErrorCodes.Http.Token.Verify.UserNotExist, message)); + LogFailure(_localizer["LogVerifyUserNotExist"], e); + return BadRequest(new CommonResponse( + ErrorCodes.Http.Token.Verify.UserNotExist, _localizer["ErrorVerifyUserNotExist"])); } catch (BadTokenVersionException e) { - string message = _localizer["ErrorVerifyOldVersion"]; - LogFailure(message, e, ("Token Version", e.TokenVersion), ("Required Version", e.RequiredVersion)); - return BadRequest(new CommonResponse(ErrorCodes.Http.Token.Verify.OldVersion, message)); + LogFailure(_localizer["LogVerifyOldVersion"], e, + ("Token Version", e.TokenVersion), ("Required Version", e.RequiredVersion)); + return BadRequest(new CommonResponse( + ErrorCodes.Http.Token.Verify.OldVersion, _localizer["ErrorVerifyOldVersion"])); } } } diff --git a/Timeline/Resources/Controllers/TokenController.Designer.cs b/Timeline/Resources/Controllers/TokenController.Designer.cs new file mode 100644 index 00000000..0dcfb79e --- /dev/null +++ b/Timeline/Resources/Controllers/TokenController.Designer.cs @@ -0,0 +1,153 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Timeline.Resources.Controllers { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class TokenController { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal TokenController() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.TokenController", typeof(TokenController).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to The password is wrong.. + /// + public static string LogBadPassword { + get { + return ResourceManager.GetString("LogBadPassword", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A user failed to create a token.. + /// + public static string LogCreateFailure { + get { + return ResourceManager.GetString("LogCreateFailure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A user succeeded to create a token.. + /// + public static string LogCreateSuccess { + get { + return ResourceManager.GetString("LogCreateSuccess", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The user does not exist.. + /// + public static string LogUserNotExist { + get { + return ResourceManager.GetString("LogUserNotExist", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The token is of bad format. It might not be created by the server.. + /// + public static string LogVerifyBadFormat { + get { + return ResourceManager.GetString("LogVerifyBadFormat", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The token is expired.. + /// + public static string LogVerifyExpire { + get { + return ResourceManager.GetString("LogVerifyExpire", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A token failed to be verified.. + /// + public static string LogVerifyFailure { + get { + return ResourceManager.GetString("LogVerifyFailure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Token has an old version. User might have update some info.. + /// + public static string LogVerifyOldVersion { + get { + return ResourceManager.GetString("LogVerifyOldVersion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A token succeeded to be verified.. + /// + public static string LogVerifySuccess { + get { + return ResourceManager.GetString("LogVerifySuccess", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User does not exist. Administrator might have deleted this user.. + /// + public static string LogVerifyUserNotExist { + get { + return ResourceManager.GetString("LogVerifyUserNotExist", resourceCulture); + } + } + } +} diff --git a/Timeline/Resources/Controllers/TokenController.en.Designer.cs b/Timeline/Resources/Controllers/TokenController.en.Designer.cs deleted file mode 100644 index 64326860..00000000 --- a/Timeline/Resources/Controllers/TokenController.en.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Timeline.Resources.Controllers { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class TokenController { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal TokenController() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Controllers.TokenController", typeof(TokenController).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to A user succeeded to create a token.. - /// - public static string LogCreateSuccess { - get { - return ResourceManager.GetString("LogCreateSuccess", resourceCulture); - } - } - } -} diff --git a/Timeline/Resources/Controllers/TokenController.en.resx b/Timeline/Resources/Controllers/TokenController.en.resx index 7309ea6a..4a3d94f9 100644 --- a/Timeline/Resources/Controllers/TokenController.en.resx +++ b/Timeline/Resources/Controllers/TokenController.en.resx @@ -132,22 +132,4 @@ User does not exist. Administrator might have deleted this user. - - The password is wrong. - - - A user failed to create a token. - - - A user succeeded to create a token. - - - The user does not exist. - - - A token failed to be verified. - - - A token succeeded to be verified. - \ No newline at end of file diff --git a/Timeline/Resources/Controllers/TokenController.resx b/Timeline/Resources/Controllers/TokenController.resx new file mode 100644 index 00000000..683d6cc9 --- /dev/null +++ b/Timeline/Resources/Controllers/TokenController.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The password is wrong. + + + A user failed to create a token. + + + A user succeeded to create a token. + + + The user does not exist. + + + The token is of bad format. It might not be created by the server. + + + The token is expired. + + + A token failed to be verified. + + + Token has an old version. User might have update some info. + + + A token succeeded to be verified. + + + User does not exist. Administrator might have deleted this user. + + \ No newline at end of file diff --git a/Timeline/Resources/Controllers/TokenController.zh.resx b/Timeline/Resources/Controllers/TokenController.zh.resx new file mode 100644 index 00000000..51e0f25b --- /dev/null +++ b/Timeline/Resources/Controllers/TokenController.zh.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 用户名或密码错误。 + + + 符号格式错误。这个符号可能不是这个服务器创建的。 + + + 符号过期了。 + + + 符号是一个旧版本。用户可能已经更新了信息。 + + + 用户不存在。管理员可能已经删除了这个用户。 + + \ No newline at end of file diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj index 01207ae2..302d1677 100644 --- a/Timeline/Timeline.csproj +++ b/Timeline/Timeline.csproj @@ -28,14 +28,24 @@ - + True True - TokenController.en.resx + TokenController.resx + + Designer + TokenController.Designer.cs + PublicResXFileCodeGenerator + + + Designer + TokenController.en.Designer.cs + PublicResXFileCodeGenerator + PublicResXFileCodeGenerator TokenController.en.Designer.cs -- cgit v1.2.3