Merge pull request 'fix: fix of pipeline' (#24) from dev into main

Reviewed-on: http://git.lisoveliy.su/Lisoveliy/JOBot/pulls/24

.gitea/workflows/deploy-dev.yml

@@ -0,0 +1,25 @@
+name: Publish JOBot on dev
+on: 
+  push:
+    branches:
+      - dev
+
+jobs:
+  build and deploy:
+    runs-on: host
+    name: Build and deploy
+    volumes:
+      
+    steps:
+      - name: Update repo
+        run: |
+          pwd
+          cd /home/dockeruser/jobot-stack
+          git checkout dev
+          git pull
+          docker compose -f compose.dev.yml up -d postgres
+          
+          cd /home/dockeruser/jobot-stack/JOBot.Backend
+          dotnet ef database update -- --environment Development
+          docker compose up --build -d
+          

JOBot.Backend/Controllers/HeadHunterHookController.cs

@@ -10,9 +10,9 @@ public class HeadHunterHookController(HeadHunterService hhService)
 {
 
     [HttpGet]
-    public async Task<IActionResult> Get(int userId, string? error, string authorizationCode)
+    public async Task<IActionResult> Get(int userId, string? error, string code)
     {
-        var res = await hhService.AuthUser(userId, authorizationCode, error);
+        var res = await hhService.AuthUser(userId, code, error);
         return res switch
         {
             HeadHunterService.Status.Success =>  Ok("Авторизация завершена успешно. Вернитесь в Telegram для продолжения."),

JOBot.Backend/Dockerfile

@@ -10,5 +10,4 @@ WORKDIR /app
 COPY --from=build /app .
 EXPOSE 5001
 EXPOSE 5000
-ENV ASPNETCORE_ENVIRONMENT Staging
 ENTRYPOINT ["dotnet", "JOBot.Backend.dll"]

JOBot.Backend/Services/HeadHunterService.cs

@@ -1,4 +1,5 @@
 using System.Text.Json;
+using System.Web;
 using JOBot.Backend.DAL.Context;
 using JOBot.Backend.DTOs.HeadHunterHook;
 using JOBot.Backend.Infrastructure.Config;
@@ -16,17 +17,10 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
     /// </summary>
     /// <param name="userId">Telegram UserId</param>
     /// <returns>Link for auth</returns>
-    public string GenerateAuthLink(int userId)
+    public string GenerateAuthLink(long userId)
     {
-        var redirectUri = new UriBuilder(_config.Links.HookDomain)
-        {
-            Port = -1,
-            Scheme = "https",
-            Path = _config.Links.HookRoute,
-            Query = $"?userId={userId}"
-        }.ToString();
         
-        return string.Format(_config.Links.AuthLink, [_config.ClientId, userId, redirectUri]);
+        return string.Format(_config.Links.AuthLink, [_config.ClientId, GetRedirectUrl(userId)]);
     }
 
     public async Task<Status> AuthUser(int userId, string authorizationCode, string? error)
@@ -42,10 +36,11 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
         using var client = new HttpClient();
         var form = new Dictionary<string, string>
         {
-            { "client-id", _config.ClientId },
+            { "client_id", _config.ClientId },
             { "client_secret", _config.Secret },
             { "code", authorizationCode },
-            { "grant_type", "authorization_code" }
+            { "grant_type", "authorization_code" },
+            { "redirect_uri", GetRedirectUrl(userId) }
         };
         client.BaseAddress = new UriBuilder(_config.Links.HeadHunterApiDomain)
         {
@@ -64,8 +59,9 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
 
         if (!res.IsSuccessStatusCode)
         {
-            logger.LogWarning($"Response of HttpRequest ${_config.Links.HeadHunterApiDomain} " +
+            logger.LogWarning($"Response of HttpRequest {_config.Links.HeadHunterApiDomain}" +
-                              $"${_config.Links.HeadHunterTokenRoute} has unsuccessful status code {res.StatusCode}");
+                              $"{_config.Links.HeadHunterTokenRoute} has unsuccessful status code {res.StatusCode}");
+            logger.LogWarning($"{res.Content.ReadAsStringAsync().Result}");
             return Status.HeadHunterAuthRejectedError;
         }
         
@@ -95,6 +91,17 @@ public class HeadHunterService(ILogger<HeadHunterService> logger, IOptions<HeadH
         return Status.Success;
     }
 
+    private string GetRedirectUrl(long userId)
+    {
+        return new UriBuilder(_config.Links.HookDomain)
+        {
+            Port = -1,
+            Scheme = "https",
+            Path = _config.Links.HookRoute,
+            Query = $"?userId={userId}"
+        }.ToString();
+    }
+
     public enum Status
     {
         UserAuthRejectedError,

JOBot.Backend/Services/gRPC/UserService.cs

@@ -1,3 +1,4 @@
+using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using JOBot.Backend.DAL.Context;
 using JOBot.Backend.DAL.Models;
@@ -7,7 +8,7 @@ using User = JOBot.Backend.DAL.Models.User;
 
 namespace JOBot.Backend.Services.gRPC;
 
-public class UserService(AppDbContext dbContext) : Proto.User.UserBase
+public class UserService(AppDbContext dbContext, HeadHunterService hhService) : Proto.User.UserBase
 {
     /// <summary>
     /// Create user
@@ -62,6 +63,16 @@ public class UserService(AppDbContext dbContext) : Proto.User.UserBase
         return new AcceptEulaResponse { Success = true };
     }
 
+    public override Task<GetHeadHunterAuthHookResponse> GetHeadHunterAuthHook(
+        GetHeadHunterAuthHookRequest request, 
+        ServerCallContext context)
+    {
+        return Task.Run(() => new GetHeadHunterAuthHookResponse
+        {
+            RegistrationUrl = hhService.GenerateAuthLink(request.UserId)
+        });
+    }
+
     /// <summary>
     /// Throw RPCException if user not found
     /// </summary>

JOBot.Backend/appsettings.Staging.json

@@ -1,12 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-    "AllowedHosts": "*",
-    "ConnectionStrings": {
-        "PostgreSQL": "Host=postgres;Port=5432;Database=jobot_test;Username=postgres;Password=LocalDbPass"
-    }
-}

JOBot.Backend/appsettings.json

@@ -11,7 +11,7 @@
     },
     "HeadHunter": {
         "Links": {
-            "AuthLink": "https://hh.ru/oauth/authorize?response_type=code&client_id={client_id}&redirect_uri={redirect_uri}",
+            "AuthLink": "https://hh.ru/oauth/authorize?response_type=code&client_id={0}&redirect_uri={1}",
             "HookDomain": "jobot.lisoveliy.su",
             "HookRoute": "/auth",
             "HeadHunterApiDomain": "api.hh.ru",

JOBot.TClient/Commands/Buttons/EulaAgreementButtonCommand.cs

@@ -12,6 +12,7 @@ public class EulaAgreementButtonCommand(PrepareUserState prepareUserState) : IAu
 {
     public async Task ExecuteAsync(Update update, GetUserResponse user, CancellationToken ct)
     {
-        await prepareUserState.AcceptEula(update, ct);
+        if (!user.Eula)
+            await prepareUserState.AcceptEula(user, update, ct);
     }
 }

JOBot.TClient/JOBot.TClient.csproj

@@ -57,4 +57,10 @@
         </EmbeddedResource>
     </ItemGroup>
 
+    <ItemGroup>
+      <Content Include="appsettings.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
 </Project>

JOBot.TClient/Services/MenuService.cs

@@ -6,12 +6,10 @@ namespace JOBot.TClient.Services;
 
 public class MenuService(ITelegramBotClient bot)
 {
-    public Task RenderMenu(Update update, CancellationToken ct = default)
+    public async Task RenderMenu(Update update, CancellationToken ct = default)
     {
         ArgumentNullException.ThrowIfNull(update.Message?.From);
         
-        bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
+        await bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
-        
-        return Task.CompletedTask;
     }
 }

JOBot.TClient/Services/PrepareUserService.cs

@@ -83,4 +83,19 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
         if (!result.Success)
             throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot);
     }
+
+    public async Task Auth(Update update, CancellationToken ct = default)
+    {
+        ArgumentNullException.ThrowIfNull(update.Message?.From);
+        
+        var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest()
+        {
+            UserId = update.Message.From.Id
+        });
+
+        await _bot.SendMessage(
+            update.Message.From.Id, 
+            string.Format(TextResource.AskForAuth, [url.RegistrationUrl]), 
+            cancellationToken: ct);
+    }
 }

JOBot.TClient/Statements/PrepareUserState.cs

@@ -1,3 +1,4 @@
+using JOBot.Proto;
 using JOBot.TClient.Services;
 using Telegram.Bot.Types;
 using User = JOBot.Proto.User;
@@ -21,27 +22,34 @@ public class PrepareUserState(PrepareUserService prepareUserService, MenuService
             return; //interrupt while eula isn't accepted
         }
         
-        await OnUserEulaValidStage(update, ct);
+        await OnUserEulaValidStage(user, update, ct);
     }
 
     /// <summary>
     /// Signal for accepted eula
     /// </summary>
+    /// <param name="user"></param>
     /// <param name="update"></param>
     /// <param name="ct"></param>
-    public async Task AcceptEula(Update update, CancellationToken ct = default)
+    public async Task AcceptEula(GetUserResponse user, Update update, CancellationToken ct = default)
     {
         await prepareUserService.AcceptEula(update, ct: ct);
-        await OnUserEulaValidStage(update, ct);
+        await OnUserEulaValidStage(user, update, ct);
     }
-    
+
     /// <summary>
     /// Continue prepare stage
     /// </summary>
+    /// <param name="user"></param>
     /// <param name="update"></param>
     /// <param name="ct"></param>
-    private async Task OnUserEulaValidStage(Update update, CancellationToken ct = default)
+    private async Task OnUserEulaValidStage(GetUserResponse user, Update update, CancellationToken ct = default)
     {
+        if (!user.IsLogged)
+        {
+            await prepareUserService.Auth(update, ct);
+            return;
+        }
         await menuService.RenderMenu(update, ct); //boilerplate
     }
 }

JOBot.TClient/TextResource.Designer.cs

@@ -59,6 +59,15 @@ namespace JOBot.TClient {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Авторизируйтесь на сайте HeadHunter для получения доступа к резюме и вакансиям {0}.
+        /// </summary>
+        public static string AskForAuth {
+            get {
+                return ResourceManager.GetString("AskForAuth", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Команда не найдена, попробуйте что-то другое.
         /// </summary>

JOBot.TClient/TextResource.resx

@@ -34,4 +34,7 @@ https://hh.ru/account/agreement?backurl=%2Faccount%2Fsignup%3Fbackurl%3D%252F%26
     <data name="Info" xml:space="preserve">
         <value>Это бот для упрощения поиска работы на HH.ru</value>
     </data>
+    <data name="AskForAuth" xml:space="preserve">
+        <value>Авторизируйтесь на сайте HeadHunter для получения доступа к резюме и вакансиям {0}</value>
+    </data>
 </root>

Proto/user.proto

@@ -1,14 +1,16 @@
 syntax = "proto3";
 option csharp_namespace = "JOBot.Proto";
 
+import "google/protobuf/wrappers.proto";
+import "google/protobuf/empty.proto";
+
 service User {
 	rpc Register (RegisterRequest) returns (RegisterResponse);
 	rpc GetUser (GetUserRequest) returns (GetUserResponse);
 	rpc AcceptEula (AcceptEulaRequest) returns (AcceptEulaResponse);
+	rpc GetHeadHunterAuthHook(GetHeadHunterAuthHookRequest) returns (GetHeadHunterAuthHookResponse);
 }
 
-import "google/protobuf/wrappers.proto";
-
 message RegisterRequest{
 	int64 user_id = 1;
 	google.protobuf.StringValue username = 2;
@@ -37,4 +39,12 @@ message AcceptEulaRequest {
 
 message AcceptEulaResponse{
 	bool success = 1;
+}
+
+message GetHeadHunterAuthHookRequest{
+	int64 user_id = 1;
+}
+
+message GetHeadHunterAuthHookResponse{
+	string registration_url = 1;
 }

compose.dev.yml

@@ -9,7 +9,7 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./.docker/postgres_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - jobot
   
@@ -20,6 +20,7 @@ services:
     depends_on:
       - postgres
     ports:
+      - "5000:5000"
       - "5001:5001"
     networks:
       - jobot
@@ -34,4 +35,7 @@ services:
       - jobot
 
 networks:
-  jobot:
+  jobot:
+    
+volumes:
+  postgres_data:

compose.yml

@@ -5,9 +5,9 @@ services:
     image: postgres:15
     environment:
       POSTGRES_PASSWORD: LocalDbPass
-      POSTGRES_DB: jobot
+      POSTGRES_DB: jobot  
     volumes:
-      - ./.docker/postgres_data:/var/lib/postgresql/data
+      - postgres_data:/var/lib/postgresql/data
     networks:
       - jobot
   
@@ -17,6 +17,8 @@ services:
       dockerfile: JOBot.Backend/Dockerfile
     depends_on:
       - postgres
+    ports:
+      - "5000:5000"
     networks:
       - jobot
   
@@ -30,4 +32,8 @@ services:
       - jobot
 
 networks:
-  jobot:
+  jobot:
+    
+
+volumes:
+  postgres_data: