Merge pull request #186 from Gid733/master

Minor fixes

Author: renemadsen

eFormAPI/eFormAPI/Controllers/SettingsController.cs

@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Web.Configuration;
 using System.Web.Http;
+using Castle.Core.Internal;
 using eFormAPI.Web.Infrastructure.Helpers;
 using eFormAPI.Web.Infrastructure.Models.Settings.Admin;
 using eFormAPI.Web.Infrastructure.Models.Settings.Initial;
@@ -155,7 +156,9 @@ public OperationDataResult<LoginPageSettingsModel> GetLoginPageSettings()
                     MainText = section.Settings["loginPage:mainText"]?.Value,
                     MainTextVisible = section.Settings["loginPage:mainTextVisible"].Value.Equals("True"),
                     SecondaryText = section.Settings["loginPage:secondaryText"]?.Value,
-                    SecondaryTextVisible = section.Settings["loginPage:secondaryTextVisible"].Value.Equals("True")
+                    SecondaryTextVisible = section.Settings["loginPage:secondaryTextVisible"].Value.Equals("True"),
+                    IsSMTPExists = !section.Settings["email:smtpHost"].Value.IsNullOrEmpty() &&
+                                   !section.Settings["email:smtpPort"].Value.IsNullOrEmpty()
                 };
                 return new OperationDataResult<LoginPageSettingsModel>(true, model);
             }

eFormAPI/eFormAPI/Infrastructure/Models/Settings/Admin/LoginPageSettingsModel.cs

@@ -8,5 +8,6 @@ public class LoginPageSettingsModel
         public bool SecondaryTextVisible { get; set; }
         public string ImageLink { get; set; }
         public bool ImageLinkVisible { get; set; }
+        public bool IsSMTPExists { get; set; }
     }
 }

eform-client/src/app/common/models/settings/login-page-settings.model.ts

@@ -5,4 +5,5 @@ export class LoginPageSettingsModel {
   secondaryTextVisible: boolean;
   imageLink: string;
   imageLinkVisible: boolean;
+  isSMTPExists: boolean;
 }

eform-client/src/app/common/services/app-settings/app-settings.service.ts

@@ -30,6 +30,7 @@ const SettingsMethods = {
 
 @Injectable()
 export class AppSettingsService extends BaseService {
+  loginPageSettingsModel: LoginPageSettingsModel = new LoginPageSettingsModel();
   private headers: Headers;
 
   constructor(private _http: HttpClient, router: Router, toastrService: ToastrService) {

eform-client/src/app/modules/auth/components/auth/auth.component.ts

@@ -24,22 +24,38 @@ export class AuthComponent implements OnInit {
 
   ngOnInit() {
     this.localeService.initLocale();
+    this.checkConnectionString();
+  }
+
+  checkConnectionString() {
+    if (!this.isConnectionStringExist(false)) {
+      setTimeout(() => {
+        this.isConnectionStringExist(true);
+      }, 5000);
+    }
+  }
+
+  isConnectionStringExist(secondCheck: boolean) {
     this.spinnerStatus = true;
     this.settingsService.connectionStringExist().subscribe((result) => {
       if (result && !result.success) {
-        this.router.navigate(['/application-settings/connection-string']).then();
+        if (secondCheck) {
+          this.router.navigate(['/application-settings/connection-string']).then();
+        }
+        return false;
       } else if (result && result.success) {
         this.getSettings();
         this.getTwoFactorInfo();
       } this.spinnerStatus = false;
-    });
+      return true;
+    }, error => false);
   }
 
   getSettings() {
     this.spinnerStatus = true;
     this.settingsService.getLoginPageSettings().subscribe((data) => {
       if (data && data.success) {
-        this.loginPageSettings = data.model;
+        this.loginPageSettings = this.settingsService.loginPageSettingsModel = data.model;
         if (this.loginPageSettings.imageLink && this.loginPageSettings.imageLinkVisible) {
           this.loginImage = 'api/images/login-page-images?fileName=' + this.loginPageSettings.imageLink;
         } else if (!this.loginPageSettings.imageLink) {

eform-client/src/app/modules/auth/components/auth/login/login.component.html

@@ -26,6 +26,8 @@
   </form>
   <eform-spinner [spinnerVisibility]="spinnerStatus"></eform-spinner>
 </div>
-<a class="link-primary" [routerLink]="['restore-password']">{{'Forgot password' | translate}}?</a>
+<a class="link-primary" [routerLink]="['restore-password']" *ngIf="settingsService.loginPageSettingsModel.isSMTPExists">
+  {{'Forgot password' | translate}}?
+</a>
 
 

eform-client/src/app/modules/auth/components/auth/login/login.component.ts

@@ -30,7 +30,7 @@ export class LoginComponent implements OnInit {
 
   constructor(private router: Router,
               private authService: AuthService,
-              private settingsService: AppSettingsService,
+              public settingsService: AppSettingsService,
               private fb: FormBuilder,
               private toastrService: ToastrService,
               private localeService: LocaleService,