Merge pull request #45 from gitcomteam/dev

v0.17.1

Author: mx2s

App/AL/CLI/Creation/CreateProject.cs

@@ -17,8 +17,6 @@ public CreateProject() {
         }
 
         public CliResult Execute() {
-            Output("Manually creating project");
-            
             Output("Type creator login:");
             var userLogin = Console.ReadLine();
 

App/AL/CLI/Creation/CreateUser.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using App.DL.Repository.User;
+using App.PL.Transformer.User;
+using Micron.AL.Config.CLI;
+using Micron.DL.Module.CLI;
+using Micron.DL.Module.Misc;
+
+namespace App.AL.CLI.Creation {
+    public class CreateUser : BaseCommand, ICliCommand {
+        public override string Signature { get; } = "create-user";
+
+        public CreateUser() {
+            StrOutput = new List<string>();
+        }
+
+        public CliResult Execute() {
+            Output("Type email:");
+            var email = Console.ReadLine();
+            var user = UserRepository.FindByEmail(email);
+            if (user != null) {
+                Output("User with this email already exists");
+                return new CliResult(CliExitCode.UnknownError, StrOutput);
+            }
+            
+            Output("Type login:");
+            var login = Console.ReadLine();
+            user = UserRepository.FindByLogin(login);
+            if (user != null) {
+                Output("User with this login already exists");
+                return new CliResult(CliExitCode.UnknownError, StrOutput);
+            }
+            
+            Output("Type password:");
+            var password = Console.ReadLine();
+            password = string.IsNullOrEmpty(password) ? Rand.RandomString() : password;
+            Console.WriteLine($"New password: {password}");
+
+            user = UserRepository.FindOrCreateByEmailAndLogin(email, login, password);
+            
+            Output("Created user:"); 
+            Output(new UserTransformer().Transform(user).ToString());
+            
+            return new CliResult(CliExitCode.Ok, StrOutput);
+        }
+    }
+}

App/AL/Config/CLI/CommandsList.cs

@@ -12,6 +12,7 @@ public static ICliCommand[] Get()
                 new ApproveInvoice(),
                 new DbTablesCount(),
                 new CreateProject(),
+                new CreateUser(),
             };
     }
 }

App/AL/Controller/Auth/External/GitHub/GithubAuthController.cs

@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using App.DL.Enum;
-using App.DL.Model.Auth;
 using App.DL.Repository.Auth;
 using App.DL.Repository.User;
 using Micron.DL.Middleware;
 using Micron.DL.Module.Auth;
 using Micron.DL.Module.Config;
 using Micron.DL.Module.Controller;
 using Micron.DL.Module.Http;
+using Micron.DL.Module.Misc;
 using Nancy;
 using Newtonsoft.Json.Linq;
 using Octokit;
@@ -18,18 +18,18 @@ public sealed class GithubAuthController : BaseController {
         protected override IMiddleware[] Middleware() => new IMiddleware[] {};
 
         private const string Scopes = "user:email,read:user";
-        
+
         public GithubAuthController() {
             var clientId = AppConfig.GetConfiguration("auth:external:github:client_id");
             var clientSecret = AppConfig.GetConfiguration("auth:external:github:client_secret");
-            
+
             Get("/api/v1/auth/github/login_link/get", _ => {
                 var loginLink = $"https://github.com/login/oauth/authorize?scope={Scopes}&client_id={clientId}";
                 return HttpResponse.Data(new JObject() {
                     ["login_link"] = loginLink
                 });
             });
-            
+
             Get("/api/v1/auth/github/get_auth_token", _ => {
                 var responseBody = "";
                 var code = GetRequestStr("code");
@@ -65,9 +65,11 @@ public GithubAuthController() {
 
                 var githubUser = githubClient.User.Current().Result;
 
-                var user = UserRepository.FindByEmail(githubUser.Email) ??
+                var userEmail = githubUser.Email ?? $"{Rand.RandomString()}-needs-update@gitcom.org";
+
+                var user = UserRepository.FindByEmail(userEmail) ??
                            UserRepository.FindOrCreateByEmailAndLogin(
-                               githubUser.Email, githubUser.Login, null,
+                               userEmail, githubUser.Login, null,
                                UserRepository.FindByGuid(GetRequestStr("referral_key"))
                            );
 

App/App.csproj

@@ -5,7 +5,7 @@
         <TargetFramework>netcoreapp2.2</TargetFramework>
         <LangVersion>8</LangVersion>
         <Nullable>enable</Nullable>
-        <AssemblyVersion>0.17.0</AssemblyVersion>
+        <AssemblyVersion>0.17.1</AssemblyVersion>
         <FileVersion></FileVersion>
     </PropertyGroup>
 

App/DL/Model/User/User.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Net.Mail;
 using App.DL.Enum;
 using App.DL.Model.Auth;
 using App.DL.Repository.Auth;
@@ -48,12 +49,20 @@ public static User FindByGuid(string guid)
                 new {guid}
             ).FirstOrDefault();
 
-        public static int Create(string email, string login, string password)
-            => ExecuteScalarInt(
+        public static int Create(string email, string login, string password) {
+            try {
+                new MailAddress(email);
+            }
+            catch (Exception e) {
+                Console.WriteLine(e.StackTrace);
+                throw new Exception($"Invalid user email: {email}");
+            }
+            return ExecuteScalarInt(
                 @"INSERT INTO public.users(guid, email, login, password) VALUES (@guid, @email, @login, @password);
                 SELECT currval('users_id_seq');"
                 , new {guid = Guid.NewGuid().ToString(), email, login, password = Encryptor.Encrypt(password)}
             );
+        }
 
         public ServiceAccessToken ServiceAccessToken(ServiceType serviceType) =>
             ServiceAccessTokenRepository.Find(this, serviceType);