refactoring part 2: mainly consolidation of token, ids and passwort
This commit is contained in:
@@ -17,15 +17,15 @@
|
||||
let vorgang = '';
|
||||
const code_len = 8;
|
||||
|
||||
function generate_token() {
|
||||
function generatePassword() {
|
||||
return Math.random()
|
||||
.toString(36)
|
||||
.slice(2, 2 + code_len);
|
||||
}
|
||||
let zugangscode = ''
|
||||
let zugangscodeOld = ''
|
||||
$: zugangscodeOld = generate_token();
|
||||
$: zugangscode = zugangscodeOld
|
||||
let zugangspasswort = ''
|
||||
let zugangspasswordOld = ''
|
||||
$: zugangspasswordOld = generatePassword();
|
||||
$: zugangspasswort = zugangspasswordOld
|
||||
|
||||
let caseExisting = undefined;
|
||||
$: caseExisting = false;
|
||||
@@ -42,7 +42,7 @@
|
||||
let data = new FormData();
|
||||
data.append('vorgang', vorgang);
|
||||
data.append('name', name);
|
||||
data.append('zugangscode', zugangscode);
|
||||
data.append('password', zugangspasswort);
|
||||
const response = await fetch('?/validate', { method: 'POST', body: data });
|
||||
/** @type {import('@sveltejs/kit').ActionResult} */
|
||||
const result = deserialize(await response.text());
|
||||
@@ -64,7 +64,6 @@
|
||||
formErrors = { file: 'Keine gültige .GLD-Datei', ...formErrors };
|
||||
success = false;
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -72,7 +71,7 @@
|
||||
let data = new FormData();
|
||||
data.append('vorgang', vorgang);
|
||||
data.append('name', name);
|
||||
data.append('zugangscode', zugangscode);
|
||||
data.append('password', zugangspasswort);
|
||||
if (files?.length === 1) {
|
||||
data.append('type', files[0].type);
|
||||
data.append('fileName', files[0].name);
|
||||
@@ -155,7 +154,7 @@
|
||||
async function caseExists(caseName: string) {
|
||||
|
||||
if (caseName == '') {
|
||||
zugangscode = zugangscodeOld;
|
||||
zugangspasswort = zugangspasswordOld;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -166,19 +165,19 @@
|
||||
|
||||
if (status == 200) {
|
||||
caseExisting = true;
|
||||
const code = await getCode(caseName);
|
||||
zugangscode = code;
|
||||
const passwort = await getPassword(caseName);
|
||||
zugangspasswort = passwort;
|
||||
|
||||
return true
|
||||
|
||||
} else {
|
||||
caseExisting = false;
|
||||
zugangscode = zugangscodeOld;
|
||||
zugangspasswort = zugangspasswordOld;
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
async function getCode(caseName: string) {
|
||||
async function getPassword(caseName: string) {
|
||||
|
||||
if (caseName == '') return;
|
||||
|
||||
@@ -280,11 +279,11 @@
|
||||
class="flex rounded-md shadow-sm ring-1 ring-inset ring-gray-300 focus-within:ring-2 focus-within:ring-inset focus-within:ring-indigo-600"
|
||||
>
|
||||
<input
|
||||
bind:value={zugangscode}
|
||||
bind:value={zugangspasswort}
|
||||
type="text"
|
||||
name="zugangscode"
|
||||
id="zugangscode"
|
||||
on:input="{ (ev) => { zugangscodeOld = ev.target.value }}"
|
||||
on:input="{ (ev) => { zugangspasswordOld = ev.target.value }}"
|
||||
class="block flex-1 border-0 bg-transparent py-1.5 pl-1 text-gray-900 placeholder:text-gray-400 focus:ring-0 sm:text-sm sm:leading-6"
|
||||
/>
|
||||
|
||||
@@ -292,7 +291,7 @@
|
||||
<button
|
||||
class="rounded-md bg-blue-500 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600"
|
||||
on:click="{() => {
|
||||
zugangscode = zugangscodeOld = generate_token(); }}"
|
||||
zugangspasswort = zugangspasswordOld = generatePassword(); }}"
|
||||
type="button">
|
||||
Generiere Zugangscode
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user