Add JWT to login forms
This commit is contained in:
parent
47c1ecc9bc
commit
ad69193ac0
8 changed files with 93 additions and 6 deletions
|
@ -2,9 +2,11 @@
|
||||||
|
|
||||||
namespace Pterodactyl\Http\Controllers\Auth;
|
namespace Pterodactyl\Http\Controllers\Auth;
|
||||||
|
|
||||||
|
use Lcobucci\JWT\Builder;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Contracts\View\View;
|
use Illuminate\Contracts\View\View;
|
||||||
|
use Lcobucci\JWT\Signer\Hmac\Sha256;
|
||||||
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
|
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
|
||||||
|
|
||||||
class LoginController extends AbstractLoginController
|
class LoginController extends AbstractLoginController
|
||||||
|
@ -63,11 +65,26 @@ class LoginController extends AbstractLoginController
|
||||||
'request_ip' => $request->ip(),
|
'request_ip' => $request->ip(),
|
||||||
], 5);
|
], 5);
|
||||||
|
|
||||||
return response()->json(['complete' => false, 'token' => $token]);
|
return response()->json(['complete' => false, 'login_token' => $token]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$signer = new Sha256();
|
||||||
|
$token = (new Builder)->setIssuer('http://pterodactyl.local')
|
||||||
|
->setAudience('http://pterodactyl.local')
|
||||||
|
->setId(str_random(12), true)
|
||||||
|
->setIssuedAt(time())
|
||||||
|
->setNotBefore(time())
|
||||||
|
->setExpiration(time() + 3600)
|
||||||
|
->set('uid', $user->id)
|
||||||
|
->sign($signer, env('APP_JWT_KEY'))
|
||||||
|
->getToken();
|
||||||
|
|
||||||
$this->auth->guard()->login($user, true);
|
$this->auth->guard()->login($user, true);
|
||||||
|
|
||||||
return response()->json(['complete' => true]);
|
return response()->json([
|
||||||
|
'complete' => true,
|
||||||
|
'intended' => $this->redirectPath(),
|
||||||
|
'token' => $token->__toString(),
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,6 +63,7 @@ class AuthenticateKey
|
||||||
}
|
}
|
||||||
|
|
||||||
$raw = $request->bearerToken();
|
$raw = $request->bearerToken();
|
||||||
|
|
||||||
$identifier = substr($raw, 0, ApiKey::IDENTIFIER_LENGTH);
|
$identifier = substr($raw, 0, ApiKey::IDENTIFIER_LENGTH);
|
||||||
$token = substr($raw, ApiKey::IDENTIFIER_LENGTH);
|
$token = substr($raw, ApiKey::IDENTIFIER_LENGTH);
|
||||||
|
|
||||||
|
|
|
@ -8,13 +8,13 @@ import { Ziggy } from './helpers/ziggy';
|
||||||
import Locales from './../../../resources/lang/locales';
|
import Locales from './../../../resources/lang/locales';
|
||||||
import { flash } from './mixins/flash';
|
import { flash } from './mixins/flash';
|
||||||
import { routes } from './routes';
|
import { routes } from './routes';
|
||||||
|
import { storeData } from './store';
|
||||||
|
|
||||||
window.events = new Vue;
|
window.events = new Vue;
|
||||||
window.Ziggy = Ziggy;
|
window.Ziggy = Ziggy;
|
||||||
|
|
||||||
Vue.use(Vuex);
|
Vue.use(Vuex);
|
||||||
|
const store = new Vuex.Store(storeData);
|
||||||
const store = new Vuex.Store();
|
|
||||||
const route = require('./../../../vendor/tightenco/ziggy/src/js/route').default;
|
const route = require('./../../../vendor/tightenco/ziggy/src/js/route').default;
|
||||||
|
|
||||||
Vue.config.productionTip = false;
|
Vue.config.productionTip = false;
|
||||||
|
|
1
resources/assets/scripts/bootstrap.js
vendored
1
resources/assets/scripts/bootstrap.js
vendored
|
@ -19,6 +19,7 @@ try {
|
||||||
window.axios = require('axios');
|
window.axios = require('axios');
|
||||||
|
|
||||||
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||||
|
window.axios.defaults.headers.common['Authorization'] = 'Bearer ' + localStorage.token || '';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Next we will register the CSRF Token as a common header with Axios so that
|
* Next we will register the CSRF Token as a common header with Axios so that
|
||||||
|
|
|
@ -82,16 +82,20 @@
|
||||||
})
|
})
|
||||||
.then(function (response) {
|
.then(function (response) {
|
||||||
if (response.data.complete) {
|
if (response.data.complete) {
|
||||||
return window.location = '/';
|
localStorage.setItem('token', response.data.token);
|
||||||
|
self.$store.dispatch('login');
|
||||||
|
return window.location = response.data.intended;
|
||||||
}
|
}
|
||||||
|
|
||||||
self.$props.user.password = '';
|
self.$props.user.password = '';
|
||||||
self.$data.showSpinner = false;
|
self.$data.showSpinner = false;
|
||||||
self.$router.push({name: 'checkpoint', query: {token: response.data.token}});
|
self.$router.push({name: 'checkpoint', query: {token: response.data.login_token}});
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
self.$props.user.password = '';
|
self.$props.user.password = '';
|
||||||
self.$data.showSpinner = false;
|
self.$data.showSpinner = false;
|
||||||
|
self.$store.dispatch('logout');
|
||||||
|
|
||||||
if (!err.response) {
|
if (!err.response) {
|
||||||
return console.error(err);
|
return console.error(err);
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,9 +49,12 @@
|
||||||
authentication_code: this.$data.code,
|
authentication_code: this.$data.code,
|
||||||
})
|
})
|
||||||
.then(function (response) {
|
.then(function (response) {
|
||||||
|
localStorage.setItem('token', response.data.token);
|
||||||
|
self.$store.dispatch('login');
|
||||||
window.location = response.data.intended;
|
window.location = response.data.intended;
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
|
self.$store.dispatch('logout');
|
||||||
if (!err.response) {
|
if (!err.response) {
|
||||||
return console.error(err);
|
return console.error(err);
|
||||||
}
|
}
|
||||||
|
|
33
resources/assets/scripts/models/user.js
Normal file
33
resources/assets/scripts/models/user.js
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
import JwtDecode from 'jwt-decode';
|
||||||
|
|
||||||
|
const User = function () {
|
||||||
|
this.id = 0;
|
||||||
|
this.admin = false;
|
||||||
|
this.email = '';
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a new instance of the user model using a JWT.
|
||||||
|
*
|
||||||
|
* @param {string} token
|
||||||
|
* @returns {User}
|
||||||
|
*/
|
||||||
|
User.prototype.fromJwt = function (token) {
|
||||||
|
return this.newModel(JwtDecode(token));
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return an instance of this user model with the properties set on it.
|
||||||
|
*
|
||||||
|
* @param {object} obj
|
||||||
|
* @returns {User}
|
||||||
|
*/
|
||||||
|
User.prototype.newModel = function (obj) {
|
||||||
|
this.id = obj.id;
|
||||||
|
this.admin = obj.admin;
|
||||||
|
this.email = obj.email;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default User;
|
28
resources/assets/scripts/store.js
Normal file
28
resources/assets/scripts/store.js
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
import User from './models/user';
|
||||||
|
|
||||||
|
export const storeData = {
|
||||||
|
state: {
|
||||||
|
user: null,
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
login: function ({ commit }) {
|
||||||
|
commit('login');
|
||||||
|
},
|
||||||
|
logout: function ({ commit }) {
|
||||||
|
commit('logout');
|
||||||
|
},
|
||||||
|
},
|
||||||
|
getters: {
|
||||||
|
user: function (state) {
|
||||||
|
return state.user;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mutations: {
|
||||||
|
login: function (state) {
|
||||||
|
state.user = new User().fromJwt(localStorage.getItem('token'));
|
||||||
|
},
|
||||||
|
logout: function (state) {
|
||||||
|
state.user = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
Loading…
Add table
Reference in a new issue