ArcticFoxes-net/ONC-Converter
1
0
Fork 0
mirror of https://github.com/ArcticFoxes-net/ONC-Converter synced 2024-09-19 08:04:43 -04:00
Code

Use JavaScript standard style

Browse Source
This commit is contained in:
thomkeh 2018-07-02 14:36:31 +01:00 committed by GitHub
parent 71bb7660b5
commit 9cfbed769c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
index.html
View File

@ -14,12 +14,12 @@
</style> </style>
<script> <script>
function setHandler() { function setHandler () {
let clickButton = document.getElementById('clickbutton') let clickButton = document.getElementById('clickbutton')
clickButton.addEventListener('click', handler, false) clickButton.addEventListener('click', handler, false)
} }
function handler() { function handler () {
let selectedFile = document.getElementById('inputopenvpn').files[0] let selectedFile = document.getElementById('inputopenvpn').files[0]
let certificates = document.getElementById('inputcertificates').files let certificates = document.getElementById('inputcertificates').files
let connName = document.getElementById('connname').value let connName = document.getElementById('connname').value
@ -27,7 +27,7 @@
main(connName, selectedFile, certificates, output) main(connName, selectedFile, certificates, output)
} }
async function main(connName, selectedFile, certificateFiles, output) { async function main (connName, selectedFile, certificateFiles, output) {
if (connName === '') { if (connName === '') {
alert('Please specify a name for the connection.') alert('Please specify a name for the connection.')
return return
@ -43,13 +43,13 @@
output.value = JSON.stringify(onc, null, 2) output.value = JSON.stringify(onc, null, 2)
} }
function readFile(file) { function readFile (file) {
return new Promise(resolve => { return new Promise(resolve => {
let reader = new FileReader() let reader = new FileReader()
reader.onload = (e => { reader.onload = e => {
// callback and remove windows-style newlines // callback and remove windows-style newlines
resolve(e.target.result.replace(/\r/g, '')) resolve(e.target.result.replace(/\r/g, ''))
}) }
// start reading // start reading
reader.readAsText(file) reader.readAsText(file)
}) })
@ -104,7 +104,7 @@
function isQuoted (val) { function isQuoted (val) {
return ((val.charAt(0) === '"' && val.slice(-1) === '"') || return ((val.charAt(0) === '"' && val.slice(-1) === '"') ||
(val.charAt(0) === "'" && val.slice(-1) === "'")) (val.charAt(0) === "'" && val.slice(-1) === "'"))
} }
function unsafe (val, doUnesc) { function unsafe (val, doUnesc) {
@ -150,7 +150,7 @@
'NetworkConfigurations': [] 'NetworkConfigurations': []
} }
function convert(name, ovpn, keys) { function convert (name, ovpn, keys) {
if (!ovpn.client) { if (!ovpn.client) {
console.warn('Is this a server file?') console.warn('Is this a server file?')
} }
@ -196,7 +196,7 @@
} }
} }
// set parameters if they exist in the ovpn config // set parameters if they exist in the ovpn config
let conditionalSet = (ovpnName, oncName, type='str') => { let conditionalSet = (ovpnName, oncName, type = 'str') => {
if (ovpn[ovpnName]) { if (ovpn[ovpnName]) {
const raw = ovpn[ovpnName] const raw = ovpn[ovpnName]
let value let value
@ -241,13 +241,13 @@
/** /**
* Create UUID (from Stackoverflow). * Create UUID (from Stackoverflow).
*/ */
function uuidv4() { function uuidv4 () {
return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, c=> return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
(c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16) (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
) )
} }
function convertKey(key) { function convertKey (key) {
let lines = key.split(/\n/g) let lines = key.split(/\n/g)
let out = '' let out = ''
for (let line of lines) { for (let line of lines) {
@ -258,7 +258,7 @@
return out return out
} }
function extractCas(str) { function extractCas (str) {
let splits = str.replace(/\n/g, '').split('-----BEGIN CERTIFICATE-----') let splits = str.replace(/\n/g, '').split('-----BEGIN CERTIFICATE-----')
console.log(splits) console.log(splits)
let cas = [] let cas = []
@ -270,7 +270,7 @@
return cas return cas
} }
function createCerts(keys, certName, certType) { function createCerts (keys, certName, certType) {
let certs = [] let certs = []
let certGuids = [] let certGuids = []
if (certName) { if (certName) {