SRSoftware
/
Umbrella
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

implemented creation of new user

feature/document
Stephan Richter 4 months ago
parent
92c6b154ea
commit
5dc7c22b03
8 changed files with 174 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      frontend/src/App.svelte
  2. 108
      frontend/src/routes/user/Edit.svelte
  3. 125
      frontend/src/routes/user/EditUser.svelte
  4. 8
      frontend/src/routes/user/List.svelte
  5. 1
      translations/src/main/resources/de.json
  6. 1
      user/src/main/java/de/srsoftware/umbrella/user/Paths.java
  7. 25
      user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
  8. 12
      user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java

5
frontend/src/App.svelte
Unescape View File

@ -5,6 +5,7 @@
import { Router, Route } from 'svelte-tiny-router'; import { Router, Route } from 'svelte-tiny-router';
import Callback from "./routes/user/OidcCallback.svelte"; import Callback from "./routes/user/OidcCallback.svelte";
import EditService from "./routes/user/EditService.svelte"; import EditService from "./routes/user/EditService.svelte";
import EditUser from "./routes/user/EditUser.svelte";
import Footer from "./Components/Footer.svelte"; import Footer from "./Components/Footer.svelte";
import Login from "./Components/Login.svelte"; import Login from "./Components/Login.svelte";
import Messages from "./routes/message/Messages.svelte"; import Messages from "./routes/message/Messages.svelte";
@ -12,7 +13,6 @@
import ResetPw from "./routes/user/ResetPw.svelte"; import ResetPw from "./routes/user/ResetPw.svelte";
import Search from "./routes/search/Search.svelte"; import Search from "./routes/search/Search.svelte";
import User from "./routes/user/User.svelte"; import User from "./routes/user/User.svelte";
import UserEdit from "./routes/user/Edit.svelte";
let translations_ready = $state(false); let translations_ready = $state(false);
onMount(async () => { onMount(async () => {
@ -37,8 +37,9 @@
<Route path="/message/settings" component={Messages} /> <Route path="/message/settings" component={Messages} />
<Route path="/search" component={Search} /> <Route path="/search" component={Search} />
<Route path="/user" component={User} /> <Route path="/user" component={User} />
<Route path="/user/create" component={EditUser} />
<Route path="/user/login" component={User} /> <Route path="/user/login" component={User} />
<Route path="/user/:user_id/edit" component={UserEdit} /> <Route path="/user/:user_id/edit" component={EditUser} />
<Route path="/user/oidc/add" component={EditService} /> <Route path="/user/oidc/add" component={EditService} />
<Route path="/user/oidc/edit/:serviceName" component={EditService} /> <Route path="/user/oidc/edit/:serviceName" component={EditService} />
<Route component={User} /> <Route component={User} />

108
frontend/src/routes/user/Edit.svelte
Unescape View File

@ -1,108 +0,0 @@
<script>
import { t } from '../../translations.svelte.js';
import { useTinyRouter } from 'svelte-tiny-router';
import { onMount } from 'svelte';
import { checkUser } from '../../user.svelte.js';
const router = useTinyRouter();
let { user_id } = $props();
let editUser = $state(null);
let options = $state([]);
let sent = $state(false);
let caption = $state(t('user.save_user'));
let message = $state(t('user.loading_data'));
onMount(async () => {
let url = `${location.protocol}//${location.host.replace('5173','8080')}/themes.json`;
let resp = await fetch(url);
if (resp.ok){
const arr = await resp.json();
for (let entry of arr){
const value = entry.value;
const caption = entry.caption ? entry.caption : value;
options.push({caption:caption,value:value})
}
}
url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`;
resp = await fetch(url,{credentials:'include'});
if (resp.ok) {
editUser = await resp.json();
} else {
message = await resp.text();
if (message == "") message = t(resp);
}
});
async function save(elem){
sent = true;
caption = t('user.data_sent');
let url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`;
let resp = await fetch(url,{
method: 'PATCH',
credentials: 'include',
body: JSON.stringify(editUser)
});
if (resp.ok){
caption = t('user.saved');
checkUser();
router.navigate('/user');
} else {
caption = t('user.failed');
}
}
</script>
<fieldset>
<legend>{t('user.editing',user_id)}</legend>
{#if editUser}
<table>
<tbody>
<tr>
<th>{t('user.id')}</th>
<td>{editUser.id}</td>
</tr>
<tr>
<th>{t('user.name')}</th>
<td>
<input type="text" bind:value={editUser.name} />
</td>
</tr>
<tr>
<th>{t('user.email')}</th>
<td>
<input type="text" bind:value={editUser.email} />
</td>
</tr>
<tr>
<th>{t('user.language')}</th>
<td>
<input type="text" bind:value={editUser.language} />
</td>
</tr>
<tr>
<th>{t('user.password')}</th>
<td>
<input type="password" bind:value={editUser.password} />
</td>
</tr>
<tr>
<th>{t('user.theme')}</th>
<td>
<select bind:value={editUser.theme}>
{#each options as entry,i}
<option value={entry.value}>{entry.caption}</option>
{/each}
</select>
</td>
</tr>
</tbody>
</table>
<button onclick={save} disabled={sent}>{caption}</button>
{:else}
{message}
{/if}
</fieldset>

125
frontend/src/routes/user/EditUser.svelte
Unescape View File

@ -0,0 +1,125 @@
<script>
import { t } from '../../translations.svelte.js';
import { useTinyRouter } from 'svelte-tiny-router';
import { onMount } from 'svelte';
import { checkUser } from '../../user.svelte.js';
const router = useTinyRouter();
let { user_id } = $props();
let editUser = $state(null);
let options = $state([]);
let sent = $state(false);
let caption = $state(t('user.save_user'));
let message = $state(t('user.loading_data'));
onMount(async () => {
let url = `${location.protocol}//${location.host.replace('5173','8080')}/themes.json`;
let resp = await fetch(url);
if (resp.ok){
const arr = await resp.json();
for (let entry of arr){
const value = entry.value;
const caption = entry.caption ? entry.caption : value;
options.push({caption:caption,value:value})
}
}
if (user_id) {
url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`;
resp = await fetch(url,{credentials:'include'});
if (resp.ok) {
editUser = await resp.json();
} else {
message = await resp.text();
if (message == "") message = t(resp);
}
} else {
editUser = {}
}
});
async function save(ev){
ev.preventDefault();
sent = true;
caption = t('user.data_sent');
let method = 'PATCH';
let url = null;
if (user_id) {
url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`;
} else {
url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/create`;
method = 'POST';
}
let resp = await fetch(url,{
method: method,
credentials: 'include',
body: JSON.stringify(editUser)
});
if (resp.ok){
caption = t('user.saved');
checkUser();
router.navigate('/user');
} else {
caption = t('user.failed');
sent = false;
}
}
</script>
<fieldset>
<legend>{t('user.editing',user_id?user_id:'')}</legend>
{#if editUser}
<form onsubmit={save}>
<table>
<tbody>
{#if editUser.id}
<tr>
<th>{t('user.id')}</th>
<td>{editUser.id}</td>
</tr>
{/if}
<tr>
<th>{t('user.name')}</th>
<td>
<input type="text" bind:value={editUser.name} />
</td>
</tr>
<tr>
<th>{t('user.email')}</th>
<td>
<input type="text" bind:value={editUser.email} />
</td>
</tr>
<tr>
<th>{t('user.language')}</th>
<td>
<input type="text" bind:value={editUser.language} />
</td>
</tr>
<tr>
<th>{t('user.password')}</th>
<td>
<input type="password" bind:value={editUser.password} />
</td>
</tr>
<tr>
<th>{t('user.theme')}</th>
<td>
<select bind:value={editUser.theme}>
{#each options as entry,i}
<option value={entry.value}>{entry.caption}</option>
{/each}
</select>
</td>
</tr>
</tbody>
</table>
<button type="submit" disabled={sent}>{caption}</button>
</form>
{:else}
{message}
{/if}
</fieldset>

8
frontend/src/routes/user/List.svelte
Unescape View File

@ -28,10 +28,16 @@
for (let key of Object.keys(json)) user[key] = json[key]; for (let key of Object.keys(json)) user[key] = json[key];
} }
} }
</script> </script>
<fieldset tabindex="0"> <fieldset tabindex="0">
<legend>{t('user.list')}</legend> <legend>
{t('user.list')}
{#if user.permissions.includes('CREATE_USERS')}
<button onclick={() => router.navigate('/user/create')}>{t('user.create_new')}</button>
{/if}
</legend>
<table> <table>
<thead> <thead>
<tr> <tr>

1
translations/src/main/resources/de.json
Unescape View File

@ -47,6 +47,7 @@
"client_secret": "Client-Geheimnis", "client_secret": "Client-Geheimnis",
"connect_service": "mit Service verbinden", "connect_service": "mit Service verbinden",
"connected_services": "verbundene Login-Services", "connected_services": "verbundene Login-Services",
"create_new": "Neuen Benutzer anlegen",
"CREATE_USERS": "NUTZER ANLEGEN", "CREATE_USERS": "NUTZER ANLEGEN",
"data_sent": "Daten übermittelt", "data_sent": "Daten übermittelt",
"delete": "löschen", "delete": "löschen",

1
user/src/main/java/de/srsoftware/umbrella/user/Paths.java
Unescape View File

@ -6,6 +6,7 @@ public class Paths {
public static final String CALLBACK = "callback"; public static final String CALLBACK = "callback";
public static final String CONNECTED = "connected"; public static final String CONNECTED = "connected";
public static final String CREATE = "create";
public static final String DASH = "dash"; public static final String DASH = "dash";
public static final String IMPERSONATE = "impersonate"; public static final String IMPERSONATE = "impersonate";
public static final String INSTALL = "install"; public static final String INSTALL = "install";

25
user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
Unescape View File

@ -242,6 +242,7 @@ public class UserModule extends BaseHandler {
head = path.pop(); head = path.pop();
} catch (NumberFormatException ignored) {} } catch (NumberFormatException ignored) {}
switch (head){ switch (head){
case CREATE: return postCreate(ex);
case OIDC: return postOIDC(ex,path); case OIDC: return postOIDC(ex,path);
case IMPERSONATE: return impersonate(ex,targetId); case IMPERSONATE: return impersonate(ex,targetId);
case LOGIN: return postLogin(ex); case LOGIN: return postLogin(ex);
@ -466,6 +467,30 @@ public class UserModule extends BaseHandler {
} }
} }
private boolean postCreate(HttpExchange ex) throws IOException {
var sessionToken = SessionToken.from(ex).map(Token::of);
if (sessionToken.isEmpty()) return sendEmptyResponse(HTTP_UNAUTHORIZED,ex);
try {
var u = users.load(users.load(sessionToken.get()));
if (!(u instanceof DbUser requestingUser && requestingUser.permissions().contains(PERMISSION.CREATE_USERS))) return sendEmptyResponse(HTTP_FORBIDDEN,ex);
var json = json(ex);
if (json.has(USER)) json = json.getJSONObject(USER);
var name = json.has(NAME) ? json.getString(NAME) : null;
var email = json.has(EMAIL) ? new EmailAddress(json.getString(EMAIL)) : null;
var theme = json.has(THEME) ? json.getString(THEME) : null;
var lang = json.has(LANGUAGE) ? json.getString(LANGUAGE) : null;
var pass = json.has(PASSWORD) ? json.getString(PASSWORD) : null;
var hashedPass = Password.of(BAD_HASHER.hash(pass,null));
var newUser = new DbUser(0, name, email, hashedPass, theme, lang, Set.of(), null);
var user = users.save(newUser);
return sendContent(ex,HTTP_OK,user);
} catch (UmbrellaException e) {
return send(ex,e);
}
}
private boolean postResetPassword(HttpExchange ex) throws IOException { private boolean postResetPassword(HttpExchange ex) throws IOException {
try { try {
var email = body(ex); var email = body(ex);

12
user/src/main/java/de/srsoftware/umbrella/user/sqlite/SqliteDB.java
Unescape View File

@ -144,7 +144,7 @@ CREATE TABLE IF NOT EXISTS {0} (
`{2}` VARCHAR(255) NOT NULL, `{2}` VARCHAR(255) NOT NULL,
`{3}` VARCHAR(255) NOT NULL, `{3}` VARCHAR(255) NOT NULL,
`{4}` VARCHAR(50), `{4}` VARCHAR(50),
`{5}` VARCHAR(255), `{5}` VARCHAR(255) UNIQUE,
`{6}` VARCHAR(100) DEFAULT "DELIVER INSTANTLY", `{6}` VARCHAR(100) DEFAULT "DELIVER INSTANTLY",
`{7}` INT DEFAULT NULL, `{7}` INT DEFAULT NULL,
`{8}` TEXT, `{8}` TEXT,
@ -476,11 +476,17 @@ CREATE TABLE IF NOT EXISTS {0} (
public UmbrellaUser save(DbUser user) throws UmbrellaException { public UmbrellaUser save(DbUser user) throws UmbrellaException {
try { try {
Long id = user.id(); Long id = user.id();
if (id<1) id = null; if (id<1){
insertInto(TABLE_USERS,LOGIN, PASS, THEME, EMAIL)
.values(user.name(), user.hashedPassword(), user.theme(), user.email().toString())
.execute(db)
.close();
} else {
replaceInto(TABLE_USERS, ID, LOGIN, PASS, THEME, EMAIL, LAST_LOGOFF) replaceInto(TABLE_USERS, ID, LOGIN, PASS, THEME, EMAIL, LAST_LOGOFF)
.values(id,user.name(),user.hashedPassword(),user.theme(),user.email(),user.lastLogoff()) .values(id, user.name(), user.hashedPassword(), user.theme(), user.email().toString(), user.lastLogoff())
.execute(db) .execute(db)
.close(); .close();
}
} catch (SQLException e) { } catch (SQLException e) {
LOG.log(WARNING,"Failed to store user data for {0}!",user.name(),e); LOG.log(WARNING,"Failed to store user data for {0}!",user.name(),e);
throw new UmbrellaException(500,"Failed to store user data for {0}!",user.name()).causedBy(e); throw new UmbrellaException(500,"Failed to store user data for {0}!",user.name()).causedBy(e);

Write Preview
Loading…
Cancel
Save