Merge branch 'LoginIssueForGAdmin' into Develop

Amrita Vishnoi
2 parents 1f6f64e9 6fd2eed8
Showing 2 changed files with 14 additions and 6 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -184,7 +184,14 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
         {
             //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0.
             //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin
-            if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
+            int licenseId, editionId;
+            AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
+
+            userInfo.LicenseId = licenseId;
+            userInfo.EditionId = editionId;
+
+            //if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
+            if(userInfo.LicenseId == 0)
             {
                 userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList();
@@ -204,11 +211,11 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
         private static void CheckLicenseStatus(User userInfo)
         {
             //05.1 For normal user need to get the license details, get the license id for authenticated user 
-            int licenseId, editionId;
-            AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
+            //int licenseId, editionId;
+            //AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
-            userInfo.LicenseId = licenseId;
-            userInfo.EditionId = editionId;
+            //userInfo.LicenseId = licenseId;
+            //userInfo.EditionId = editionId;
             //05.2 get license details
             userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(userInfo.LicenseId);
@@ -220,7 +220,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                          }
                          else {
-                                 if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
+                             //if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
+                             if (result.LicenseId == 0 && result.IsActive) {
                                      $rootScope.userData = result;
                                      $rootScope.userModules = result.Modules;
                                      $rootScope.isVisibleLogin = false;