diff --git a/.gitea/workflows/stage-deploy.yaml b/.gitea/workflows/stage-deploy.yaml index 0b608399a..47a8845fa 100644 --- a/.gitea/workflows/stage-deploy.yaml +++ b/.gitea/workflows/stage-deploy.yaml @@ -39,8 +39,8 @@ jobs: SSH_HOST: ${{ secrets.STAGING_SSH_HOST }} - run: | cd ${{ gitea.workspace }} - rsync -av ./csharp/App/Backend/bin/Release/net6.0/linux-x64/publish/ staging:~/backend - rsync -av ./typescript/frontend-marios2/* staging:~/frontend/ + scp -rp ./csharp/App/Backend/bin/Release/net6.0/linux-x64/publish/ staging:~/backend + scp -rp ./typescript/frontend-marios2/* staging:~/frontend/ ssh staging 'sudo systemctl restart backend' ssh staging 'sudo cp -rf ~/frontend/build/* /var/www/html/monitor.innov.energy/html/' ssh staging 'sudo npm install -g serve' diff --git a/csharp/App/Backend/Controller.cs b/csharp/App/Backend/Controller.cs index c1e52a717..35c46d9d8 100644 --- a/csharp/App/Backend/Controller.cs +++ b/csharp/App/Backend/Controller.cs @@ -257,10 +257,10 @@ public class Controller : ControllerBase [HttpPost(nameof(CreateUser))] public ActionResult CreateUser([FromBody] User newUser, Token authToken) { - - var session = new Session(newUser); + var create = Db.GetSession(authToken).Create(newUser); + var session = new Session(Db.GetUserByEmail(newUser.Email)!); var res = Db.Create(session); - return res && Db.GetSession(authToken).Create(newUser) && Db.SendNewUserEmail(newUser, session.Token) + return res && create && Db.SendNewUserEmail(newUser, session.Token) ? newUser.HidePassword() : Unauthorized() ; } @@ -501,7 +501,7 @@ public class Controller : ControllerBase if (user is null) return Unauthorized(); - // Console.WriteLine("HELP"); + return Redirect($"https://monitor.innov.energy/?username={user.Email}"); }