From 3add1872c860cae14f85b339fef843ff962574aa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 28 Mar 2015 14:55:00 -0400
Subject: [PATCH] make sure appVersion is set

---
 .../Session/SessionManager.cs                         | 11 +++++++++--
 SharedVersion.cs                                      |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index f88e21aea..201e86fe2 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1225,7 +1225,7 @@ namespace MediaBrowser.Server.Implementations.Session
                 throw new UnauthorizedAccessException("Invalid user or password entered.");
             }
 
-            var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.DeviceName).ConfigureAwait(false);
+            var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
 
             EventHelper.FireEventIfNotNull(AuthenticationSucceeded, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
 
@@ -1246,7 +1246,7 @@ namespace MediaBrowser.Server.Implementations.Session
             };
         }
 
-        private async Task<string> GetAuthorizationToken(string userId, string deviceId, string app, string deviceName)
+        private async Task<string> GetAuthorizationToken(string userId, string deviceId, string app, string appVersion, string deviceName)
         {
             var existing = _authRepo.Get(new AuthenticationInfoQuery
             {
@@ -1265,6 +1265,7 @@ namespace MediaBrowser.Server.Implementations.Session
             var newToken = new AuthenticationInfo
             {
                 AppName = app,
+                AppVersion = appVersion,
                 DateCreated = DateTime.UtcNow,
                 DeviceId = deviceId,
                 DeviceName = deviceName,
@@ -1690,6 +1691,12 @@ namespace MediaBrowser.Server.Implementations.Session
                 deviceId = info.DeviceId;
             }
 
+            // Prevent argument exception
+            if (string.IsNullOrWhiteSpace(appVersion))
+            {
+                appVersion = "1";
+            }
+
             return LogSessionActivity(appName, appVersion, deviceId, deviceName, remoteEndpoint, user);
         }
 
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 621b97a63..8019ca0e3 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5557.30000")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5557.30000")]