diff --git a/.gitmodules b/.gitmodules index 0bbfbb368..2ec483d25 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,6 +8,3 @@ [submodule "third_party/bcrypt"] path = third_party/bcrypt url = https://github.com/pliablepixels/libbcrypt -[submodule "third_party/jwt-cpp"] - path = third_party/jwt-cpp - url = https://github.com/pliablepixels/jwt-cpp diff --git a/third_party/jwt-cpp b/third_party/jwt-cpp deleted file mode 160000 index 3dbc5a092..000000000 --- a/third_party/jwt-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3dbc5a0929aa3e53a47cbffac546f3d7877c41b5 diff --git a/web/includes/auth.php b/web/includes/auth.php index 3f575d4c2..b6340bcfc 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -233,7 +233,8 @@ function generateAuthHash($useRemoteAddr, $force=false) { $token = array( "iss" => "ZoneMinder", "iat" => $issuedAt, - "exp" => $expireAt + "exp" => $expireAt, + "user" => $_SESSION['username'] );