Added metar to route page

Controllers/AppController.cs

@@ -23,18 +23,17 @@ namespace EFB.Controllers
         public IActionResult Index()
         {
             //Check to see what point on the application the user is at and where they should be sent
-            UserModel User = HttpContext.Session.GetObject<UserModel>("User");
-            if (User != null)
+            UserModel user = HttpContext.Session.GetObject<UserModel>("User");
+            if (user == null)
             {
-                if (User.Route == null)
-                {
-                    return RedirectToAction("Index", "Route");
-                }else{
-                    return RedirectToAction("Index", "App");
-                }
-            }else{
                 return RedirectToAction("Index", "Home");    
             }
+            if (user.Route == null)
+            {
+                return RedirectToAction("Index", "Route");
+            }
+            
+            return View(user);
         }
 
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]

Controllers/FlightsimController.cs

@@ -26,10 +26,16 @@ namespace EFB.Controllers
         {
             //Retrieve and Check current user status
             UserModel user = HttpContext.Session.GetObject<UserModel>("User");
-            if(user == null) return RedirectToAction("Index", "Home");
+            if(user == null){
+                TempData["Error"] = "You must be logged in before you are able to view the FlightSim Page";
+                return RedirectToAction("Index", "Home");
+            } 
 
             //Retrieve the user's latest sim position and construct it into FlightsimModel
-            if (user.Route == null) return RedirectToAction("Index", "Route");
+            if (user.Route == null){
+                TempData["Error"] = "You must have a route planned before you are able to view the Flightsim page";
+                return RedirectToAction("Index", "Route");
+            } 
 
             SimPositionModel latestPositionModel = await Mongo.GetLatestData(user.EMail);
 

Controllers/RouteController.cs

@@ -46,157 +46,150 @@ namespace EFB.Controllers
         public async Task<IActionResult> New(string departure, string arrival, string cruise)
         {
             UserModel user = HttpContext.Session.GetObject<UserModel>("User");
-            if (!(user == null || user.UserToken.IsExpired()))
+            if (user == null || user.UserToken.IsExpired())
             {//If the user is still authenticated
-                if (FormAuthenticator.ValidateICAOCode(departure) && FormAuthenticator.ValidateICAOCode(arrival))
-                {//If the user has entered valid ICAOs
+                return RedirectToAction("Index", "Home");
+            }
 
-                    uint cruiseAlt;
+            if (!FormAuthenticator.ValidateICAOCode(departure) || !FormAuthenticator.ValidateICAOCode(arrival))
+            {//If the user has entered valid ICAOs
+            TempData["Error"] = "Invalid Departure or Arrival ICAO";
+            return RedirectToAction("Index", "Route");
+            }
             
-                    if (uint.TryParse(cruise, out cruiseAlt) && FormAuthenticator.ValidateCruiseAlt(cruiseAlt))
-                    {//If the cruise altitude if within limits.
+            uint cruiseAlt;
 
-                        //Submit route request...
-                        APIInterface API = new APIInterface();
+            if (uint.TryParse(cruise, out cruiseAlt) && FormAuthenticator.ValidateCruiseAlt(cruiseAlt))
+            {//If the cruise altitude if within limits.
 
-                        //Prepare data to be send off with request (route)
-                        Dictionary<string, string> headerData = new Dictionary<string, string>();
-                        headerData.Add("Authorization", $"Bearer {user.UserToken.TokenValue}");
+                //Submit route request...
+                APIInterface API = new APIInterface();
 
-                        RouteRequest routeRequest = new RouteRequest()
-                        {
-                            departure = departure,
-                            destination = arrival,
-                            preferredminlevel = cruiseAlt / 1000,
-                            preferredmaxlevel = cruiseAlt / 1000,
-                        };
-                        StringContent content = new StringContent(JsonConvert.SerializeObject(routeRequest), Encoding.UTF8, "application/json");
+                //Prepare data to be send off with request (route)
+                Dictionary<string, string> headerData = new Dictionary<string, string>();
+                headerData.Add("Authorization", $"Bearer {user.UserToken.TokenValue}");
 
-                        //Make initial Route Request
-                        var requestRoute = API.Post<string>("https://api.autorouter.aero/v1.0/router", headerData, content);
+                RouteRequest routeRequest = new RouteRequest()
+                {
+                    departure = departure,
+                    destination = arrival,
+                    preferredminlevel = cruiseAlt / 1000,
+                    preferredmaxlevel = cruiseAlt / 1000,
+                };
+                StringContent content = new StringContent(JsonConvert.SerializeObject(routeRequest), Encoding.UTF8, "application/json");
                 
-                        ResponseModel<string> responseRoute = await requestRoute;
+                //Make initial Route Request
+                var requestRoute = API.Post<string>("https://api.autorouter.aero/v1.0/router", headerData, content);
 
-                        if (responseRoute.Error == null)
-                        {//Update User session and add route ID
-                            TokenModel routeToken = new TokenModel()
-                            {
-                                TokenValue = responseRoute.Result.ToString()
-                            };
+                ResponseModel<string> responseRoute = await requestRoute;
 
-                            user.RouteToken = routeToken;
-                            HttpContext.Session.SetObject("User", user);
+                if (responseRoute.Error == null)
+                {//Update User session and add route ID
+                    TokenModel routeToken = new TokenModel()
+                    {
+                        TokenValue = responseRoute.Result.ToString()
+                    };
 
-                            return await Poll(departure, arrival, cruiseAlt);
+                    user.RouteToken = routeToken;
+                    HttpContext.Session.SetObject("User", user);
 
-                        }
-
-                        TempData["Error"] = responseRoute.Error;
-                        return RedirectToAction("Index", "Route");
-
-                    }
-                    TempData["Error"] = "Invalid Cruise Altitude";
-                    TempData["Departure"] = departure;
-                    TempData["Arrival"] = arrival;
-                    return RedirectToAction("Index", "Route");
+                    return await Poll(departure, arrival, cruiseAlt);
 
                 }
-                TempData["Error"] = "Invalid Departure or Arrival ICAO";
+
+                TempData["Error"] = responseRoute.Error;
                 return RedirectToAction("Index", "Route");
+
             }
-            return RedirectToAction("Index", "Home");
+            TempData["Error"] = "Invalid Cruise Altitude";
+            TempData["Departure"] = departure;
+            TempData["Arrival"] = arrival;
+            return RedirectToAction("Index", "Route");
         }
 
 
         public async Task<IActionResult> Poll(string departure, string arrival, uint cruise)
         {
-            if (HttpContext.Session.GetString("User") != null)
-            {//If the user is currently logged in
-                UserModel user = HttpContext.Session.GetObject<UserModel>("User");
-
-                if (user.RouteToken != null)
-                {//If the user has a route object (e.g, they have been to the route page)
-
-                    //Make calls to the server to fetch route
-                    bool collected = false;
-                    int pollCount = 0;
-                    string routeString = "";
-
-                    APIInterface API = new APIInterface();
-                    Dictionary<string, string> headerData = new Dictionary<string, string>();
-
-                    /*-----Chart Fetching Operations--------*/
-
-                    var requestDepartureCharts = ChartModel.FetchAsync(departure);
-                    var requestArrivalCharts = ChartModel.FetchAsync(arrival);
-
-                    /*----------------------------------*/
-
-                    //Run route Polling
-                    headerData.Add("Authorization", $"Bearer {user.UserToken.TokenValue}");
-
-                    while (collected == false && pollCount < 15)
-                    {
-                        //Make Polling Request
-                        var pollingRequest = API.Put<List<PollResponse>>($"https://api.autorouter.aero/v1.0/router/{user.RouteToken.TokenValue}/longpoll", headerData, null);
-
-                        ResponseModel<List<PollResponse>> responsePoll = await pollingRequest;
-
-                        foreach (var item in responsePoll.Result)
-                        {
-                            if (item.Command == "notvalid" || item.Command == "solution")
-                            {
-                                collected = true;
-                                routeString = item.FlightPlan;
-                                break;
-                            }
-                        }
-
-                        Thread.Sleep(3000);
-                        pollCount++;
-
-                    }
-
-                    if (collected)
-                    {
-                        //Get Response from Charts
-                        ChartList departureCharts = await requestDepartureCharts;
-                        if (departureCharts != null)
-                        {
-                            user.DepartureCharts = new ChartModel(departure, departureCharts);
-                        }
-                        
-                        ChartList arrivalCharts = await requestArrivalCharts;
-                        if (arrivalCharts != null)
-                        {
-                            user.ArrivalCharts = new ChartModel(arrival, arrivalCharts);
-                        }
-
-                        //fill in route
-                        string finalRoute = RouteModel.ParseRoute(routeString);
-                        user.Route = finalRoute;
-                        user.Departure = departure;
-                        user.Arrival = arrival;
-                        user.Cruise = cruise;
-                        HttpContext.Session.SetObject("User", user);
-                        
-                        return RedirectToAction("Index", "Route");
-                    }
-
-                    TempData["Error"] = $"Unable to get route after {pollCount} Attempts!";
-                    return RedirectToAction("Index", "Route");
-
-                }
-                else
-                {
-                    return RedirectToAction("Index", "Route");
-                }
-
-            }
-            else
-            {
+            if (HttpContext.Session.GetString("User") == null)
+            {//If the user is not currently logged in
+                TempData["Error"] = "Please login before trying to plan a route";
                 return RedirectToAction("Index", "Route");
             }
+
+            UserModel user = HttpContext.Session.GetObject<UserModel>("User");
+
+            if (user.RouteToken == null)
+            {//If the user has a route object (e.g, they have been to the route page)
+                return RedirectToAction("Index", "Route");
+            }
+            //Make calls to the server to fetch route
+            bool collected = false;
+            int pollCount = 0;
+            string routeString = "";
+
+            APIInterface API = new APIInterface();
+            Dictionary<string, string> headerData = new Dictionary<string, string>();
+
+            /*-----Chart Fetching Operations--------*/
+
+            var requestDepartureCharts = ChartModel.FetchAsync(departure);
+            var requestArrivalCharts = ChartModel.FetchAsync(arrival);
+
+            /*----------------------------------*/
+
+            //Run route Polling
+            headerData.Add("Authorization", $"Bearer {user.UserToken.TokenValue}");
+
+            while (collected == false && pollCount < 15)
+            {
+                //Make Polling Request
+                var pollingRequest = API.Put<List<PollResponse>>($"https://api.autorouter.aero/v1.0/router/{user.RouteToken.TokenValue}/longpoll", headerData, null);
+
+                ResponseModel<List<PollResponse>> responsePoll = await pollingRequest;
+
+                foreach (var item in responsePoll.Result)
+                {
+                    if (item.Command == "notvalid" || item.Command == "solution")
+                    {
+                        collected = true;
+                        routeString = item.FlightPlan;
+                        break;
+                    }
+                }
+
+                Thread.Sleep(3000);
+                pollCount++;
+
+            }
+
+            if (collected)
+            {
+                //Get Response from Charts
+                ChartList departureCharts = await requestDepartureCharts;
+                if (departureCharts != null)
+                {
+                    user.DepartureCharts = new ChartModel(departure, departureCharts);
+                }
+                
+                ChartList arrivalCharts = await requestArrivalCharts;
+                if (arrivalCharts != null)
+                {
+                    user.ArrivalCharts = new ChartModel(arrival, arrivalCharts);
+                }
+
+                //fill in route
+                string finalRoute = RouteModel.ParseRoute(routeString);
+                user.Route = finalRoute;
+                user.Departure = departure;
+                user.Arrival = arrival;
+                user.Cruise = cruise;
+                HttpContext.Session.SetObject("User", user);
+                
+                return RedirectToAction("Index", "App");
+            }
+
+            TempData["Error"] = $"Unable to get route after {pollCount} Attempts!";
+            return RedirectToAction("Index", "Route");
         }
 
         

Controllers/UserController.cs

@@ -31,63 +31,58 @@ namespace EFB.Controllers
 
         public async Task<IActionResult> Login(string email, string password){
 
-            if (Form.FormAuthenticator.ValidateEMail(email))
+            if (!Form.FormAuthenticator.ValidateEMail(email))
             {
-                //API Helper
-                APIInterface API = new APIInterface();
-
-                //Dictionary of Formdata to be encoded
-                Dictionary<string, string> formData = new Dictionary<string, string>();
-
-                formData.Add("grant_type", "client_credentials");
-                formData.Add("client_id", email);
-                formData.Add("client_secret", password);
-
-                HttpContent content = new FormUrlEncodedContent(formData);
-                
-                var request = API.Post<Models.JSON.LoginResponse>("https://api.autorouter.aero/v1.0/oauth2/token", null, content);
-
-                //Wait for the response to come through
-                ResponseModel<LoginResponse> response = await request;
-
-                if (response.Error != null)
-                {
-                    TempData["Error"] = response.Error;
-                    TempData["email"] = email;
-                    return RedirectToAction("Index", "Home");
-                }else{
-
-                    //Type cast required but we know response will be of known type
-                    LoginResponse login = response.Result;
-
-                    //Generate User Session
-                    if (login.error == null)
-                    {
-                        UserModel user = new UserModel{
-                            EMail = email,
-                            UserToken = new TokenModel{
-                                TokenValue = login.access_token,
-                                Expiration = DateTime.UtcNow.AddSeconds(login.expires_in)
-                            }
-                        };
-
-                        //Using Session Extensions (Store the user session)
-                        HttpContext.Session.SetObject("User", user);
-                        return RedirectToAction("Index", "App");
-                    }else{
-                        TempData["Error"] = login.error_description;
-                        TempData["email"] = email;
-                        return RedirectToAction("Index", "Home");
-                    }
-
-                    
-                }
-
-            }else{
                 TempData["Error"] = "Please enter a valid E-Mail";
                 return RedirectToAction("Index", "Home");
             }
 
+            //API Helper
+            APIInterface API = new APIInterface();
+
+            //Dictionary of Formdata to be encoded
+            Dictionary<string, string> formData = new Dictionary<string, string>();
+
+            formData.Add("grant_type", "client_credentials");
+            formData.Add("client_id", email);
+            formData.Add("client_secret", password);
+
+            HttpContent content = new FormUrlEncodedContent(formData);
+            
+            var request = API.Post<Models.JSON.LoginResponse>("https://api.autorouter.aero/v1.0/oauth2/token", null, content);
+
+            //Wait for the response to come through
+            ResponseModel<LoginResponse> response = await request;
+
+            if (response.Error != null)
+            {
+                TempData["Error"] = response.Error;
+                TempData["email"] = email;
+                return RedirectToAction("Index", "Home");
+            }
+            //Type cast required but we know response will be of known type
+            LoginResponse login = response.Result;
+
+            //Generate User Session
+            if (login.error != null)
+            {
+                TempData["Error"] = login.error_description;
+                TempData["email"] = email;
+                return RedirectToAction("Index", "Home");
+            }
+
+            UserModel user = new UserModel{
+                EMail = email,
+                UserToken = new TokenModel{
+                    TokenValue = login.access_token,
+                    Expiration = DateTime.UtcNow.AddSeconds(login.expires_in)
+                }
+            };
+
+            //Using Session Extensions (Store the user session)
+            HttpContext.Session.SetObject("User", user);
+            return RedirectToAction("Index", "App");
+
         }
 
         public IActionResult Logout(){

EFB.csproj

@@ -7,5 +7,6 @@
     <PackageReference Include="MySql.Data" Version="*"/>
     <PackageReference Include="MongoDB.Driver" Version="*"/>
     <PackageReference Include="MongoDB.Bson" Version="*"/>
+    <PackageReference Include="libmetar" Version="*"/>
   </ItemGroup>
 </Project>

Metar/Metar.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using libmetar.Services;
+
+namespace EFB.Metar
+{
+    public static class Metar
+    {
+        private static MetarService metarService { get; set; } = new MetarService();
+        private static TafService tafService { get; set; } = new TafService();
+        
+
+        public static async Task<string> GetMETAR(string ICAO){
+            return (await metarService.GetRawAsync(ICAO)).Raw;
+        }
+
+        public static async Task<List<string>> GetTAF(string ICAO){
+            var downloadedTAF = (await tafService.GetRawAsync(ICAO)).RawSplit;
+            List<string> TAF = new List<string>();
+            
+            foreach (var line in downloadedTAF)
+            {
+                TAF.Add(line);
+            }
+            return TAF;
+        }
+
+
+    }
+}

Views/App/Index.cshtml

@@ -0,0 +1,48 @@
+@using EFB.Metar;
+@model EFB.Models.UserModel;
+@{
+    ViewData["Title"] = "Welcome";
+}
+
+<div class="row d-flex">
+    <div class="card-body col-md-12 bg-primary">
+        <div class="container jumbotron">
+            <h3>Current Session - @Model.EMail</h3>
+
+            <br />
+            <br />
+
+            
+            <div class="row d-flex">
+                <div class="col-md-6">
+                    <h4>Departure</h4>
+                    @Model.Departure
+
+                    <br />
+
+                    @await Metar.GetMETAR(Model.Departure)
+
+                    <h4>Cruise</h4>
+                    @Model.Cruise ft
+                </div>
+                <div class="col-md-6">
+                    <h4>Arrival</h4>
+                    @Model.Arrival
+
+                    <br />
+
+                    @await Metar.GetMETAR(Model.Arrival)
+                </div>
+            </div>
+
+            <br />            
+
+            <h4>Route</h4>
+            @Model.Route
+
+        </div>
+    </div>
+</div>
+
+
+

Views/Charts/ViewCharts.cshtml

@@ -1,4 +1,5 @@
 @using Newtonsoft.Json;
+@using EFB.Metar;
 @model EFB.Models.ViewChartModel;
 @{
     ViewData["Title"] = "Welcome";
@@ -80,6 +81,10 @@
                     </div>
                 </form>
             }
+
+            <br />
+            <h4>Current Weather</h4>
+            @await Metar.GetMETAR(@Model.Charts.ICAO);
         </div>
     </div>
 
@@ -99,4 +104,6 @@
             }
         </div>
     </div>
+
+
 </div>