+ {listMember}
)
}
@@ -75,10 +62,10 @@ function CoachOptions (){
function MemberDisplay({member}: {member : Member}){
return (
- 
- 
+
)
}
diff --git a/public/api/index.php b/public/api/index.php
index 5734571..da25013 100644
--- a/public/api/index.php
+++ b/public/api/index.php
@@ -51,7 +51,6 @@ function tryGetAuthorization(): ?Account {
$session = PhpSessionHandle::init();
return $session->getAccount();
}
-
$token = $headers['Authorization'];
$gateway = new AccountGateway(new Connection(get_database()));
return $gateway->getAccountFromToken($token);
diff --git a/public/index.php b/public/index.php
index 58a78a4..906a2ae 100644
--- a/public/index.php
+++ b/public/index.php
@@ -103,7 +103,7 @@ function getRoutes(): AltoRouter {
$ar->map("GET", "/team/search", Action::auth(fn(SessionHandle $s) => getTeamController()->displayListTeamByName($s)));
$ar->map("POST", "/team/search", Action::auth(fn(SessionHandle $s) => getTeamController()->listTeamByName($_POST, $s)));
$ar->map("GET", "/team/[i:id]", Action::auth(fn(int $id, SessionHandle $s) => getTeamController()->displayTeam($id, $s)));
- $ar->map("GET", "/team/[i:id]/delete", Action::auth(fn(int $id,SessionHandle $s) => getTeamController()->deleteTeamByid($id,$s)));
+ $ar->map("GET", "/team/[i:id]/delete", Action::auth(fn(int $id,SessionHandle $s) => getTeamController()->deleteTeamById($id,$s)));
$ar->map("GET", "/team/members/add", Action::auth(fn(SessionHandle $s) => getTeamController()->displayAddMember($s)));
$ar->map("POST", "/team/members/add", Action::auth(fn(SessionHandle $s) => getTeamController()->addMember($_POST, $s)));
$ar->map("GET", "/team/members/remove", Action::auth(fn(SessionHandle $s) => getTeamController()->displayDeleteMember($s)));
diff --git a/sql/setup-tables.sql b/sql/setup-tables.sql
index ae5a478..0cf6734 100644
--- a/sql/setup-tables.sql
+++ b/sql/setup-tables.sql
@@ -11,6 +11,7 @@ CREATE TABLE Account
username varchar NOT NULL,
token varchar UNIQUE NOT NULL,
hash varchar NOT NULL,
+ profilePicture varchar NOT NULL
);
CREATE TABLE Tactic
diff --git a/src/App/Controller/EditorController.php b/src/App/Controller/EditorController.php
index 3bbbe61..a05c7d4 100644
--- a/src/App/Controller/EditorController.php
+++ b/src/App/Controller/EditorController.php
@@ -63,7 +63,7 @@ class EditorController {
return $this->openTestEditor($type);
}
- $tactic = $this->model->makeNewDefault($session->getAccount()->getId(), $type);
+ $tactic = $this->model->makeNewDefault($session->getAccount()->getUser()->getId(), $type);
return $this->openEditorFor($tactic);
}
@@ -76,7 +76,7 @@ class EditorController {
public function openEditor(int $id, SessionHandle $session): ViewHttpResponse {
$tactic = $this->model->get($id);
- $failure = TacticValidator::validateAccess($id, $tactic, $session->getAccount()->getId());
+ $failure = TacticValidator::validateAccess($id, $tactic, $session->getAccount()->getUser()->getId());
if ($failure != null) {
return ViewHttpResponse::twig('error.html.twig', ['failures' => [$failure]], HttpCodes::NOT_FOUND);
diff --git a/src/App/Controller/TeamController.php b/src/App/Controller/TeamController.php
index 8e32498..df6188c 100644
--- a/src/App/Controller/TeamController.php
+++ b/src/App/Controller/TeamController.php
@@ -73,7 +73,7 @@ class TeamController {
return ViewHttpResponse::twig('insert_team.html.twig', ['bad_fields' => $badFields]);
}
$teamId = $this->model->createTeam($request['name'], $request['picture'], $request['main_color'], $request['second_color']);
- $this->model->addMember($session->getAccount()->getEmail(),$teamId,'Coach');
+ $this->model->addMember($session->getAccount()->getUser()->getEmail(),$teamId,'COACH');
return $this->displayTeam($teamId, $session);
}
@@ -102,12 +102,11 @@ class TeamController {
return ViewHttpResponse::twig('list_team_by_name.html.twig', ['bad_field' => $badField]);
}
- $teams = $this->model->listByName($request['name'],$session->getAccount()->getId());
+ $teams = $this->model->listByName($request['name'],$session->getAccount()->getUser()->getId());
if (empty($teams)) {
return ViewHttpResponse::twig('display_teams.html.twig', []);
}
-
return ViewHttpResponse::twig('display_teams.html.twig', ['teams' => $teams]);
}
@@ -116,9 +115,9 @@ class TeamController {
* @param SessionHandle $session
* @return HttpResponse
*/
- public function deleteTeamByid(int $id,SessionHandle $session):HttpResponse{
+ public function deleteTeamById(int $id, SessionHandle $session):HttpResponse{
$a = $session->getAccount();
- $ret = $this->model->deleteTeam($a->getEmail(),$id);
+ $ret = $this->model->deleteTeam($a->getUser()->getEmail(),$id);
if($ret != 0){
return ViewHttpResponse::twig('display_team.html.twig',['notDeleted' => true]);
}
@@ -131,19 +130,18 @@ class TeamController {
* @return ViewHttpResponse a view that displays given team information
*/
public function displayTeam(int $id, SessionHandle $session): ViewHttpResponse {
- $result = $this->model->getTeam($id,$session->getAccount()->getId());
+ $result = $this->model->getTeam($id,$session->getAccount()->getUser()->getId());
if($result == null){
return ViewHttpResponse::twig('error.html.twig', [
'failures' => [ValidationFail::unauthorized("Vous n'avez pas accès à cette équipe.")],
], HttpCodes::FORBIDDEN);
}
else{
- $role = $this->model->isCoach($id,$session->getAccount()->getEmail());
+ $role = $this->model->isCoach($id,$session->getAccount()->getUser()->getEmail());
return ViewHttpResponse::react('views/TeamPanel.tsx', [
'team' => [
- "info" => [
- "id" => 1
- ]
+ "info" => $result->getInfo(),
+ "members" => $result->listMembers()
], 'isCoach' => $role]);
}
}
diff --git a/src/App/Controller/VisualizerController.php b/src/App/Controller/VisualizerController.php
index 631468e..946f6d0 100644
--- a/src/App/Controller/VisualizerController.php
+++ b/src/App/Controller/VisualizerController.php
@@ -28,7 +28,7 @@ class VisualizerController {
public function openVisualizer(int $id, SessionHandle $session): HttpResponse {
$tactic = $this->tacticModel->get($id);
- $failure = TacticValidator::validateAccess($id, $tactic, $session->getAccount()->getId());
+ $failure = TacticValidator::validateAccess($id, $tactic, $session->getAccount()->getUser()->getId());
if ($failure != null) {
return ViewHttpResponse::twig('error.html.twig', ['failures' => [$failure]], HttpCodes::NOT_FOUND);
diff --git a/src/Core/Data/Account.php b/src/Core/Data/Account.php
index 48b3e69..01be656 100755
--- a/src/Core/Data/Account.php
+++ b/src/Core/Data/Account.php
@@ -8,10 +8,6 @@ namespace IQBall\Core\Data;
* to share to other users, or non-needed public information
*/
class Account {
- /**
- * @var string $email account's mail address
- */
- private string $email;
/**
* @var string string token
@@ -19,43 +15,28 @@ class Account {
private string $token;
/**
- * @var string the account's username
- */
- private string $name;
-
- /**
- * @var int
+ * @var User contains all the account's "public" information
*/
- private int $id;
-
+ private User $user;
/**
- * @param string $email
- * @param string $name
* @param string $token
- * @param int $id
+ * @param User $user
*/
- public function __construct(string $email, string $name, string $token, int $id) {
- $this->email = $email;
- $this->name = $name;
+ public function __construct(string $token, User $user) {
$this->token = $token;
- $this->id = $id;
- }
-
- public function getId(): int {
- return $this->id;
- }
-
- public function getEmail(): string {
- return $this->email;
+ $this->user = $user;
}
public function getToken(): string {
return $this->token;
}
- public function getName(): string {
- return $this->name;
+ /**
+ * @return User
+ */
+ public function getUser(): User {
+ return $this->user;
}
}
diff --git a/src/Core/Data/Color.php b/src/Core/Data/Color.php
index e0cd27c..8cb07a5 100755
--- a/src/Core/Data/Color.php
+++ b/src/Core/Data/Color.php
@@ -4,7 +4,7 @@ namespace IQBall\Core\Data;
use InvalidArgumentException;
-class Color {
+class Color implements \JsonSerializable {
/**
* @var string that represents an hexadecimal color code
*/
@@ -41,4 +41,10 @@ class Color {
}
return new Color($value);
}
+
+ public function jsonSerialize() {
+ return get_object_vars($this);
+ }
+
+
}
diff --git a/src/Core/Data/Member.php b/src/Core/Data/Member.php
index d68140c..37f8f04 100755
--- a/src/Core/Data/Member.php
+++ b/src/Core/Data/Member.php
@@ -5,11 +5,9 @@ namespace IQBall\Core\Data;
/**
* information about a team member
*/
-class Member {
- /**
- * @var int The member's user account
- */
- private int $userId;
+class Member implements \JsonSerializable {
+
+ private User $user;
/**
* @var int The member's team id
@@ -17,32 +15,25 @@ class Member {
private int $teamId;
/**
- * @var MemberRole the member's role
+ * @var string the member's role
*/
- private MemberRole $role;
+ private string $role;
/**
- * @param int $userId
- * @param MemberRole $role
+ * @param User $user
+ * @param int $teamId
+ * @param string $role
*/
- public function __construct(int $userId, int $teamId, MemberRole $role) {
- $this->userId = $userId;
+ public function __construct(User $user, int $teamId, string $role) {
+ $this->user = $user;
$this->teamId = $teamId;
$this->role = $role;
}
-
- /**
- * @return int
- */
- public function getUserId(): int {
- return $this->userId;
- }
-
/**
- * @return MemberRole
+ * @return string
*/
- public function getRole(): MemberRole {
+ public function getRole(): string {
return $this->role;
}
@@ -52,4 +43,16 @@ class Member {
public function getTeamId(): int {
return $this->teamId;
}
+
+ /**
+ * @return User
+ */
+ public function getUser(): User {
+ return $this->user;
+ }
+
+
+ public function jsonSerialize() {
+ return get_object_vars($this);
+ }
}
diff --git a/src/Core/Data/MemberRole.php b/src/Core/Data/MemberRole.php
deleted file mode 100755
index 9606c0b..0000000
--- a/src/Core/Data/MemberRole.php
+++ /dev/null
@@ -1,68 +0,0 @@
-isValid($val)) {
- throw new InvalidArgumentException("Valeur du rôle invalide");
- }
- $this->value = $val;
- }
-
- public static function player(): MemberRole {
- return new MemberRole(MemberRole::ROLE_PLAYER);
- }
-
- public static function coach(): MemberRole {
- return new MemberRole(MemberRole::ROLE_COACH);
- }
-
- public function name(): string {
- switch ($this->value) {
- case self::ROLE_COACH:
- return "COACH";
- case self::ROLE_PLAYER:
- return "PLAYER";
- }
- die("unreachable");
- }
-
- public static function fromName(string $name): ?MemberRole {
- switch ($name) {
- case "COACH":
- return MemberRole::coach();
- case "PLAYER":
- return MemberRole::player();
- default:
- return null;
- }
- }
-
- private function isValid(int $val): bool {
- return ($val <= self::MAX and $val >= self::MIN);
- }
-
- public function isPlayer(): bool {
- return ($this->value == self::ROLE_PLAYER);
- }
-
- public function isCoach(): bool {
- return ($this->value == self::ROLE_COACH);
- }
-
-}
diff --git a/src/Core/Data/Team.php b/src/Core/Data/Team.php
index b8e7834..7adeb49 100755
--- a/src/Core/Data/Team.php
+++ b/src/Core/Data/Team.php
@@ -2,7 +2,7 @@
namespace IQBall\Core\Data;
-class Team {
+class Team implements \JsonSerializable {
private TeamInfo $info;
/**
@@ -29,4 +29,10 @@ class Team {
public function listMembers(): array {
return $this->members;
}
+
+ public function jsonSerialize() {
+ return get_object_vars($this);
+ }
+
+
}
diff --git a/src/Core/Data/TeamInfo.php b/src/Core/Data/TeamInfo.php
index 7affcea..63b6a99 100644
--- a/src/Core/Data/TeamInfo.php
+++ b/src/Core/Data/TeamInfo.php
@@ -2,7 +2,7 @@
namespace IQBall\Core\Data;
-class TeamInfo {
+class TeamInfo implements \JsonSerializable {
private int $id;
private string $name;
private string $picture;
@@ -45,5 +45,9 @@ class TeamInfo {
return $this->secondColor;
}
+ public function jsonSerialize() {
+ return get_object_vars($this);
+ }
+
}
diff --git a/src/Core/Data/User.php b/src/Core/Data/User.php
new file mode 100644
index 0000000..b1fdd22
--- /dev/null
+++ b/src/Core/Data/User.php
@@ -0,0 +1,73 @@
+email = $email;
+ $this->name = $name;
+ $this->id = $id;
+ $this->profilePicture = $profilePicture;
+ }
+
+ /**
+ * @return string
+ */
+ public function getEmail(): string {
+ return $this->email;
+ }
+
+ /**
+ * @return string
+ */
+ public function getName(): string {
+ return $this->name;
+ }
+
+ /**
+ * @return int
+ */
+ public function getId(): int {
+ return $this->id;
+ }
+
+ /**
+ * @return string
+ */
+ public function getProfilePicture(): string {
+ return $this->profilePicture;
+ }
+
+ public function jsonSerialize() {
+ return get_object_vars($this);
+ }
+}
\ No newline at end of file
diff --git a/src/Core/Gateway/AccountGateway.php b/src/Core/Gateway/AccountGateway.php
index 7740b57..1d109d0 100644
--- a/src/Core/Gateway/AccountGateway.php
+++ b/src/Core/Gateway/AccountGateway.php
@@ -4,6 +4,7 @@ namespace IQBall\Core\Gateway;
use IQBall\Core\Connection;
use IQBall\Core\Data\Account;
+use IQBall\Core\Data\User;
use PDO;
class AccountGateway {
@@ -16,13 +17,13 @@ class AccountGateway {
$this->con = $con;
}
-
- public function insertAccount(string $name, string $email, string $token, string $hash): int {
- $this->con->exec("INSERT INTO Account(username, hash, email, token) VALUES (:username,:hash,:email,:token)", [
+ public function insertAccount(string $name, string $email, string $token, string $hash,string $profilePicture): int {
+ $this->con->exec("INSERT INTO Account(username, hash, email, token,profilePicture) VALUES (:username,:hash,:email,:token,:profilePic)", [
':username' => [$name, PDO::PARAM_STR],
':hash' => [$hash, PDO::PARAM_STR],
':email' => [$email, PDO::PARAM_STR],
':token' => [$token, PDO::PARAM_STR],
+ ':profilePic' => [$profilePicture, PDO::PARAM_STR]
]);
return intval($this->con->lastInsertId());
}
@@ -65,7 +66,7 @@ class AccountGateway {
return null;
}
- return new Account($email, $acc["username"], $acc["token"], $acc["id"]);
+ return new Account($acc["token"],new User($email,$acc["username"],$acc["id"],$acc["profilePicture"]));
}
/**
@@ -78,7 +79,7 @@ class AccountGateway {
return null;
}
- return new Account($acc["email"], $acc["username"], $acc["token"], $acc["id"]);
+ return new Account($acc["token"],new User($acc["email"],$acc["username"],$acc["id"],$acc["profilePicture"]));
}
diff --git a/src/Core/Gateway/MemberGateway.php b/src/Core/Gateway/MemberGateway.php
index 91dcf43..f9b0c3d 100644
--- a/src/Core/Gateway/MemberGateway.php
+++ b/src/Core/Gateway/MemberGateway.php
@@ -4,7 +4,7 @@ namespace IQBall\Core\Gateway;
use IQBall\Core\Connection;
use IQBall\Core\Data\Member;
-use IQBall\Core\Data\MemberRole;
+use IQBall\Core\Data\User;
use PDO;
class MemberGateway {
@@ -41,13 +41,12 @@ class MemberGateway {
*/
public function getMembersOfTeam(int $teamId): array {
$rows = $this->con->fetch(
- "SELECT a.id,m.role FROM Account a,Team t,Member m WHERE t.id = :id AND m.id_team = t.id AND m.id_user = a.id",
+ "SELECT a.id,a.email,a.username,a.profilePicture,m.role FROM Account a,Team t,Member m WHERE t.id = :id AND m.id_team = t.id AND m.id_user = a.id",
[
":id" => [$teamId, PDO::PARAM_INT],
]
);
-
- return array_map(fn($row) => new Member($row['id'], $teamId, MemberRole::fromName($row['role'])), $rows);
+ return array_map(fn($row) => new Member(new User($row['email'],$row['username'],$row['id'],$row['profilePicture']), $teamId, $row['role']),$rows);
}
/**
diff --git a/src/Core/Gateway/TeamGateway.php b/src/Core/Gateway/TeamGateway.php
index 5478968..0160e00 100644
--- a/src/Core/Gateway/TeamGateway.php
+++ b/src/Core/Gateway/TeamGateway.php
@@ -52,7 +52,7 @@ class TeamGateway {
/**
* @param int $id
- * @return ?TeamInfo
+ * @return TeamInfo|null
*/
public function getTeamById(int $id): ?TeamInfo {
$row = $this->con->fetch(
@@ -80,6 +80,9 @@ class TeamGateway {
)[0]['id'] ?? null;
}
+ /**
+ * @param int $idTeam
+ */
public function deleteTeam(int $idTeam): void {
$this->con->exec(
"DELETE FROM Member WHERE id_team=:team",
diff --git a/src/Core/Model/AuthModel.php b/src/Core/Model/AuthModel.php
index e8710c0..dcf1a66 100644
--- a/src/Core/Model/AuthModel.php
+++ b/src/Core/Model/AuthModel.php
@@ -2,13 +2,16 @@
namespace IQBall\Core\Model;
+use Exception;
use IQBall\Core\Data\Account;
+use IQBall\Core\Data\User;
use IQBall\Core\Gateway\AccountGateway;
use IQBall\Core\Validation\FieldValidationFail;
use IQBall\Core\Validation\ValidationFail;
class AuthModel {
private AccountGateway $gateway;
+ private const DEFAULT_PROFILE_PICTURE = "https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png";
/**
* @param AccountGateway $gateway
@@ -17,7 +20,6 @@ class AuthModel {
$this->gateway = $gateway;
}
-
/**
* @param string $username
* @param string $password
@@ -25,6 +27,7 @@ class AuthModel {
* @param string $email
* @param ValidationFail[] $failures
* @return Account|null the registered account or null if failures occurred
+ * @throws Exception
*/
public function register(string $username, string $password, string $confirmPassword, string $email, array &$failures): ?Account {
@@ -43,13 +46,14 @@ class AuthModel {
$hash = password_hash($password, PASSWORD_DEFAULT);
$token = $this->generateToken();
- $accountId = $this->gateway->insertAccount($username, $email, $token, $hash);
- return new Account($email, $username, $token, $accountId);
+ $accountId = $this->gateway->insertAccount($username, $email, $token, $hash,self::DEFAULT_PROFILE_PICTURE);
+ return new Account($token,new User($email,$username,$accountId,self::DEFAULT_PROFILE_PICTURE));
}
/**
* Generate a random base 64 string
* @return string
+ * @throws Exception
*/
private function generateToken(): string {
return base64_encode(random_bytes(64));
@@ -70,5 +74,4 @@ class AuthModel {
return $this->gateway->getAccountFromMail($email);
}
-
}
diff --git a/src/Core/Model/TeamModel.php b/src/Core/Model/TeamModel.php
index 260da3a..490da7b 100644
--- a/src/Core/Model/TeamModel.php
+++ b/src/Core/Model/TeamModel.php
@@ -44,7 +44,7 @@ class TeamModel {
* @return void
*/
public function addMember(string $mail, int $teamId, string $role): void {
- $userId = $this->users->getAccountFromMail($mail)->getId();
+ $userId = $this->users->getAccountFromMail($mail)->getUser()->getId();
$this->members->insert($teamId, $userId, $role);
}
@@ -78,7 +78,7 @@ class TeamModel {
* @return int
*/
public function deleteMember(string $mail, int $teamId): int {
- $userId = $this->users->getAccountFromMail($mail)->getId();
+ $userId = $this->users->getAccountFromMail($mail)->getUser()->getId();
$this->members->remove($teamId, $userId);
return $teamId;
}
{member.name}
+{member.user.name}
{member.role}
-{member.mail}
+{member.user.email}