ADAM / AIAHTML5

Commit 0e23a56836f7d57144cf4883078938748190b613

Authored by Amrita Vishnoi
2 parents 1f6f64e9 6fd2eed8

Merge branch 'LoginIssueForGAdmin' into Develop

Inline Side-by-side
Showing 2 changed files with 14 additions and 6 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
  View file @0e23a56
... ... @@ -184,7 +184,14 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
184 184 {
185 185 //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0.
186 186 //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin
187   - if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
  187 + int licenseId, editionId;
  188 + AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
  189 +
  190 + userInfo.LicenseId = licenseId;
  191 + userInfo.EditionId = editionId;
  192 +
  193 + //if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
  194 + if(userInfo.LicenseId == 0)
188 195 {
189 196 userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList();
190 197  
... ... @@ -204,11 +211,11 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
204 211 private static void CheckLicenseStatus(User userInfo)
205 212 {
206 213 //05.1 For normal user need to get the license details, get the license id for authenticated user
207   - int licenseId, editionId;
208   - AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
  214 + //int licenseId, editionId;
  215 + //AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
209 216  
210   - userInfo.LicenseId = licenseId;
211   - userInfo.EditionId = editionId;
  217 + //userInfo.LicenseId = licenseId;
  218 + //userInfo.EditionId = editionId;
212 219  
213 220 //05.2 get license details
214 221 userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(userInfo.LicenseId);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @0e23a56
... ... @@ -220,7 +220,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
220 220 }
221 221 else {
222 222  
223   - if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) &&
  223 + //if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) &&
  224 + if (result.LicenseId == 0 && result.IsActive) {
224 225 $rootScope.userData = result;
225 226 $rootScope.userModules = result.Modules;
226 227 $rootScope.isVisibleLogin = false;
... ...