Merge branch 'release-1.0.0'

Author: henrikfroehling

Changelog.md

@@ -1,6 +1,18 @@
 Release notes
 =============
 
+Version 1.0.1
+===
+
+#### 1.0.1
+(2020-07-09)
+
+Fixed:
+
+- Fix wrongly thrown exception, when authorization is optional ([Issue 154](https://github.com/henrikfroehling/Trakt.NET/issues/154)
+
+---------
+
 Version 1.0.0
 ===
 

README.md

@@ -8,7 +8,7 @@ _**Formerly known as [TraktApiSharp](https://github.com/henrikfroehling/TraktApi
 **This is a .NET wrapper library for the [Trakt.tv](https://trakt.tv/) [API](http://docs.trakt.apiary.io/#).**
 
 [![Project Status](https://img.shields.io/badge/Project%20Status-In%20Development-green)](https://img.shields.io/badge/Project%20Status-In%20Development-green)
-[![NuGet Package](https://img.shields.io/badge/NuGet-v1.0.0-green.svg?style=flat)](https://www.nuget.org/packages/Trakt.NET/1.0.0)
+[![NuGet Package](https://img.shields.io/badge/NuGet-v1.0.1-green.svg?style=flat)](https://www.nuget.org/packages/Trakt.NET/1.0.1)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat)](https://opensource.org/licenses/MIT)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=henrikfroehling_Trakt.NET&metric=alert_status)](https://sonarcloud.io/dashboard?id=henrikfroehling_Trakt.NET)

Source/Lib/Trakt.NET/Requests/Handler/RequestMessageBuilder.cs

@@ -154,18 +154,22 @@ private void SetRequestMessageHeaders(ExtendedHttpRequestMessage requestMessage)
 
             if (authorizationRequirement != AuthorizationRequirement.NotRequired)
             {
-                if (authorizationRequirement == AuthorizationRequirement.Required)
+                if (!_client.Authentication.IsAuthorized)
                 {
-                    if (!_client.Authentication.IsAuthorized)
-                        throw new TraktAuthorizationException("authorization is required for this request, but the current authorization parameters are invalid");
-                }
-                else if (authorizationRequirement == AuthorizationRequirement.Optional && _client.Configuration.ForceAuthorization)
-                {
-                    if (!_client.Authentication.IsAuthorized)
-                        throw new TraktAuthorizationException("authorization is optional for this request, but forced and the current authorization parameters are invalid");
+                    switch (authorizationRequirement)
+                    {
+                        case AuthorizationRequirement.Optional:
+                            if (_client.Configuration.ForceAuthorization)
+                                throw new TraktAuthorizationException("authorization is optional for this request, but forced and the current authorization parameters are invalid");
+
+                            break;
+                        case AuthorizationRequirement.Required:
+                            throw new TraktAuthorizationException("authorization is required for this request, but the current authorization parameters are invalid");
+                    }
                 }
 
-                requestMessage.Headers.Authorization = new AuthenticationHeaderValue(AUTHENTICATION_SCHEME, _client.Authentication.Authorization.AccessToken);
+                if (authorizationRequirement == AuthorizationRequirement.Required || (authorizationRequirement == AuthorizationRequirement.Optional && _client.Configuration.ForceAuthorization))
+                    requestMessage.Headers.Authorization = new AuthenticationHeaderValue(AUTHENTICATION_SCHEME, _client.Authentication.Authorization.AccessToken);
             }
         }
     }

Source/Lib/Trakt.NET/Trakt.NET.csproj

@@ -5,7 +5,7 @@
     <RootNamespace>TraktNet</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <Version>1.0.0</Version>
+    <Version>1.0.1</Version>
     <Authors>Henrik Fröhling</Authors>
     <Company>Henrik Fröhling</Company>
     <PackageLicenseUrl>https://github.com/henrikfroehling/Trakt.NET/blob/develop/LICENSE.md</PackageLicenseUrl>
@@ -22,7 +22,7 @@ Features
 - Language Service</Description>
     <RepositoryUrl>https://github.com/henrikfroehling/Trakt.NET</RepositoryUrl>
     <PackageTags>trakt REST</PackageTags>
-    <PackageReleaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#100</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/henrikfroehling/Trakt.NET/blob/develop/Changelog.md#101</PackageReleaseNotes>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Source/Lib/Trakt.NET/Trakt.NET.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>Trakt.NET</id>
-        <version>1.0.0$versionSuffix$</version>
+        <version>1.0.1$versionSuffix$</version>
         <title>Trakt.NET</title>
         <authors>Henrik Fröhling</authors>
         <owners>henrikfroehling</owners>