From 038e8dcf461d4d4ebd51c8fdf7680497869f691c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 31 Jan 2020 00:10:23 +0800
Subject: ...

---
 Timeline/Controllers/ControllerAuthExtensions.cs   |  15 +--
 Timeline/Filters/Timeline.cs                       |   2 +-
 Timeline/Models/Http/UserInfo.cs                   |   8 +-
 .../ControllerAuthExtensions.Designer.cs           |  81 +++++++++++++
 .../Controllers/ControllerAuthExtensions.resx      | 126 +++++++++++++++++++++
 Timeline/Services/TimelineService.cs               |   3 +
 Timeline/Timeline.csproj                           |   9 ++
 7 files changed, 230 insertions(+), 14 deletions(-)
 create mode 100644 Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
 create mode 100644 Timeline/Resources/Controllers/ControllerAuthExtensions.resx

(limited to 'Timeline')

diff --git a/Timeline/Controllers/ControllerAuthExtensions.cs b/Timeline/Controllers/ControllerAuthExtensions.cs
index 34fd4d99..00a65454 100644
--- a/Timeline/Controllers/ControllerAuthExtensions.cs
+++ b/Timeline/Controllers/ControllerAuthExtensions.cs
@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Security.Claims;
 using Timeline.Auth;
-using System;
+using static Timeline.Resources.Controllers.ControllerAuthExtensions;
 
 namespace Timeline.Controllers
 {
@@ -14,24 +15,18 @@ namespace Timeline.Controllers
 
         public static long GetUserId(this ControllerBase controller)
         {
-            if (controller.User == null)
-                throw new InvalidOperationException("Failed to get user id because User is null.");
-
             var claim = controller.User.FindFirst(ClaimTypes.NameIdentifier);
             if (claim == null)
-                throw new InvalidOperationException("Failed to get user id because User has no NameIdentifier claim.");
+                throw new InvalidOperationException(ExceptionNoUserIdentifierClaim);
 
             if (long.TryParse(claim.Value, out var value))
                 return value;
 
-            throw new InvalidOperationException("Failed to get user id because NameIdentifier claim is not a number.");
+            throw new InvalidOperationException(ExceptionUserIdentifierClaimBadFormat);
         }
 
         public static long? GetOptionalUserId(this ControllerBase controller)
         {
-            if (controller.User == null)
-                return null;
-
             var claim = controller.User.FindFirst(ClaimTypes.NameIdentifier);
             if (claim == null)
                 return null;
@@ -39,7 +34,7 @@ namespace Timeline.Controllers
             if (long.TryParse(claim.Value, out var value))
                 return value;
 
-            throw new InvalidOperationException("Failed to get user id because NameIdentifier claim is not a number.");
+            throw new InvalidOperationException(ExceptionUserIdentifierClaimBadFormat);
         }
     }
 }
diff --git a/Timeline/Filters/Timeline.cs b/Timeline/Filters/Timeline.cs
index 729dbec7..ed78e645 100644
--- a/Timeline/Filters/Timeline.cs
+++ b/Timeline/Filters/Timeline.cs
@@ -13,7 +13,7 @@ namespace Timeline.Filters
             {
                 if (e.InnerException is UserNotExistException)
                 {
-                    context.Result = new BadRequestObjectResult(ErrorResponse.UserCommon.NotExist());
+                    context.Result = new NotFoundObjectResult(ErrorResponse.UserCommon.NotExist());
                 }
                 else
                 {
diff --git a/Timeline/Models/Http/UserInfo.cs b/Timeline/Models/Http/UserInfo.cs
index 62d989a2..07ac0aad 100644
--- a/Timeline/Models/Http/UserInfo.cs
+++ b/Timeline/Models/Http/UserInfo.cs
@@ -31,11 +31,13 @@ namespace Timeline.Models.Http
 
     public class UserInfoAvatarUrlValueResolver : IValueResolver<User, IUserInfo, string>
     {
-        private readonly IActionContextAccessor _actionContextAccessor;
-        private readonly IUrlHelperFactory _urlHelperFactory;
+        private readonly IActionContextAccessor? _actionContextAccessor;
+        private readonly IUrlHelperFactory? _urlHelperFactory;
 
         public UserInfoAvatarUrlValueResolver()
         {
+            _actionContextAccessor = null;
+            _urlHelperFactory = null;
         }
 
         public UserInfoAvatarUrlValueResolver(IActionContextAccessor actionContextAccessor, IUrlHelperFactory urlHelperFactory)
@@ -51,7 +53,7 @@ namespace Timeline.Models.Http
                 return $"/users/{destination.Username}/avatar";
             }
 
-            var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccessor.ActionContext);
+            var urlHelper = _urlHelperFactory!.GetUrlHelper(_actionContextAccessor.ActionContext);
             return urlHelper.ActionLink(nameof(UserAvatarController.Get), nameof(UserAvatarController), new { destination.Username });
         }
     }
diff --git a/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs b/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
new file mode 100644
index 00000000..70a1d605
--- /dev/null
+++ b/Timeline/Resources/Controllers/ControllerAuthExtensions.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Timeline.Resources.Controllers {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // 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()]
+    internal class ControllerAuthExtensions {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal ControllerAuthExtensions() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        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.Controllers.ControllerAuthExtensions", typeof(ControllerAuthExtensions).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Failed to get user id because User has no NameIdentifier claim..
+        /// </summary>
+        internal static string ExceptionNoUserIdentifierClaim {
+            get {
+                return ResourceManager.GetString("ExceptionNoUserIdentifierClaim", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Failed to get user id because NameIdentifier claim is not a number..
+        /// </summary>
+        internal static string ExceptionUserIdentifierClaimBadFormat {
+            get {
+                return ResourceManager.GetString("ExceptionUserIdentifierClaimBadFormat", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Timeline/Resources/Controllers/ControllerAuthExtensions.resx b/Timeline/Resources/Controllers/ControllerAuthExtensions.resx
new file mode 100644
index 00000000..03e6d95a
--- /dev/null
+++ b/Timeline/Resources/Controllers/ControllerAuthExtensions.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ExceptionNoUserIdentifierClaim" xml:space="preserve">
+    <value>Failed to get user id because User has no NameIdentifier claim.</value>
+  </data>
+  <data name="ExceptionUserIdentifierClaimBadFormat" xml:space="preserve">
+    <value>Failed to get user id because NameIdentifier claim is not a number.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Timeline/Services/TimelineService.cs b/Timeline/Services/TimelineService.cs
index 16402f3e..85445973 100644
--- a/Timeline/Services/TimelineService.cs
+++ b/Timeline/Services/TimelineService.cs
@@ -348,6 +348,9 @@ namespace Timeline.Services
             if (name == null)
                 throw new ArgumentNullException(nameof(name));
 
+            // Currently we don't use the result. But we need to check the timeline.
+            var _ = await FindTimelineId(name);
+
             var post = await Database.TimelinePosts.Where(p => p.Id == id).SingleOrDefaultAsync();
 
             if (post == null)
diff --git a/Timeline/Timeline.csproj b/Timeline/Timeline.csproj
index 25d73068..1a3a07cd 100644
--- a/Timeline/Timeline.csproj
+++ b/Timeline/Timeline.csproj
@@ -44,6 +44,11 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>AuthHandler.resx</DependentUpon>
         </Compile>
+        <Compile Update="Resources\Controllers\ControllerAuthExtensions.Designer.cs">
+          <DesignTime>True</DesignTime>
+          <AutoGen>True</AutoGen>
+          <DependentUpon>ControllerAuthExtensions.resx</DependentUpon>
+        </Compile>
         <Compile Update="Resources\Controllers\TimelineController.Designer.cs">
             <DesignTime>True</DesignTime>
             <AutoGen>True</AutoGen>
@@ -121,6 +126,10 @@
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>AuthHandler.Designer.cs</LastGenOutput>
         </EmbeddedResource>
+        <EmbeddedResource Update="Resources\Controllers\ControllerAuthExtensions.resx">
+          <Generator>ResXFileCodeGenerator</Generator>
+          <LastGenOutput>ControllerAuthExtensions.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
         <EmbeddedResource Update="Resources\Controllers\TimelineController.resx">
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>TimelineController.Designer.cs</LastGenOutput>
-- 
cgit v1.2.3