diff --git a/brain/App.inc.php b/brain/App.inc.php
index 33dd18e..53361ff 100644
--- a/brain/App.inc.php
+++ b/brain/App.inc.php
@@ -18,6 +18,7 @@ include "../brain/utility/DocTools.inc.php";
include "../brain/utility/Sorting.inc.php";
include "../brain/utility/Setup.inc.php";
include "../brain/utility/Maintenance.inc.php";
+include "../brain/utility/Mailer.inc.php";
class App
{
diff --git a/brain/api/v1/AuthAPI.inc.php b/brain/api/v1/AuthAPI.inc.php
index 7977b4e..12e7efa 100644
--- a/brain/api/v1/AuthAPI.inc.php
+++ b/brain/api/v1/AuthAPI.inc.php
@@ -60,4 +60,14 @@ class AuthAPI
];
return $result;
}
+ public static function requestSecret($body)
+ {
+ $result = Auth::findSecret($body);
+ return $result;
+ }
+ public static function resetPassword($body)
+ {
+ $result = Auth::makeNewPassword($body);
+ return $result;
+ }
}
diff --git a/brain/api/v1/MailerAPI.inc.php b/brain/api/v1/MailerAPI.inc.php
new file mode 100644
index 0000000..669a5b5
--- /dev/null
+++ b/brain/api/v1/MailerAPI.inc.php
@@ -0,0 +1,26 @@
+ "You need to be logged in for this, champ.",
+ "type" => "MAILER_ERROR",
+ ];
+ }
+ } else {
+ }
+
+ return $result;
+ }
+}
diff --git a/brain/controller/APIControl.inc.php b/brain/controller/APIControl.inc.php
index e80c6a4..b1c3385 100644
--- a/brain/controller/APIControl.inc.php
+++ b/brain/controller/APIControl.inc.php
@@ -7,6 +7,7 @@ include "../brain/api/v1/ImagesAPI.inc.php";
include "../brain/api/v1/PagesAPI.inc.php";
include "../brain/api/v1/SettingsAPI.inc.php";
include "../brain/api/v1/InitAPI.inc.php";
+include "../brain/api/v1/MailerAPI.inc.php";
class APIControl
{
@@ -82,15 +83,15 @@ class APIControl
}
switch (isset($args["third"]) ? $args["third"] : "none") {
- case "restore":
- case "init":
+ case "restore": //move to 'api/auth'
+ case "init": //move to 'api/auth'
$task = $args["third"];
$result = InitApi::handleInitTasks(
$task,
$task == "init" ? $body : $request
);
break;
- case "backup":
+ case "backup": //move to 'api/auth'
$token = $request->getHeader("fipamo-access-token");
//Verify token for admin tasks
if (Session::verifyToken($token[0])) {
@@ -102,12 +103,18 @@ class APIControl
];
}
break;
- case "login":
+ case "login": //move to 'api/auth'
$result = AuthAPI::login($body);
break;
- case "logout":
+ case "logout": //move to 'api/auth'
$result = AuthAPI::logout($body);
break;
+ case "get-secret": //move to 'api/auth'
+ $result = AuthAPI::requestSecret($body);
+ break;
+ case "reset-password": //move to 'api/auth'
+ $result = AuthAPI::resetPassword($body);
+ break;
case "page":
$token = $request->getHeader("fipamo-access-token");
//Verify token for admin tasks
@@ -137,6 +144,9 @@ class APIControl
];
}
break;
+ case "mailer":
+ $result = MailerAPI::handleMail($request, $body, $response);
+ break;
default:
$result = [
"message" => "Oh, nothing to do. That's unfortunate",
diff --git a/brain/controller/DashControl.inc.php b/brain/controller/DashControl.inc.php
index 532cc88..de09137 100644
--- a/brain/controller/DashControl.inc.php
+++ b/brain/controller/DashControl.inc.php
@@ -38,6 +38,7 @@ class DashControl
"currentTheme" => $settings["global"]["theme"],
"themes" => $themes,
"mailOption" => $settings["email"]["active"],
+ "mailConfig" => $settings["email"],
"status" => Session::active(),
];
} else {
@@ -116,9 +117,14 @@ class DashControl
header("Location: /dashboard");
die();
break;
+ case "reset-password":
+ $template = "dash/reset-password.twig";
+ $pageOptions = [
+ "title" => "Reset Password",
+ ];
+ break;
default:
- //$secret = ;
$template = "dash/start.twig";
if (Session::active()) {
$pageOptions = [
diff --git a/brain/data/Auth.inc.php b/brain/data/Auth.inc.php
index 927c5de..b8cb7c3 100644
--- a/brain/data/Auth.inc.php
+++ b/brain/data/Auth.inc.php
@@ -5,70 +5,146 @@ use ReallySimpleJWT\Token;
class Auth
{
- public function __construct()
- {
- }
+ public function __construct()
+ {
+ }
- public static function sessionStatus()
- {
- if (isset($_SESSION["member"])) {
- return true;
- } else {
- return false;
- }
- //return $this->secret;
+ public static function sessionStatus()
+ {
+ if (isset($_SESSION["member"])) {
+ return true;
+ } else {
+ return false;
}
+ //return $this->secret;
+ }
- public static function status()
- {
- $result = "";
- if (Session::active()) {
- $result = true;
- } else {
- $result = false;
- }
- return $result;
+ public static function status()
+ {
+ $result = "";
+ if (Session::active()) {
+ $result = true;
+ } else {
+ $result = false;
}
+ return $result;
+ }
- public static function login($who)
- {
- //grab member list
- $folks = (new Settings())->getFolks();
- $found = find($folks, ["handle" => $who["handle"]]);
+ public static function login($who)
+ {
+ //grab member list
+ $folks = (new Settings())->getFolks();
+ $found = find($folks, ["handle" => $who["handle"]]);
- if ($found) {
- //name is found, verify password
- if (password_verify($who["password"], $found["password"])) {
- $member = [
- "handle" => $found["handle"],
- "email" => $found["email"],
- "role" => $found["role"],
- "avatar" => $found["avi"],
- ];
+ if ($found) {
+ //name is found, verify password
+ if (password_verify($who["password"], $found["password"])) {
+ $member = [
+ "handle" => $found["handle"],
+ "email" => $found["email"],
+ "role" => $found["role"],
+ "avatar" => $found["avi"],
+ ];
- $token = Token::create(
- $found["id"],
- $found["secret"],
- time() + 3600,
- "localhost"
- ); //expires in an hour
- Session::start();
- Session::set("member", $member);
- Session::set("token", $token);
+ $token = Token::create(
+ $found["id"],
+ $found["secret"],
+ time() + 3600,
+ "localhost"
+ ); //expires in an hour
+ Session::start();
+ Session::set("member", $member);
+ Session::set("token", $token);
- $result = "good_login";
- } else {
- $result = "bad_pass";
- }
+ $result = "good_login";
+ } else {
+ $result = "bad_pass";
+ }
+ } else {
+ //if name is not found
+ $result = "no_name";
+ }
+ return $result;
+ }
+
+ public static function findSecret($data)
+ {
+ $result = [];
+ $folks = (new Settings())->getFolks();
+
+ if (
+ !empty($data["email"]) &&
+ filter_var($data["email"], FILTER_VALIDATE_EMAIL)
+ ) {
+ $found = find($folks, ["email" => $data["email"]]);
+ if ($found) {
+ //if email is cool, check mail relay status
+ //if set up, send secret there, if not just return it
+ $config = new Settings();
+ $settings = $config->getSettings();
+ $email = $settings["email"]["active"];
+ if ($email != "option-none") {
+ $data["mail_task"] = "SEND_SECRET";
+ $data["secret"] = $found["secret"];
+ $result = Mailer::sendmail($data);
} else {
- //if name is not found
- $result = "no_name";
+ $result = [
+ "message" => "Valid email, but no email set up!",
+ "type" => "secretFound",
+ "secret" => $found["secret"],
+ ];
}
- return $result;
+ } else {
+ $result = [
+ "message" => "No valid email, no goodies, pleighboi",
+ "type" => "secretNotFound",
+ ];
+ }
+ } else {
+ $result = [
+ "message" => "Aye, this address is not right, slick.",
+ "type" => "secretNotFound",
+ ];
}
- public static function logout()
- {
- Session::kill();
+ return $result;
+ }
+
+ public static function makeNewPassword($data)
+ {
+ //check if passwordsmatch
+ if ($data["newPass"] == $data["newPassConfirm"]) {
+ //verify secret
+ $folks = (new Settings())->getFolks();
+ $found = find($folks, ["secret" => $data["secret"]]);
+ if ($found) {
+ //create new pass and secret key, then update file
+ $hash = password_hash($data["newPass"], PASSWORD_DEFAULT);
+ $freshSecret = StringTools::randomString(12);
+ Member::updateData("password", $hash, $data["secret"]);
+ Member::updateData("secret", $freshSecret, $data["secret"]);
+ $result = [
+ "message" => "Password Updated. Very nice!",
+ "type" => "passCreated",
+ ];
+ } else {
+ $result = [
+ "message" => "Secret key is invalid. Try to retrieve it again",
+ "type" => "passNotCreated",
+ ];
+ }
+ } else {
+ $result = [
+ "message" => "Passwords don't match. Try it again.",
+ "type" => "passNotCreated",
+ ];
}
+
+ return $result;
+ }
+
+ public static function logout()
+ {
+ Session::kill();
+ }
}
diff --git a/brain/data/Member.inc.php b/brain/data/Member.inc.php
index fffa33c..277db60 100644
--- a/brain/data/Member.inc.php
+++ b/brain/data/Member.inc.php
@@ -7,11 +7,15 @@ class Member
{
}
- public static function updateData(string $key, string $data)
+ public static function updateData(string $key, string $data, $secret = null)
{
$folks = (new Settings())->getFolks();
- $member = Session::get("member");
- $found = find($folks, ["handle" => $member["handle"]]);
+ if (isset($secret)) {
+ $found = find($folks, ["secret" => $secret]);
+ } else {
+ $member = Session::get("member");
+ $found = find($folks, ["handle" => $member["handle"]]);
+ }
$found[$key] = $data;
//record time updated
$updated = new \Moment\Moment();
@@ -22,12 +26,14 @@ class Member
DocTools::writeSettings("../config/folks.json", $newFolks);
//update member data in session
- $member = [
- "handle" => $found["handle"],
- "email" => $found["email"],
- "role" => $found["role"],
- "avatar" => $found["avi"],
- ];
- Session::set("member", $member);
+ if (!isset($secret)) {
+ $member = [
+ "handle" => $found["handle"],
+ "email" => $found["email"],
+ "role" => $found["role"],
+ "avatar" => $found["avi"],
+ ];
+ Session::set("member", $member);
+ }
}
}
diff --git a/brain/utility/Mailer.inc.php b/brain/utility/Mailer.inc.php
new file mode 100644
index 0000000..45aeddf
--- /dev/null
+++ b/brain/utility/Mailer.inc.php
@@ -0,0 +1,94 @@
+getSettings();
+ $mailConfig = $settings["email"];
+ $mail = new PHPMailer();
+
+ switch ($body["mail_task"]) {
+ case "TESTING":
+ $html =
+ "
Hi! It's Fipamo!
" .
+ "It's just a test " .
+ $body["content"];
+ $member = Session::get("member");
+ $mail->addAddress($member["email"], ""); //pull email address from current user
+ $mail->Subject = "A test email";
+ break;
+ case "SEND_SECRET":
+ $html =
+ "
Hi! It's Fipamo!
" .
+ "This is your secret key.
" .
+ "
" .
+ $body["secret"] .
+ "
" .
+ " Use this key to reset your password.";
+ $mail->addAddress($body["email"], ""); //pull email address from current user
+ $mail->Subject = "Shhhh! It's a secret!";
+ break;
+ default:
+ return $result = [
+ "type" => "noMailService",
+ "message" => "Mail task is undefined. What are you doing??",
+ ];
+ break;
+ }
+
+ //set values based on current active protocol
+ switch ($mailConfig["active"]) {
+ case "option-smtp":
+ $mail->setFrom($mailConfig["smtp"]["email"], "System Email");
+ $mail->Host = "playvicio.us";
+ $mail->Username = $mailConfig["smtp"]["email"];
+ $mail->Password = $mailConfig["smtp"]["password"];
+
+ break;
+ case "option-mg":
+ $mail->setFrom($mailConfig["mailgun"]["domain"], "No Reply");
+ $mail->Host = "smtp.mailgun.org";
+ $mail->Username = $mailConfig["mailgun"]["domain"];
+ $mail->Password = $mailConfig["mailgun"]["key"];
+ break;
+ default:
+ //no mail service
+ return $result = [
+ "type" => "noMailService",
+ "message" => "Mail is not configured. Handle that.",
+ ];
+ break;
+ }
+
+ $mail->Body = $html;
+ $mail->IsHTML(true);
+ $mail->isSMTP();
+ $mail->SMTPAuth = true;
+ $mail->SMTPSecure = "ssl";
+ $mail->Port = 465;
+
+ // Uncomment for debug info
+ //$mail->SMTPDebug = 4;
+
+ /* Finally send the mail. */
+ try {
+ $mail->send();
+ $result = ["type" => "mailSent", "message" => "Message Away!"];
+ } catch (Exception $e) {
+ //echo $e->errorMessage();
+ $result = [
+ "type" => "mailNotSent",
+ "message" => "Message Not Away!",
+ "error" => $e->errorMessage(),
+ ];
+ }
+
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/brain/views/dash/email.twig b/brain/views/dash/email.twig
new file mode 100644
index 0000000..0fc58cb
--- /dev/null
+++ b/brain/views/dash/email.twig
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+ {# edge wrapper #}
+
+
+
+ {# info table start #}
+
+
+
+
+ {{ header }}
+
+
+
+
+
+
+ {{ content }}
+
+
+
+
+
+
+ {{ footer }}
+
+
+
+
+ {# info table end #}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/brain/views/dash/forms/login.twig b/brain/views/dash/forms/login.twig
index f8d6e86..ef74839 100644
--- a/brain/views/dash/forms/login.twig
+++ b/brain/views/dash/forms/login.twig
@@ -1,11 +1,12 @@
-
\ No newline at end of file
diff --git a/brain/views/dash/partials/mailforms.twig b/brain/views/dash/partials/mailforms.twig
index 492f42c..9c85c5e 100644
--- a/brain/views/dash/partials/mailforms.twig
+++ b/brain/views/dash/partials/mailforms.twig
@@ -1,31 +1,31 @@
{% if mailOption == "option-smtp" %}
-
-
-
+
+
+
-
-
+
+
{% elseif(mailOption == 'option-mg') %}
-
-
-
+
+
+
-
-
+
+
{% else %}
-
-
-
+
+
+
-
-
+
+
{% endif %}
\ No newline at end of file
diff --git a/brain/views/dash/reset-password.twig b/brain/views/dash/reset-password.twig
new file mode 100644
index 0000000..28d31dc
--- /dev/null
+++ b/brain/views/dash/reset-password.twig
@@ -0,0 +1,40 @@
+{% extends "dash/_frame.twig" %}
+
+{% block title %}
+ {{ title }}
+{% endblock %}
+
+{% block stylesheets %}
+
+ {% endblock %}
+
+ {% block mainContent %}
+