Auth Framework, Part 2
Auth class is back up and running to handle user authorizaion as well as session managment. Implemented basic usage on admin index class just for an example. Added a couple of new template files and css to start defining the overall style of pages and UI.
This commit is contained in:
parent
54b5227a0d
commit
e424df18aa
10 changed files with 159 additions and 36 deletions
|
@ -10,6 +10,7 @@
|
||||||
"doctrine/doctrine-bundle": "^2.7",
|
"doctrine/doctrine-bundle": "^2.7",
|
||||||
"doctrine/doctrine-migrations-bundle": "^3.2",
|
"doctrine/doctrine-migrations-bundle": "^3.2",
|
||||||
"doctrine/orm": "^2.13",
|
"doctrine/orm": "^2.13",
|
||||||
|
"rbdwllr/reallysimplejwt": "^5.0",
|
||||||
"sensio/framework-extra-bundle": "^6.2",
|
"sensio/framework-extra-bundle": "^6.2",
|
||||||
"symfony/console": "6.1.*",
|
"symfony/console": "6.1.*",
|
||||||
"symfony/dotenv": "6.1.*",
|
"symfony/dotenv": "6.1.*",
|
||||||
|
|
61
composer.lock
generated
61
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "32bef6ad7b9303bf2b8b60af3f4fa409",
|
"content-hash": "eb3c50bec813d049150ad9f4cf2b9617",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "doctrine/annotations",
|
"name": "doctrine/annotations",
|
||||||
|
@ -1726,6 +1726,65 @@
|
||||||
},
|
},
|
||||||
"time": "2021-07-14T16:46:02+00:00"
|
"time": "2021-07-14T16:46:02+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "rbdwllr/reallysimplejwt",
|
||||||
|
"version": "5.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/RobDWaller/ReallySimpleJWT.git",
|
||||||
|
"reference": "d7e1014ccbfba43420866fd3dc3f18a521883868"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/RobDWaller/ReallySimpleJWT/zipball/d7e1014ccbfba43420866fd3dc3f18a521883868",
|
||||||
|
"reference": "d7e1014ccbfba43420866fd3dc3f18a521883868",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": ">=8.0.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"friendsofphp/php-cs-fixer": "^2.19",
|
||||||
|
"infection/infection": "^0.26",
|
||||||
|
"phpbench/phpbench": "^1.2",
|
||||||
|
"phploc/phploc": "^7.0",
|
||||||
|
"phpmd/phpmd": "^2.11",
|
||||||
|
"phpstan/phpstan": "^1.2",
|
||||||
|
"phpunit/phpunit": "^9.5",
|
||||||
|
"sebastian/phpcpd": "^6.0",
|
||||||
|
"squizlabs/php_codesniffer": "^3.6"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"ReallySimpleJWT\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Rob Waller",
|
||||||
|
"email": "rdwaller1984@gmail.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "A really simple library to generate user authentication JSON Web Tokens.",
|
||||||
|
"keywords": [
|
||||||
|
"Authentication",
|
||||||
|
"json",
|
||||||
|
"json web tokens",
|
||||||
|
"jwt",
|
||||||
|
"php",
|
||||||
|
"tokens"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/RobDWaller/ReallySimpleJWT/issues",
|
||||||
|
"source": "https://github.com/RobDWaller/ReallySimpleJWT/tree/5.0.0"
|
||||||
|
},
|
||||||
|
"time": "2022-04-16T14:00:21+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "sensio/framework-extra-bundle",
|
"name": "sensio/framework-extra-bundle",
|
||||||
"version": "v6.2.9",
|
"version": "v6.2.9",
|
||||||
|
|
12
public/assets/css/front/index-den.css
Normal file
12
public/assets/css/front/index-den.css
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
section[role="den-login"] {
|
||||||
|
padding: 30px;
|
||||||
|
width: 300px;
|
||||||
|
color: var(--highlight);
|
||||||
|
}
|
||||||
|
|
||||||
|
section[role="den-login"] div[role="system-notice"] {
|
||||||
|
border-radius: 3px;
|
||||||
|
padding: 3px;
|
||||||
|
background: var(--highlight);
|
||||||
|
color: var(--primary);
|
||||||
|
}
|
|
@ -3,3 +3,4 @@
|
||||||
@import url("typography.css");
|
@import url("typography.css");
|
||||||
@import url("frame.css");
|
@import url("frame.css");
|
||||||
@import url("index.css");
|
@import url("index.css");
|
||||||
|
@import url("index-den.css");
|
||||||
|
|
|
@ -8,37 +8,56 @@ namespace App\Controller\Routes\Back;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\Routing\Annotation\Route;
|
use Symfony\Component\Routing\Annotation\Route;
|
||||||
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||||
|
|
||||||
//use App\Utils\PageRender;
|
//use App\Utils\PageRender;
|
||||||
//use App\Data\Auth;
|
use App\Service\Auth;
|
||||||
|
|
||||||
class Index extends AbstractController
|
class Index extends AbstractController
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @Route("/screendoor", name="back-index")
|
* @Route("/den", name="back-index")
|
||||||
*/
|
*/
|
||||||
public function showBackIndex(Request $request): Response
|
public function enterTheDen(Request $request, Auth $auth, RequestStack $requestStack): Response
|
||||||
{
|
{
|
||||||
|
if ($request->getMethod() == "GET") {
|
||||||
|
$result = $auth->status();
|
||||||
|
if ($result["status"]) {
|
||||||
|
$session = $requestStack->getSession();
|
||||||
|
$member = $session->get("member");
|
||||||
|
return $this->render("back/start.twig", [
|
||||||
|
"title" => "Welcome Back",
|
||||||
|
"handle" => $member->getHandle()
|
||||||
|
]);
|
||||||
|
} else {
|
||||||
return $this->render("back/index.twig", [
|
return $this->render("back/index.twig", [
|
||||||
"title" => "Close the door behind you",
|
"title" => "Close the door behind you",
|
||||||
]);
|
]);
|
||||||
/*
|
}
|
||||||
$result = $auth->status();
|
|
||||||
if ($result["status"]) {
|
|
||||||
return $render->renderPage(
|
|
||||||
[
|
|
||||||
"bgImage" => "/images/base/tweed-flowers.png",
|
|
||||||
"role" => $result["role"],
|
|
||||||
],
|
|
||||||
"The Nile List | Welcome Back",
|
|
||||||
"front/index.html.twig"
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
//back to index to login
|
//handles login
|
||||||
header("Location:/login");
|
$handle = $request->request->get("handle");
|
||||||
|
$pass = $request->request->get("password");
|
||||||
|
$result = $auth->authCheck($handle, $pass);
|
||||||
|
if ($result["status"]) {
|
||||||
|
header("Location:/den");
|
||||||
return new Response("<html><body>LOGGED IN</body></html>");
|
return new Response("<html><body>LOGGED IN</body></html>");
|
||||||
|
} else {
|
||||||
|
return $this->render("back/index.twig", [
|
||||||
|
"title" => "Close the door behind you",
|
||||||
|
"notice" => $result["message"]
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Route("/logout", name="logout-page")
|
||||||
*/
|
*/
|
||||||
|
public function leaveTheDen(Auth $auth)
|
||||||
|
{
|
||||||
|
$auth->logout();
|
||||||
|
header("Location:/den");
|
||||||
|
return new Response("<html><body>LOGGED OUT</body></html>");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ class Members extends AbstractController
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Route("/screendoor/members/add", name="members-add")
|
* @Route("/den/members/add", name="members-add")
|
||||||
*/
|
*/
|
||||||
public function addMembers(
|
public function addMembers(
|
||||||
Request $request,
|
Request $request,
|
||||||
|
|
|
@ -6,7 +6,7 @@ namespace App\Service;
|
||||||
|
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
use Symfony\Component\HttpFoundation\RequestStack;
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
use App\Entity\Members;
|
use App\Entity\Member;
|
||||||
use ReallySimpleJWT\Token;
|
use ReallySimpleJWT\Token;
|
||||||
|
|
||||||
class Auth
|
class Auth
|
||||||
|
@ -23,12 +23,12 @@ class Auth
|
||||||
$this->secret = '!$ec7eT$l0w*';
|
$this->secret = '!$ec7eT$l0w*';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authCheck($email, $password)
|
public function authCheck($handle, $password)
|
||||||
{
|
{
|
||||||
$response = [];
|
$response = [];
|
||||||
$member = new Members();
|
$member = new Member();
|
||||||
$members = $this->entityManager->getRepository(Members::class);
|
$members = $this->entityManager->getRepository(Member::class);
|
||||||
$member = $members->findOneBy(["email" => $email]);
|
$member = $members->findOneBy(["handle" => $handle]);
|
||||||
if (!$member) {
|
if (!$member) {
|
||||||
$response = ["status" => false, "message" => "Member Not Found"];
|
$response = ["status" => false, "message" => "Member Not Found"];
|
||||||
} else {
|
} else {
|
||||||
|
@ -40,10 +40,10 @@ class Auth
|
||||||
$secret = $this->secret;
|
$secret = $this->secret;
|
||||||
$expiration = time() + 3600;
|
$expiration = time() + 3600;
|
||||||
$token = Token::create(
|
$token = Token::create(
|
||||||
$member->getMemberId(),
|
$member->getId(),
|
||||||
$secret,
|
$secret,
|
||||||
$expiration,
|
$expiration,
|
||||||
"nile_admin"
|
"bad_space_admin"
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->session->set("token", $token);
|
$this->session->set("token", $token);
|
||||||
|
|
|
@ -1,10 +1,16 @@
|
||||||
{% extends "base/frame.twig" %}
|
{% extends "base/frame.twig" %}
|
||||||
{% block stylesheets %}
|
{% block stylesheets %}
|
||||||
<link rel="stylesheet" type="text/css" href="/assets/css/front/start.css?=sdfsdf">
|
<link rel="stylesheet" type="text/css" href="/assets/css/front/start.css?=dfadf">
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block main %}
|
{% block main %}
|
||||||
<section role="intro">
|
<section role="den-login">
|
||||||
This is the screendoor index
|
<h1>This is the Den</h1><br/>
|
||||||
|
{% if notice is defined %}
|
||||||
|
<div role="system-notice">
|
||||||
|
{{ notice }}
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
{{ include("forms/login-form.twig") }}
|
||||||
</section>
|
</section>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
17
templates/back/start.twig
Normal file
17
templates/back/start.twig
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{% extends "base/frame.twig" %}
|
||||||
|
{% block stylesheets %}
|
||||||
|
<link rel="stylesheet" type="text/css" href="/assets/css/front/start.css?=sdfsdf">
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block main %}
|
||||||
|
<section>
|
||||||
|
<h1>
|
||||||
|
Welcome to the Den.
|
||||||
|
</h1>
|
||||||
|
Hey
|
||||||
|
{{ handle }}
|
||||||
|
. Nice to see you again.
|
||||||
|
<a href="/logout">Bye bye</a>
|
||||||
|
|
||||||
|
</section>
|
||||||
|
{% endblock %}
|
8
templates/forms/login-form.twig
Normal file
8
templates/forms/login-form.twig
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
<form action="{{ path('back-index') }}" method="post" enctype="multipart/form-data">
|
||||||
|
<label>Handle</label><br/>
|
||||||
|
<input type="text" name="handle" value=""/>
|
||||||
|
<br/>
|
||||||
|
<label>Password</label><br/>
|
||||||
|
<input type="password" name="password" value=""/>
|
||||||
|
<input type="hidden" name="token" value="{{ csrf_token('upload') }}"/><br/>
|
||||||
|
<input type="submit" value="Knock Knock" name="submit_button"></form>
|
Loading…
Reference in a new issue