github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

https://github.com/statping/statping/issues/431

pull/443/head v0.90.11
hunterlong 2020-03-21 17:35:33 -07:00
parent af989a2399
commit 4327569bac
16 changed files with 73 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/API.js
View File

@ -200,8 +200,8 @@ class Api {
return localStorage.removeItem(tokenKey)
}
saveToken(username, token) {
const user = {username: username, token: token}
saveToken(username, token, admin) {
const user = {username: username, token: token, admin: admin}
localStorage.setItem(tokenKey, JSON.stringify(user));
return user
}

24
frontend/src/App.vue
View File

@ -22,20 +22,20 @@
app: null
}
},
async created() {
this.app = await this.$store.dispatch('loadRequired')
async created() {
this.app = await this.$store.dispatch('loadRequired')
this.app = {...this.$store.state}
this.app = {...this.$store.state}
if (this.$store.getters.core.logged_in) {
await this.$store.dispatch('loadAdmin')
}
this.loaded = true
if (!this.$store.getters.core.setup) {
this.$router.push('/setup')
}
window.console.log('finished loadRequired')
},
if (this.$store.getters.core.logged_in) {
await this.$store.dispatch('loadAdmin')
}
this.loaded = true
if (!this.$store.getters.core.setup) {
this.$router.push('/setup')
}
window.console.log('finished loadRequired')
},
async mounted() {
if (this.$route.path !== '/setup') {
const tk = localStorage.getItem("statping_user")

4
frontend/src/components/Dashboard/DashboardMessages.vue
View File

@ -21,7 +21,7 @@
</td>
<td class="d-none d-md-table-cell">{{niceDate(message.start_on)}}</td>
<td class="text-right">
<div class="btn-group">
<div v-if="$store.state.admin" class="btn-group">
<a @click.prevent="editMessage(message, edit)" href="#" class="btn btn-outline-secondary"><i class="fas fa-exclamation-triangle"></i> Edit</a>
<a @click.prevent="deleteMessage(message)" href="#" class="btn btn-danger"><font-awesome-icon icon="times" /></a>
</div>
@ -33,7 +33,7 @@
</div>
</div>
<FormMessage :edit="editChange" :in_message="message"/>
<FormMessage v-if="$store.state.admin" :edit="editChange" :in_message="message"/>
</div>
</template>

6
frontend/src/components/Dashboard/DashboardServices.vue
View File

@ -2,7 +2,7 @@
<div class="col-12">
<div class="card contain-card text-black-50 bg-white mb-4">
<div class="card-header">Services
<router-link to="/dashboard/create_service" class="btn btn-sm btn-outline-success float-right">
<router-link v-if="$store.state.admin" to="/dashboard/create_service" class="btn btn-sm btn-outline-success float-right">
<font-awesome-icon icon="plus"/> Create
</router-link></div>
<div class="card-body">
@ -34,7 +34,7 @@
<span v-if="!group.public" class="badge badge-secondary">PRIVATE</span>
</td>
<td class="text-right">
<div class="btn-group">
<div v-if="$store.state.admin" class="btn-group">
<a @click.prevent="editGroup(group, edit)" href="#" class="btn btn-outline-secondary"><font-awesome-icon icon="chart-area" /> Edit</a>
<a @click.prevent="deleteGroup(group)" href="#" class="btn btn-danger">
<font-awesome-icon icon="times" />
@ -50,7 +50,7 @@
</div>
<FormGroup :edit="editChange" :in_group="group"/>
<FormGroup v-if="$store.state.admin" :edit="editChange" :in_group="group"/>
</div>

2
frontend/src/components/Dashboard/DashboardUsers.vue
View File

@ -31,7 +31,7 @@
</div>
</div>
<FormUser :edit="editChange" :in_user="user"/>
<FormUser v-if="$store.state.admin" :edit="editChange" :in_user="user"/>
</div>
</template>

12
frontend/src/components/Dashboard/ServicesList.vue
View File

@ -12,11 +12,11 @@
<draggable tag="tbody" v-model="servicesList" handle=".drag_icon">
<tr v-for="(service, index) in $store.getters.servicesInOrder" :key="service.id">
<td>
<span class="drag_icon d-none d-md-inline">
<span v-if="$store.state.admin" class="drag_icon d-none d-md-inline">
<font-awesome-icon icon="bars" class="mr-3"/>
</span> {{service.name}}
</td>
<td class="d-none d-md-table-cell">
<td v-if="$store.state.admin" class="d-none d-md-table-cell">
<ToggleSwitch v-if="service.online" :service="service"/>
</td>
<td class="d-none d-md-table-cell">
@ -25,17 +25,19 @@
</span>
</td>
<td class="d-none d-md-table-cell">
<div v-if="service.group_id !== 0"><span class="badge badge-secondary">{{serviceGroup(service)}}</span></div>
<div v-if="service.group_id !== 0">
<span class="badge badge-secondary">{{serviceGroup(service)}}</span>
</div>
</td>
<td class="text-right">
<div class="btn-group">
<router-link :to="{path: `/dashboard/edit_service/${service.id}`, params: {service: service} }" class="btn btn-outline-secondary">
<router-link v-if="$store.state.admin" :to="{path: `/dashboard/edit_service/${service.id}`, params: {service: service} }" class="btn btn-outline-secondary">
<i class="fas fa-chart-area"></i> Edit
</router-link>
<router-link :to="{path: serviceLink(service), params: {service: service} }" class="btn btn-outline-secondary">
<i class="fas fa-chart-area"></i> View
</router-link>
<a @click.prevent="deleteService(service)" href="#" class="btn btn-danger">
<a v-if="$store.state.admin" @click.prevent="deleteService(service)" href="#" class="btn btn-danger">
<font-awesome-icon icon="times" />
</a>
</div>

24
frontend/src/components/Dashboard/TopNav.vue
View File

@ -14,17 +14,16 @@
<li @click="navopen = !navopen" class="nav-item navbar-item">
<router-link to="/dashboard/services" class="nav-link">Services</router-link>
</li>
<li @click="navopen = !navopen" class="nav-item navbar-item">
<li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
<router-link to="/dashboard/users" class="nav-link">Users</router-link>
</li>
<li @click="navopen = !navopen" class="nav-item navbar-item">
<router-link to="/dashboard/messages" class="nav-link">Messages</router-link>
</li>
<li @click="navopen = !navopen" class="nav-item navbar-item">
<li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
<router-link to="/dashboard/settings" class="nav-link">Settings</router-link>
</li>
<li @click="navopen = !navopen" class="nav-item navbar-item">
<li v-if="$store.state.admin" @click="navopen = !navopen" class="nav-item navbar-item">
<router-link to="/dashboard/logs" class="nav-link">Logs</router-link>
</li>
@ -47,17 +46,18 @@
name: 'TopNav',
data () {
return {
navopen: false,
navopen: false
}
},
methods: {
async logout () {
await Api.logout()
this.$store.commit('setHasAllData', false)
this.$store.commit('setToken', null)
await this.$router.push('/')
methods: {
async logout () {
await Api.logout()
this.$store.commit('setHasAllData', false)
this.$store.commit('setToken', null)
this.$store.commit('setAdmin', false)
await this.$router.push('/')
}
}
}
}
</script>

4
frontend/src/forms/Incident.vue
View File

@ -3,7 +3,7 @@
<div v-for="(incident, i) in incidents" class="card contain-card text-black-50 bg-white mb-4">
<div class="card-header">Incident: {{incident.title}}
<button @click="deleteIncident(incident)" class="btn btn-sm btn-danger float-right">
<button v-if="IsAdmin()" @click="deleteIncident(incident)" class="btn btn-sm btn-danger float-right">
<font-awesome-icon icon="times" /> Delete
</button></div>
<div class="card-body bg-light pt-1">
@ -15,7 +15,7 @@
</div>
<div class="card contain-card text-black-50 bg-white mb-5">
<div v-if="IsAdmin()" class="card contain-card text-black-50 bg-white mb-5">
<div class="card-header">Create Incident for {{service.name}}</div>
<div class="card-body">
<form @submit.prevent="createIncident">

4
frontend/src/forms/Login.vue
View File

@ -60,8 +60,10 @@
if (auth.error) {
this.error = true
} else if (auth.token) {
this.auth = Api.saveToken(this.username, auth.token)
this.auth = Api.saveToken(this.username, auth.token, auth.admin)
this.$store.dispatch('loadAdmin')
this.$store.commit('setAdmin', auth.admin)
window.console.log(auth)
this.$router.push('/dashboard')
}
this.loading = false

3
frontend/src/mixin.js
View File

@ -61,6 +61,9 @@ export default Vue.mixin({
isInt(n) {
return n % 1 === 0;
},
isAdmin() {
return this.$store.state.admin
},
loggedIn() {
const core = this.$store.getters.core
return core.logged_in === true

24
frontend/src/pages/Dashboard.vue
View File

@ -1,12 +1,12 @@
<template>
<div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
<TopNav/>
<router-view/>
<TopNav :admin="$store.state.admin"/>
<router-view :admin="$store.state.admin"/>
</div>
</template>
<script>
import Api from "../API"
import Api from "../API"
import TopNav from "../components/Dashboard/TopNav";
export default {
@ -14,20 +14,14 @@
components: {
TopNav,
},
async mounted() {
if (this.$route.path !== "/login") {
try {
const u = await Api.users()
} catch (e) {
this.$router.push('/logout')
}
}
},
data () {
return {
authenticated: false
}
return {
authenticated: false,
}
},
async mounted() {
}
}
</script>

10
frontend/src/store.js
View File

@ -25,7 +25,8 @@ export default new Vuex.Store({
groups: [],
messages: [],
users: [],
notifiers: []
notifiers: [],
admin: false
},
getters: {
hasAllData: state => state.hasAllData,
@ -39,6 +40,8 @@ export default new Vuex.Store({
users: state => state.users,
notifiers: state => state.notifiers,
isAdmin: state => state.admin,
servicesInOrder: state => state.services.sort((a, b) => a.order_id - b.order_id),
groupsInOrder: state => state.groups.sort((a, b) => a.order_id - b.order_id),
groupsClean: state => state.groups.filter(g => g.name !== '').sort((a, b) => a.order_id - b.order_id),
@ -106,7 +109,10 @@ export default new Vuex.Store({
},
setNotifiers (state, notifiers) {
state.notifiers = notifiers
}
},
setAdmin (state, admin) {
state.admin = admin
},
},
actions: {
async getAllServices(context) {

7
handlers/api.go
View File

@ -43,13 +43,12 @@ type apiResponse struct {
}
func apiIndexHandler(r *http.Request) interface{} {
coreClone := core.App
var loggedIn bool
coreClone := *core.App
_, err := getJwtToken(r)
if err == nil {
loggedIn = true
coreClone.LoggedIn = true
coreClone.IsAdmin = IsAdmin(r)
}
coreClone.LoggedIn = loggedIn
return coreClone
}

6
handlers/dashboard.go
View File

@ -212,12 +212,14 @@ func apiLoginHandler(w http.ResponseWriter, r *http.Request) {
user, auth := users.AuthUser(username, password)
if auth {
utils.Log.Infoln(fmt.Sprintf("User %v logged in from IP %v", user.Username, r.RemoteAddr))
_, token := setJwtToken(user, w)
claim, token := setJwtToken(user, w)
resp := struct {
Token string `json:"token"`
Token string `json:"token"`
IsAdmin bool `json:"admin"`
}{
token,
claim.Admin,
}
returnJson(resp, w, r)
} else {

2
handlers/routes.go
View File

@ -87,9 +87,9 @@ func Router() *mux.Router {
// API Routes
r.Handle("/api", scoped(apiIndexHandler))
r.Handle("/api/setup", http.HandlerFunc(processSetupHandler)).Methods("POST")
//r.Handle("/oauth/callback", http.HandlerFunc(OAuthRedirect))
api.Handle("/api/login", http.HandlerFunc(apiLoginHandler)).Methods("POST")
r.Handle("/api/setup", http.HandlerFunc(processSetupHandler)).Methods("POST")
api.Handle("/api/logout", http.HandlerFunc(logoutHandler))
api.Handle("/api/renew", authenticated(apiRenewHandler, false))
api.Handle("/api/cache", authenticated(apiCacheHandler, false)).Methods("GET")

1
types/core/struct.go
View File

@ -31,6 +31,7 @@ type Core struct {
UseCdn null.NullBool `gorm:"column:use_cdn;default:false" json:"using_cdn,omitempty"`
Timezone float32 `gorm:"column:timezone;default:-8.0" json:"timezone,omitempty"`
LoggedIn bool `gorm:"-" json:"logged_in"`
IsAdmin bool `gorm:"-" json:"admin"`
CreatedAt time.Time `gorm:"column:created_at" json:"created_at"`
UpdatedAt time.Time `gorm:"column:updated_at" json:"updated_at"`
Started time.Time `gorm:"-" json:"started_on"`