6 files changed, 141 insertions, 177 deletions
diff --git a/Timeline/Resources/Services/Exception.Designer.cs b/Timeline/Resources/Services/Exception.Designer.cs
index 1b46f9e9..e6806873 100644
--- a/Timeline/Resources/Services/Exception.Designer.cs
+++ b/Timeline/Resources/Services/Exception.Designer.cs
@@ -115,6 +115,15 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to A present resource conflicts with the given resource..
+        /// </summary>
+        internal static string ConflictException {
+            get {
+                return ResourceManager.GetString("ConflictException", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to The hashes password is of bad format. It might not be created by server..
         /// </summary>
         internal static string HashedPasswordBadFromatException {
@@ -178,128 +187,74 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The version of the jwt token is old..
-        /// </summary>
-        internal static string JwtBadVersionException {
-            get {
-                return ResourceManager.GetString("JwtBadVersionException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The token didn&apos;t pass verification because {0}, see inner exception for information..
-        /// </summary>
-        internal static string JwtVerifyException {
-            get {
-                return ResourceManager.GetString("JwtVerifyException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to token is expired..
+        ///   Looks up a localized string similar to The token didn&apos;t pass verification because {0}..
         /// </summary>
-        internal static string JwtVerifyExceptionExpired {
+        internal static string JwtUserTokenBadFormatException {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionExpired", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to id claim is not a number..
+        ///   Looks up a localized string similar to id claim is not a number.
         /// </summary>
-        internal static string JwtVerifyExceptionIdClaimBadFormat {
+        internal static string JwtUserTokenBadFormatExceptionIdBadFormat {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionIdClaimBadFormat", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionIdBadFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to id claim does not exist..
+        ///   Looks up a localized string similar to id claim does not exist.
         /// </summary>
-        internal static string JwtVerifyExceptionNoIdClaim {
+        internal static string JwtUserTokenBadFormatExceptionIdMissing {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionNoIdClaim", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionIdMissing", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to version claim does not exist..
+        ///   Looks up a localized string similar to other error, see inner exception for information.
         /// </summary>
-        internal static string JwtVerifyExceptionNoVersionClaim {
+        internal static string JwtUserTokenBadFormatExceptionOthers {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionNoVersionClaim", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionOthers", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to version of token is old..
-        /// </summary>
-        internal static string JwtVerifyExceptionOldVersion {
-            get {
-                return ResourceManager.GetString("JwtVerifyExceptionOldVersion", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to uncommon error..
-        /// </summary>
-        internal static string JwtVerifyExceptionOthers {
-            get {
-                return ResourceManager.GetString("JwtVerifyExceptionOthers", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to unknown error code..
+        ///   Looks up a localized string similar to unknown error.
         /// </summary>
-        internal static string JwtVerifyExceptionUnknown {
+        internal static string JwtUserTokenBadFormatExceptionUnknown {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionUnknown", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionUnknown", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to version claim is not a number..
         /// </summary>
-        internal static string JwtVerifyExceptionVersionClaimBadFormat {
+        internal static string JwtUserTokenBadFormatExceptionVersionBadFormat {
             get {
-                return ResourceManager.GetString("JwtVerifyExceptionVersionClaimBadFormat", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionVersionBadFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The timeline with that name already exists..
-        /// </summary>
-        internal static string TimelineAlreadyExistException {
-            get {
-                return ResourceManager.GetString("TimelineAlreadyExistException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An exception happened when add or remove member on timeline..
-        /// </summary>
-        internal static string TimelineMemberOperationException {
-            get {
-                return ResourceManager.GetString("TimelineMemberOperationException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An exception happened when do operation {0} on the {1} member on timeline..
+        ///   Looks up a localized string similar to version claim does not exist..
         /// </summary>
-        internal static string TimelineMemberOperationExceptionDetail {
+        internal static string JwtUserTokenBadFormatExceptionVersionMissing {
             get {
-                return ResourceManager.GetString("TimelineMemberOperationExceptionDetail", resourceCulture);
+                return ResourceManager.GetString("JwtUserTokenBadFormatExceptionVersionMissing", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Timeline name is of bad format. If this is a personal timeline, it means the username is of bad format and inner exception should be a UsernameBadFormatException..
+        ///   Looks up a localized string similar to Password is of bad format..
         /// </summary>
-        internal static string TimelineNameBadFormatException {
+        internal static string PasswordBadFormatException {
             get {
-                return ResourceManager.GetString("TimelineNameBadFormatException", resourceCulture);
+                return ResourceManager.GetString("PasswordBadFormatException", resourceCulture);
             }
         }
         
@@ -322,38 +277,38 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The use is not a member of the timeline..
+        ///   Looks up a localized string similar to The user does not exist..
         /// </summary>
-        internal static string TimelineUserNotMemberException {
+        internal static string UserNotExistException {
             get {
-                return ResourceManager.GetString("TimelineUserNotMemberException", resourceCulture);
+                return ResourceManager.GetString("UserNotExistException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The username is of bad format..
+        ///   Looks up a localized string similar to The token is of bad format, which means it may not be created by the server..
         /// </summary>
-        internal static string UsernameBadFormatException {
+        internal static string UserTokenBadFormatException {
             get {
-                return ResourceManager.GetString("UsernameBadFormatException", resourceCulture);
+                return ResourceManager.GetString("UserTokenBadFormatException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The username already exists..
+        ///   Looks up a localized string similar to The token is of bad version..
         /// </summary>
-        internal static string UsernameConfictException {
+        internal static string UserTokenBadVersionException {
             get {
-                return ResourceManager.GetString("UsernameConfictException", resourceCulture);
+                return ResourceManager.GetString("UserTokenBadVersionException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The user does not exist..
+        ///   Looks up a localized string similar to The token is expired because its expiration time has passed..
         /// </summary>
-        internal static string UserNotExistException {
+        internal static string UserTokenTimeExpireException {
             get {
-                return ResourceManager.GetString("UserNotExistException", resourceCulture);
+                return ResourceManager.GetString("UserTokenTimeExpireException", resourceCulture);
             }
         }
     }
diff --git a/Timeline/Resources/Services/Exception.resx b/Timeline/Resources/Services/Exception.resx
index 1d9c0037..11ae5f27 100644
--- a/Timeline/Resources/Services/Exception.resx
+++ b/Timeline/Resources/Services/Exception.resx
@@ -135,6 +135,9 @@
   <data name="BadPasswordException" xml:space="preserve">
     <value>The password is wrong.</value>
   </data>
+  <data name="ConflictException" xml:space="preserve">
+    <value>A present resource conflicts with the given resource.</value>
+  </data>
   <data name="HashedPasswordBadFromatException" xml:space="preserve">
     <value>The hashes password is of bad format. It might not be created by server.</value>
   </data>
@@ -156,47 +159,29 @@
   <data name="HashedPasswordBadFromatExceptionNotUnknownMarker" xml:space="preserve">
     <value>Unknown format marker.</value>
   </data>
-  <data name="JwtBadVersionException" xml:space="preserve">
-    <value>The version of the jwt token is old.</value>
-  </data>
-  <data name="JwtVerifyException" xml:space="preserve">
-    <value>The token didn't pass verification because {0}, see inner exception for information.</value>
+  <data name="JwtUserTokenBadFormatException" xml:space="preserve">
+    <value>The token didn't pass verification because {0}.</value>
   </data>
-  <data name="JwtVerifyExceptionExpired" xml:space="preserve">
-    <value>token is expired.</value>
+  <data name="JwtUserTokenBadFormatExceptionIdBadFormat" xml:space="preserve">
+    <value>id claim is not a number</value>
   </data>
-  <data name="JwtVerifyExceptionIdClaimBadFormat" xml:space="preserve">
-    <value>id claim is not a number.</value>
+  <data name="JwtUserTokenBadFormatExceptionIdMissing" xml:space="preserve">
+    <value>id claim does not exist</value>
   </data>
-  <data name="JwtVerifyExceptionNoIdClaim" xml:space="preserve">
-    <value>id claim does not exist.</value>
-  </data>
-  <data name="JwtVerifyExceptionNoVersionClaim" xml:space="preserve">
-    <value>version claim does not exist.</value>
+  <data name="JwtUserTokenBadFormatExceptionOthers" xml:space="preserve">
+    <value>other error, see inner exception for information</value>
   </data>
-  <data name="JwtVerifyExceptionOldVersion" xml:space="preserve">
-    <value>version of token is old.</value>
-  </data>
-  <data name="JwtVerifyExceptionOthers" xml:space="preserve">
-    <value>uncommon error.</value>
-  </data>
-  <data name="JwtVerifyExceptionUnknown" xml:space="preserve">
-    <value>unknown error code.</value>
+  <data name="JwtUserTokenBadFormatExceptionUnknown" xml:space="preserve">
+    <value>unknown error</value>
   </data>
-  <data name="JwtVerifyExceptionVersionClaimBadFormat" xml:space="preserve">
+  <data name="JwtUserTokenBadFormatExceptionVersionBadFormat" xml:space="preserve">
     <value>version claim is not a number.</value>
   </data>
-  <data name="TimelineAlreadyExistException" xml:space="preserve">
-    <value>The timeline with that name already exists.</value>
-  </data>
-  <data name="TimelineMemberOperationException" xml:space="preserve">
-    <value>An exception happened when add or remove member on timeline.</value>
-  </data>
-  <data name="TimelineMemberOperationExceptionDetail" xml:space="preserve">
-    <value>An exception happened when do operation {0} on the {1} member on timeline.</value>
+  <data name="JwtUserTokenBadFormatExceptionVersionMissing" xml:space="preserve">
+    <value>version claim does not exist.</value>
   </data>
-  <data name="TimelineNameBadFormatException" xml:space="preserve">
-    <value>Timeline name is of bad format. If this is a personal timeline, it means the username is of bad format and inner exception should be a UsernameBadFormatException.</value>
+  <data name="PasswordBadFormatException" xml:space="preserve">
+    <value>Password is of bad format.</value>
   </data>
   <data name="TimelineNotExistException" xml:space="preserve">
     <value>Timeline does not exist. If this is a personal timeline, it means the user does not exist and inner exception should be a UserNotExistException.</value>
@@ -204,16 +189,16 @@
   <data name="TimelinePostNotExistException" xml:space="preserve">
     <value>The timeline post does not exist. You can't do operation on it.</value>
   </data>
-  <data name="TimelineUserNotMemberException" xml:space="preserve">
-    <value>The use is not a member of the timeline.</value>
+  <data name="UserNotExistException" xml:space="preserve">
+    <value>The user does not exist.</value>
   </data>
-  <data name="UsernameBadFormatException" xml:space="preserve">
-    <value>The username is of bad format.</value>
+  <data name="UserTokenBadFormatException" xml:space="preserve">
+    <value>The token is of bad format, which means it may not be created by the server.</value>
   </data>
-  <data name="UsernameConfictException" xml:space="preserve">
-    <value>The username already exists.</value>
+  <data name="UserTokenBadVersionException" xml:space="preserve">
+    <value>The token is of bad version.</value>
   </data>
-  <data name="UserNotExistException" xml:space="preserve">
-    <value>The user does not exist.</value>
+  <data name="UserTokenTimeExpireException" xml:space="preserve">
+    <value>The token is expired because its expiration time has passed.</value>
   </data>
 </root>
 \ No newline at end of file
diff --git a/Timeline/Resources/Services/UserDetailService.Designer.cs b/Timeline/Resources/Services/TimelineService.Designer.cs
index 2f586b36..8212c252 100644
--- a/Timeline/Resources/Services/UserDetailService.Designer.cs
+++ b/Timeline/Resources/Services/TimelineService.Designer.cs
@@ -22,14 +22,14 @@ namespace Timeline.Resources.Services {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class UserDetailService {
+    internal class TimelineService {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal UserDetailService() {
+        internal TimelineService() {
         }
         
         /// <summary>
@@ -39,7 +39,7 @@ namespace Timeline.Resources.Services {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.UserDetailService", typeof(UserDetailService).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Services.TimelineService", typeof(TimelineService).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -61,38 +61,20 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Length of nickname can&apos;t be bigger than 10..
+        ///   Looks up a localized string similar to The number {0} username is invalid..
         /// </summary>
-        internal static string ExceptionNicknameTooLong {
+        internal static string ExceptionChangeMemberUsernameBadFormat {
             get {
-                return ResourceManager.GetString("ExceptionNicknameTooLong", resourceCulture);
+                return ResourceManager.GetString("ExceptionChangeMemberUsernameBadFormat", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A user_details entity has been created. User id is {0}. Nickname is {1}..
+        ///   Looks up a localized string similar to The owner username of personal timeline is of bad format..
         /// </summary>
-        internal static string LogEntityNicknameCreate {
+        internal static string ExceptionFindTimelineUsernameBadFormat {
             get {
-                return ResourceManager.GetString("LogEntityNicknameCreate", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Nickname of a user_details entity has been updated to a new value. User id is {0}. New value is {1}..
-        /// </summary>
-        internal static string LogEntityNicknameSetNotNull {
-            get {
-                return ResourceManager.GetString("LogEntityNicknameSetNotNull", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Nickname of a user_details entity has been updated to null. User id is {0}..
-        /// </summary>
-        internal static string LogEntityNicknameSetToNull {
-            get {
-                return ResourceManager.GetString("LogEntityNicknameSetToNull", resourceCulture);
+                return ResourceManager.GetString("ExceptionFindTimelineUsernameBadFormat", resourceCulture);
             }
         }
     }
diff --git a/Timeline/Resources/Services/UserDetailService.resx b/Timeline/Resources/Services/TimelineService.resx
index ea32aeda..0429a2f8 100644
--- a/Timeline/Resources/Services/UserDetailService.resx
+++ b/Timeline/Resources/Services/TimelineService.resx
@@ -117,16 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ExceptionNicknameTooLong" xml:space="preserve">
-    <value>Length of nickname can't be bigger than 10.</value>
+  <data name="ExceptionChangeMemberUsernameBadFormat" xml:space="preserve">
+    <value>The number {0} username is invalid.</value>
   </data>
-  <data name="LogEntityNicknameCreate" xml:space="preserve">
-    <value>A user_details entity has been created. User id is {0}. Nickname is {1}.</value>
-  </data>
-  <data name="LogEntityNicknameSetNotNull" xml:space="preserve">
-    <value>Nickname of a user_details entity has been updated to a new value. User id is {0}. New value is {1}.</value>
-  </data>
-  <data name="LogEntityNicknameSetToNull" xml:space="preserve">
-    <value>Nickname of a user_details entity has been updated to null. User id is {0}.</value>
+  <data name="ExceptionFindTimelineUsernameBadFormat" xml:space="preserve">
+    <value>The owner username of personal timeline is of bad format.</value>
   </data>
 </root>
 \ No newline at end of file
diff --git a/Timeline/Resources/Services/UserService.Designer.cs b/Timeline/Resources/Services/UserService.Designer.cs
index 2a04dded..cdf7f390 100644
--- a/Timeline/Resources/Services/UserService.Designer.cs
+++ b/Timeline/Resources/Services/UserService.Designer.cs
@@ -70,6 +70,15 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Nickname is of bad format, because {}..
+        /// </summary>
+        internal static string ExceptionNicknameBadFormat {
+            get {
+                return ResourceManager.GetString("ExceptionNicknameBadFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Old username is of bad format..
         /// </summary>
         internal static string ExceptionOldUsernameBadFormat {
@@ -79,20 +88,47 @@ namespace Timeline.Resources.Services {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A cache entry is created..
+        ///   Looks up a localized string similar to Password can&apos;t be empty..
+        /// </summary>
+        internal static string ExceptionPasswordEmpty {
+            get {
+                return ResourceManager.GetString("ExceptionPasswordEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Password can&apos;t be null..
+        /// </summary>
+        internal static string ExceptionPasswordNull {
+            get {
+                return ResourceManager.GetString("ExceptionPasswordNull", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Username is of bad format, because {}..
+        /// </summary>
+        internal static string ExceptionUsernameBadFormat {
+            get {
+                return ResourceManager.GetString("ExceptionUsernameBadFormat", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A user with given username already exists..
         /// </summary>
-        internal static string LogCacheCreate {
+        internal static string ExceptionUsernameConflict {
             get {
-                return ResourceManager.GetString("LogCacheCreate", resourceCulture);
+                return ResourceManager.GetString("ExceptionUsernameConflict", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A cache entry is removed..
+        ///   Looks up a localized string similar to Username can&apos;t be null..
         /// </summary>
-        internal static string LogCacheRemove {
+        internal static string ExceptionUsernameNull {
             get {
-                return ResourceManager.GetString("LogCacheRemove", resourceCulture);
+                return ResourceManager.GetString("ExceptionUsernameNull", resourceCulture);
             }
         }
         
diff --git a/Timeline/Resources/Services/UserService.resx b/Timeline/Resources/Services/UserService.resx
index 3670d8f9..09bd4abb 100644
--- a/Timeline/Resources/Services/UserService.resx
+++ b/Timeline/Resources/Services/UserService.resx
@@ -120,14 +120,26 @@
   <data name="ExceptionNewUsernameBadFormat" xml:space="preserve">
     <value>New username is of bad format.</value>
   </data>
+  <data name="ExceptionNicknameBadFormat" xml:space="preserve">
+    <value>Nickname is of bad format, because {}.</value>
+  </data>
   <data name="ExceptionOldUsernameBadFormat" xml:space="preserve">
     <value>Old username is of bad format.</value>
   </data>
-  <data name="LogCacheCreate" xml:space="preserve">
-    <value>A cache entry is created.</value>
+  <data name="ExceptionPasswordEmpty" xml:space="preserve">
+    <value>Password can't be empty.</value>
+  </data>
+  <data name="ExceptionPasswordNull" xml:space="preserve">
+    <value>Password can't be null.</value>
+  </data>
+  <data name="ExceptionUsernameBadFormat" xml:space="preserve">
+    <value>Username is of bad format, because {}.</value>
+  </data>
+  <data name="ExceptionUsernameConflict" xml:space="preserve">
+    <value>A user with given username already exists.</value>
   </data>
-  <data name="LogCacheRemove" xml:space="preserve">
-    <value>A cache entry is removed.</value>
+  <data name="ExceptionUsernameNull" xml:space="preserve">
+    <value>Username can't be null.</value>
   </data>
   <data name="LogDatabaseCreate" xml:space="preserve">
     <value>A new user entry is added to the database.</value>