BREAKING: Migrated login to the new UI

coscine/issues#2034

src/STS/Controllers/AccountController.cs

-using Coscine.Api.STS.Models;
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
+using Coscine.Api.STS.Data;
+using Coscine.Api.STS.Models;
 using Coscine.Api.STS.Utils;
-using Coscine.Api.STS.Data;
 using Microsoft.AspNetCore.Identity;
-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Linq;
-using Newtonsoft.Json;
+using System.Threading.Tasks;
 
 namespace Coscine.Api.STS.Controllers
 {
@@ -19,18 +17,24 @@ namespace Coscine.Api.STS.Controllers
             _signInManager = signInManager;
         }
 
-        [Route("[controller]/login")]
-        public ActionResult Login(string returnUrl)
+        /// <summary>
+        /// Return relevant URLs for logging the user in
+        /// </summary>
+        /// <returns>Return relevant URLs for logging the user in</returns>
+        [HttpGet("[controller]/urls/login")]
+        public ActionResult<LoginUrls> GetLoginUrls()
         {
-            ViewBag.ReturnUrl = UrlGenerator.ExtendReturnUrl(returnUrl, Request);
-            ViewBag.ORCiDUrl = ORCiDHandler.GetORCiDOAuthUrl() + UrlGenerator.ORCiDRedirectUrl();
-            System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
-            ViewBag.AppJs = enc.GetString(Program.Configuration.GetAndWait("coscine/apps/login/appjs"));
-            ViewBag.IdentityProviders = JsonConvert.SerializeObject(Startup.CurrentSaml2Options?.
-                IdentityProviders.KnownIdentityProviders.Select((idp) => idp.EntityId));
-            return View();
+            return new LoginUrls
+            {
+                OrcidUrl = ORCiDHandler.GetORCiDOAuthUrl() + UrlGenerator.ORCiDRedirectUrl(),
+                IdentityProviders = Startup.CurrentSaml2Options?.IdentityProviders.KnownIdentityProviders.Select((idp) => idp.EntityId)
+            };
         }
-        
+
+        /// <summary>
+        /// Route for logging the user out of Coscine
+        /// </summary>
+        /// <returns>Redirects the user back to the login page</returns>
         [Route("[controller]/logout")]
         public async Task<ActionResult> Logout()
         {
@@ -47,13 +51,14 @@ namespace Coscine.Api.STS.Controllers
                 }
             }
 
-            ViewBag.LoginUrl = UrlGenerator.GetLoginUrl(Request) + "&logout=true";
+            ViewBag.LoginUrl = UrlGenerator.GetLoginUrl(Request) + "?logout=true";
+
             if (loggedInWithShibboleth)
             {
                 ViewBag.LoginUrl += "&loggedInWithShibboleth=true";
             }
 
-            return View();
+            return Redirect(ViewBag.LoginUrl);
         }
     }
 }