From ffa102e5971f40502acb3a491f66b6f32b7c8c1a Mon Sep 17 00:00:00 2001 From: Kekskurse Date: Sun, 28 Apr 2019 17:04:22 +0200 Subject: [PATCH] Stuff --- Readme.md | 11 +-- app/Http/Controllers/API/UserController.php | 78 ++++++++++++++++++++- resources/views/account/register.php | 16 +++++ routes/web.php | 1 + 4 files changed, 100 insertions(+), 6 deletions(-) diff --git a/Readme.md b/Readme.md index 81abd49..5cfa597 100644 --- a/Readme.md +++ b/Readme.md @@ -12,8 +12,9 @@ Keks Account currently hava a cheap Hacked WebGui # Supportet Software - -* Mattermost CE (Gitlab Integration) -* Gitea (Gitlab Integration) -* Nextcloud (not worrking correct) (Gitlab Integration) -* Jenkins (Gitlab Integration) \ No newline at end of file +Application | Status | Comment +----------- | -------- | -------- +Mattermost CE | Working | Based on the GitLab Integration +Gitea | Working | Based on the GitLab Integration +Nextcloud | Working | Based on the GitLab Integration with https://github.com/zorn-v/nextcloud-social-login +Jenkins | Working | To authorized user, no right managment ATM \ No newline at end of file diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php index 068aebd..8409a0d 100644 --- a/app/Http/Controllers/API/UserController.php +++ b/app/Http/Controllers/API/UserController.php @@ -8,12 +8,16 @@ use App\Exceptions\NoPermissionException; use App\Exceptions\NotLoggedInException; use App\Exceptions\ResourceNotFound; use App\Http\Resources\oAuth\AccessToken; +use App\Jobs\Mails\ValidateMailAddressJob; use App\Models\App; use App\Models\AppAccess; +use App\Models\Invite; +use App\Models\Mail; use App\Models\Setting; use App\Models\User; use Illuminate\Support\Facades\Auth; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Laravel\Lumen\Routing\Controller as BaseController; use ReCaptcha\ReCaptcha; use TaGeSo\APIResponse\Response; @@ -65,7 +69,60 @@ class UserController extends BaseController } public function register(Request $request, Response $response) { - + //If Recptache is enabled check it at the beginning + if(Setting::getSettingValue("recaptcha_v2_register")) { + $reCaptcha = new ReCaptcha(Setting::getSettingValue("recaptcha_v2_secret")); + $response = $reCaptcha->verify($request->input("g-recaptcha-response")); + + if(!$response->isSuccess()) { + throw new HTTPException(400, "Captcha validation failed"); + } + } + + $this->validate($request, [ + 'username' => 'required|max:255|min:5|regex:@^[a-z0-9]*$@|unique:users', + 'password' => 'required|min:8', + 'mail' => 'required|email|unique:mails' + ]); + + DB::beginTransaction(); + + $user = new User(); + $user->username = $request->input("username"); + $user->password = password_hash($request->input("password"), PASSWORD_BCRYPT); + + if($invite != null) { + $user->inviteCode = $invite->code; + } + + //Make first user an admin + $count = User::query()->count("*"); + if($count == 1) { + $user->admin = 1; + $user->developer = 1; + } + + $user->saveOrFail(); + + $mail = new Mail(); + $mail->createValidationToken(); + $mail->mail = $request->input("mail"); + $mail->primary = false; + $mail->status = "waiting"; + $mail->user_id = $user->id; + + $mail->saveOrFail(); + + $this->dispatch(new ValidateMailAddressJob($mail)); + + if($invite != null) { + $invite->status = "used"; + $invite->saveOrFail(); + } + + DB::commit(); + + return $response->withData(new \App\Http\Resources\API\User($user)); } /* @@ -78,4 +135,23 @@ class UserController extends BaseController $data["register"] = (bool)Setting::getSettingValue("recaptcha_v2_register"); return $response->withData($data); } + + public function getInviteCodeInfo(Request $request, Response $response) { + $data = []; + $invite = Invite::query()->where("code", "=", $request->input("code"))->first(); + + if($invite == null) { + throw new ResourceNotFound(); + } + + $usable = false; + if($invite->status == "active") { + $usable = true; + } + $data["usable"] = $usable; + #$data["status"] = $invite->status; + $data["username"] = $invite->username; + + return $response->withData($data); + } } diff --git a/resources/views/account/register.php b/resources/views/account/register.php index 4dfb513..4eddea8 100644 --- a/resources/views/account/register.php +++ b/resources/views/account/register.php @@ -32,6 +32,22 @@