+
+
+ Remote devices
+
+
{{ id }}
- Linked
- Unlink device
+ Authorized
+
+ Unlink device
+
- Not linked
+ Unauthorized
Link device
+
+ One time pin: {{ remote.pinlink.pin }}
+
No remote devices
-
-
- Check for access requests
-
-
Pin code
- {{ remote.pinlink }}
+ {{ remote.pinlink.pin }}
@@ -62,14 +66,18 @@
diff --git a/fe/src/components/macros/MacroOverview.vue b/fe/src/components/macros/MacroOverview.vue
index 9641a32..2f17a95 100644
--- a/fe/src/components/macros/MacroOverview.vue
+++ b/fe/src/components/macros/MacroOverview.vue
@@ -16,7 +16,8 @@ import { IconKeyboard } from '@tabler/icons-vue'
import ButtonComp from '../base/ButtonComp.vue'
import { onMounted, reactive } from 'vue'
import axios from 'axios'
-import { appUrl } from '@/services/ApiService'
+import { appUrl, isLocal } from '@/services/ApiService'
+import { AuthCall } from '@/services/EncryptService'
const macros = reactive({
list: [],
@@ -29,8 +30,9 @@ onMounted(() => {
})
function runMacro(macro) {
- console.log(macro)
- axios.post(appUrl() + '/macro/play', { macro: macro }).then((data) => {
+ const data = isLocal() ? { macro: macro } : AuthCall({ macro: macro })
+
+ axios.post(appUrl() + '/macro/play', data).then((data) => {
console.log(data)
})
}
diff --git a/fe/src/main.js b/fe/src/main.js
index ed4116b..69e5c57 100644
--- a/fe/src/main.js
+++ b/fe/src/main.js
@@ -1,15 +1,15 @@
// import './assets/jemx.scss'
-import './assets/main.css'
+import "@/assets/main.css";
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
+import { createApp } from "vue";
+import { createPinia } from "pinia";
-import App from './App.vue'
-import router from './router'
+import App from "@/App.vue";
+import router from "@/router";
-const app = createApp(App)
+const app = createApp(App);
-app.use(createPinia())
-app.use(router)
+app.use(createPinia());
+app.use(router);
-app.mount('#app')
+app.mount("#app");
diff --git a/fe/src/services/EncryptService.js b/fe/src/services/EncryptService.js
new file mode 100644
index 0000000..a654ac3
--- /dev/null
+++ b/fe/src/services/EncryptService.js
@@ -0,0 +1,51 @@
+import { useDeviceStore } from '@/stores/device'
+import { AES, enc, pad } from 'crypto-js'
+
+export const encryptAES = (key, str) => {
+ key = keyPad(key)
+
+ let iv = enc.Utf8.parse(import.meta.env.VITE_MCRM__IV)
+ let encrypted = AES.encrypt(str, key, {
+ iv: iv,
+ padding: pad.Pkcs7,
+ })
+ return encrypted.toString()
+}
+
+export const decryptAES = (key, str) => {
+ key = keyPad(key)
+
+ let iv = enc.Utf8.parse(import.meta.env.VITE_MCRM__IV)
+ let encrypted = AES.decrypt(str.toString(), key, {
+ iv: iv,
+ padding: pad.Pkcs7,
+ })
+ return encrypted.toString(enc.Utf8)
+}
+
+export const AuthCall = (data) => {
+ const device = useDeviceStore()
+
+ return {
+ uuid: device.uuid(),
+ d: encryptAES(device.key(), JSON.stringify(data)),
+ }
+}
+
+function keyPad(key) {
+ let returnKey = key
+
+ if (key.length == 4) {
+ returnKey = key + import.meta.env.VITE_MCRM__SALT
+ }
+
+ return enc.Utf8.parse(returnKey)
+}
+
+export const getDateStr = () => {
+ const date = new Date()
+ const year = date.getFullYear()
+ const month = String(date.getMonth() + 1).padStart(2, '0')
+ const day = String(date.getDate()).padStart(2, '0')
+ return `${year}${month}${day}`
+}
diff --git a/fe/src/stores/device.js b/fe/src/stores/device.js
index 1e3c892..863cbad 100644
--- a/fe/src/stores/device.js
+++ b/fe/src/stores/device.js
@@ -3,11 +3,13 @@ import { defineStore } from 'pinia'
import axios from 'axios'
import { appUrl, encrypt } from '@/services/ApiService'
import { v4 as uuidv4 } from 'uuid'
+import { encryptAES, getDateStr } from '@/services/EncryptService'
export const useDeviceStore = defineStore('device', () => {
// Properties - State values
const current = ref({
uuid: false,
+ key: false,
})
const remote = ref([])
@@ -31,6 +33,23 @@ export const useDeviceStore = defineStore('device', () => {
return uuid
}
+ const key = () => {
+ if (!current.value.key && localStorage.getItem('deviceKey')) {
+ current.value.key = localStorage.getItem('deviceKey')
+ }
+ return current.value.key
+ }
+
+ const setDeviceKey = (key) => {
+ current.value.key = key
+ localStorage.setItem('deviceKey', key)
+ }
+
+ const removeDeviceKey = () => {
+ current.value.key = false
+ localStorage.removeItem('deviceKey')
+ }
+
// Server application
const serverGetRemotes = async (remoteUuid) => {
axios.post(appUrl() + '/device/list', { uuid: remoteUuid }).then((data) => {
@@ -71,13 +90,14 @@ export const useDeviceStore = defineStore('device', () => {
}, 1000)
}
- const remoteHandshake = async (pin) => {
- // send encrypt(uuid + pin)
- // then decrypt data with pin = key
-
- axios.post(appUrl() + '/device/handshake', { shake: pin }).then((data) => {
- console.log(data)
+ const remoteHandshake = async (key) => {
+ const handshake = await axios.post(appUrl() + '/device/handshake', {
+ uuid: uuid(),
+ shake: encryptAES(key, getDateStr()),
})
+ console.log(handshake)
+
+ return handshake.data
}
return {
@@ -85,6 +105,9 @@ export const useDeviceStore = defineStore('device', () => {
server,
uuid,
setDeviceId,
+ key,
+ setDeviceKey,
+ removeDeviceKey,
serverGetRemotes,
serverStartLink,
remoteCheckServerAccess,
diff --git a/fe/src/views/DevicesView.vue b/fe/src/views/DevicesView.vue
index 7fbf36e..f262cc6 100644
--- a/fe/src/views/DevicesView.vue
+++ b/fe/src/views/DevicesView.vue
@@ -3,9 +3,9 @@
Devices {{ isLocal() ? 'remote' : 'servers' }}
-
diff --git a/fe/vite.config.js b/fe/vite.config.js
index 507e043..ffa7a57 100644
--- a/fe/vite.config.js
+++ b/fe/vite.config.js
@@ -7,16 +7,25 @@ import tailwindcss from '@tailwindcss/vite'
// https://vite.dev/config/
export default defineConfig({
+ server: {
+ host: 'localhost',
+ port: 5173,
+ watch: {
+ usePolling: true,
+ },
+ },
plugins: [vue(), vueDevTools(), tailwindcss()],
+ envDir: '../',
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)),
},
},
base: '/',
- publicDir: '../public',
+ // publicDir: "../public",
build: {
outDir: '../public',
- sourcemap: true,
+ sourcemap: false,
+ minify: false,
},
})