diff --git a/kanidmd/src/lib/constants/acp.rs b/kanidmd/src/lib/constants/acp.rs index d65f9331e..9514f6d53 100644 --- a/kanidmd/src/lib/constants/acp.rs +++ b/kanidmd/src/lib/constants/acp.rs @@ -474,9 +474,58 @@ pub const JSON_IDM_ACP_ACCOUNT_MANAGE_PRIV_V1: &str = r#"{ ] } }"#; + // 14 radius read acp JSON_IDM_RADIUS_SERVERS_V1 // The targetscope of this could change later to a "radius access" group or similar so we can add/remove // users from having radius access easier. + +pub const JSON_IDM_ACP_RADIUS_SECRET_READ_PRIV_V1: &str = r#"{ + "attrs": { + "class": [ + "object", + "access_control_profile", + "access_control_search" + ], + "name": ["idm_acp_radius_secret_read_priv"], + "uuid": ["00000000-0000-0000-0000-ffffff000039"], + "description": ["Builtin IDM Control for reading radius secrets of accounts."], + "acp_receiver": [ + "{\"eq\":[\"memberof\",\"00000000-0000-0000-0000-000000000032\"]}" + ], + "acp_targetscope": [ + "{\"and\": [{\"eq\": [\"class\",\"account\"]}, {\"andnot\": {\"or\": [{\"eq\": [\"memberof\",\"00000000-0000-0000-0000-000000001000\"]}, {\"eq\": [\"class\", \"tombstone\"]}, {\"eq\": [\"class\", \"recycled\"]}]}}]}" + ], + "acp_search_attr": [ + "radius_secret" + ] + } +}"#; + +pub const JSON_IDM_ACP_RADIUS_SECRET_WRITE_PRIV_V1: &str = r#"{ + "attrs": { + "class": [ + "object", + "access_control_profile", + "access_control_modify" + ], + "name": ["idm_acp_radius_secret_write_priv"], + "uuid": ["00000000-0000-0000-0000-ffffff000040"], + "description": ["Builtin IDM Control allowing writes to user radius secrets."], + "acp_receiver": [ + "{\"eq\":[\"memberof\",\"00000000-0000-0000-0000-000000000031\"]}" + ], + "acp_targetscope": [ + "{\"and\": [{\"eq\": [\"class\",\"account\"]}, {\"andnot\": {\"or\": [{\"eq\": [\"memberof\",\"00000000-0000-0000-0000-000000001000\"]}, {\"eq\": [\"class\", \"tombstone\"]}, {\"eq\": [\"class\", \"recycled\"]}]}}]}" + ], + "acp_modify_removedattr": [ + "radius_secret" + ], + "acp_modify_presentattr": [ + "radius_secret" + ] + } +}"#; + pub const JSON_IDM_ACP_RADIUS_SERVERS_V1: &str = r#"{ "attrs": { "class": [ @@ -498,6 +547,7 @@ pub const JSON_IDM_ACP_RADIUS_SERVERS_V1: &str = r#"{ ] } }"#; + // 15 high priv account read JSON_IDM_HP_ACCOUNT_READ_PRIV_V1 pub const JSON_IDM_ACP_HP_ACCOUNT_READ_PRIV_V1: &str = r#"{ "attrs": { diff --git a/kanidmd/src/lib/constants/entries.rs b/kanidmd/src/lib/constants/entries.rs index 1c2876e44..c27117081 100644 --- a/kanidmd/src/lib/constants/entries.rs +++ b/kanidmd/src/lib/constants/entries.rs @@ -206,6 +206,27 @@ pub const JSON_IDM_ACCOUNT_UNIX_EXTEND_PRIV_V1: &str = r#"{ } }"#; // * RADIUS servers + +pub const JSON_IDM_RADIUS_SECRET_WRITE_PRIV_V1: &str = r#"{ + "attrs": { + "class": ["group", "object"], + "name": ["idm_radius_secret_write_priv"], + "uuid": ["00000000-0000-0000-0000-000000000031"], + "description": ["Builtin IDM Group for RADIUS secret write for all non-hp accounts."], + "member": ["00000000-0000-0000-0000-000000000001"] + } +}"#; + +pub const JSON_IDM_RADIUS_SECRET_READ_PRIV_V1: &str = r#"{ + "attrs": { + "class": ["group", "object"], + "name": ["idm_radius_secret_read_priv"], + "uuid": ["00000000-0000-0000-0000-000000000032"], + "description": ["Builtin IDM Group for RADIUS secret reading for all non-hp accounts."], + "member": ["00000000-0000-0000-0000-000000000031"] + } +}"#; + pub const JSON_IDM_RADIUS_SERVERS_V1: &str = r#"{ "attrs": { "class": ["group", "object"], @@ -214,6 +235,7 @@ pub const JSON_IDM_RADIUS_SERVERS_V1: &str = r#"{ "description": ["Builtin IDM Group for RADIUS server access delegation."] } }"#; + // * high priv account read manager pub const JSON_IDM_HP_ACCOUNT_READ_PRIV_V1: &str = r#"{ "attrs": { @@ -368,6 +390,8 @@ pub const JSON_IDM_HIGH_PRIVILEGE_V1: &str = r#"{ "00000000-0000-0000-0000-000000000025", "00000000-0000-0000-0000-000000000026", "00000000-0000-0000-0000-000000000027", + "00000000-0000-0000-0000-000000000031", + "00000000-0000-0000-0000-000000000032", "00000000-0000-0000-0000-000000001000" ] } diff --git a/kanidmd/src/lib/constants/uuids.rs b/kanidmd/src/lib/constants/uuids.rs index f2d204a48..375512ee7 100644 --- a/kanidmd/src/lib/constants/uuids.rs +++ b/kanidmd/src/lib/constants/uuids.rs @@ -38,6 +38,11 @@ pub const _UUID_IDM_HP_PEOPLE_READ_PRIV: Uuid = uuid!("00000000-0000-0000-0000-0 pub const _UUID_IDM_HP_PEOPLE_WRITE_PRIV: Uuid = uuid!("00000000-0000-0000-0000-000000000029"); pub const _UUID_IDM_HP_PEOPLE_EXTEND_PRIV: Uuid = uuid!("00000000-0000-0000-0000-000000000030"); +pub const _UUID_IDM_RADIUS_SECRET_READ_PRIV_V1: Uuid = + uuid!("00000000-0000-0000-0000-000000000032"); +pub const _UUID_IDM_RADIUS_SECRET_WRITE_PRIV_V1: Uuid = + uuid!("00000000-0000-0000-0000-000000000031"); + // pub const _UUID_IDM_HIGH_PRIVILEGE: Uuid = uuid!("00000000-0000-0000-0000-000000001000"); @@ -219,6 +224,10 @@ pub const _UUID_IDM_ACP_HP_PEOPLE_WRITE_PRIV_V1: Uuid = uuid!("00000000-0000-0000-0000-ffffff000037"); pub const _UUID_IDM_ACP_HP_PEOPLE_EXTEND_PRIV_V1: Uuid = uuid!("00000000-0000-0000-0000-ffffff000038"); +pub const _UUID_IDM_ACP_RADIUS_SECRET_READ_PRIV_V1: Uuid = + uuid!("00000000-0000-0000-0000-ffffff000039"); +pub const _UUID_IDM_ACP_RADIUS_SECRET_WRITE_PRIV_V1: Uuid = + uuid!("00000000-0000-0000-0000-ffffff000040"); // End of system ranges pub const UUID_DOES_NOT_EXIST: Uuid = uuid!("00000000-0000-0000-0000-fffffffffffe"); diff --git a/kanidmd/src/lib/core/https/mod.rs b/kanidmd/src/lib/core/https/mod.rs index 0ff4347c1..9773f0ee5 100644 --- a/kanidmd/src/lib/core/https/mod.rs +++ b/kanidmd/src/lib/core/https/mod.rs @@ -156,7 +156,15 @@ async fn index_view(_req: tide::Request) -> tide::Result { - + + diff --git a/kanidmd/src/lib/server.rs b/kanidmd/src/lib/server.rs index 04373bb7c..57fe240aa 100644 --- a/kanidmd/src/lib/server.rs +++ b/kanidmd/src/lib/server.rs @@ -2315,6 +2315,8 @@ impl<'a> QueryServerWriteTransaction<'a> { JSON_IDM_ACCOUNT_WRITE_PRIV_V1, JSON_IDM_ACCOUNT_UNIX_EXTEND_PRIV_V1, JSON_IDM_ACCOUNT_READ_PRIV_V1, + JSON_IDM_RADIUS_SECRET_WRITE_PRIV_V1, + JSON_IDM_RADIUS_SECRET_READ_PRIV_V1, JSON_IDM_RADIUS_SERVERS_V1, // Write deps on read, so write must be added first. JSON_IDM_HP_ACCOUNT_MANAGE_PRIV_V1, @@ -2366,6 +2368,8 @@ impl<'a> QueryServerWriteTransaction<'a> { JSON_IDM_HP_ACP_ACCOUNT_UNIX_EXTEND_PRIV_V1, JSON_IDM_HP_ACP_GROUP_UNIX_EXTEND_PRIV_V1, JSON_IDM_HP_ACP_OAUTH2_MANAGE_PRIV_V1, + JSON_IDM_ACP_RADIUS_SECRET_READ_PRIV_V1, + JSON_IDM_ACP_RADIUS_SECRET_WRITE_PRIV_V1, ]; let res: Result<(), _> = idm_entries diff --git a/kanidmd_web_ui/build_wasm_dev.sh b/kanidmd_web_ui/build_wasm_dev.sh index 340519782..201d6cbe7 100755 --- a/kanidmd_web_ui/build_wasm_dev.sh +++ b/kanidmd_web_ui/build_wasm_dev.sh @@ -1,8 +1,6 @@ #!/bin/sh wasm-pack build --dev --target web && \ - rollup ./src/main.js --format iife --file ./pkg/bundle.js && \ cp ./src/style.css ./pkg/style.css && \ cp -a ./src/external ./pkg/external && \ rm ./pkg/.gitignore - diff --git a/kanidmd_web_ui/build_wasm_release.sh b/kanidmd_web_ui/build_wasm_release.sh index e57a1504a..34981b122 100755 --- a/kanidmd_web_ui/build_wasm_release.sh +++ b/kanidmd_web_ui/build_wasm_release.sh @@ -1,6 +1,5 @@ #!/bin/sh wasm-pack build --no-typescript --release --target web && \ - rollup ./src/main.js --format iife --file ./pkg/bundle.js && \ cp ./src/style.css ./pkg/style.css && \ cp -a ./src/external ./pkg/external && \ rm ./pkg/.gitignore diff --git a/kanidmd_web_ui/pkg/bundle.js b/kanidmd_web_ui/pkg/bundle.js deleted file mode 100644 index 467a17eb3..000000000 --- a/kanidmd_web_ui/pkg/bundle.js +++ /dev/null @@ -1,835 +0,0 @@ -(function () { - 'use strict'; - - let wasm; - - const heap = new Array(32).fill(undefined); - - heap.push(undefined, null, true, false); - - function getObject(idx) { return heap[idx]; } - - let heap_next = heap.length; - - function dropObject(idx) { - if (idx < 36) return; - heap[idx] = heap_next; - heap_next = idx; - } - - function takeObject(idx) { - const ret = getObject(idx); - dropObject(idx); - return ret; - } - - function addHeapObject(obj) { - if (heap_next === heap.length) heap.push(heap.length + 1); - const idx = heap_next; - heap_next = heap[idx]; - - heap[idx] = obj; - return idx; - } - - let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); - - cachedTextDecoder.decode(); - - let cachegetUint8Memory0 = null; - function getUint8Memory0() { - if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) { - cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer); - } - return cachegetUint8Memory0; - } - - function getStringFromWasm0(ptr, len) { - return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); - } - - let WASM_VECTOR_LEN = 0; - - let cachedTextEncoder = new TextEncoder('utf-8'); - - const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' - ? function (arg, view) { - return cachedTextEncoder.encodeInto(arg, view); - } - : function (arg, view) { - const buf = cachedTextEncoder.encode(arg); - view.set(buf); - return { - read: arg.length, - written: buf.length - }; - }); - - function passStringToWasm0(arg, malloc, realloc) { - - if (realloc === undefined) { - const buf = cachedTextEncoder.encode(arg); - const ptr = malloc(buf.length); - getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf); - WASM_VECTOR_LEN = buf.length; - return ptr; - } - - let len = arg.length; - let ptr = malloc(len); - - const mem = getUint8Memory0(); - - let offset = 0; - - for (; offset < len; offset++) { - const code = arg.charCodeAt(offset); - if (code > 0x7F) break; - mem[ptr + offset] = code; - } - - if (offset !== len) { - if (offset !== 0) { - arg = arg.slice(offset); - } - ptr = realloc(ptr, len, len = offset + arg.length * 3); - const view = getUint8Memory0().subarray(ptr + offset, ptr + len); - const ret = encodeString(arg, view); - - offset += ret.written; - } - - WASM_VECTOR_LEN = offset; - return ptr; - } - - let cachegetInt32Memory0 = null; - function getInt32Memory0() { - if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) { - cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer); - } - return cachegetInt32Memory0; - } - - function isLikeNone(x) { - return x === undefined || x === null; - } - - let cachegetFloat64Memory0 = null; - function getFloat64Memory0() { - if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) { - cachegetFloat64Memory0 = new Float64Array(wasm.memory.buffer); - } - return cachegetFloat64Memory0; - } - - function debugString(val) { - // primitive types - const type = typeof val; - if (type == 'number' || type == 'boolean' || val == null) { - return `${val}`; - } - if (type == 'string') { - return `"${val}"`; - } - if (type == 'symbol') { - const description = val.description; - if (description == null) { - return 'Symbol'; - } else { - return `Symbol(${description})`; - } - } - if (type == 'function') { - const name = val.name; - if (typeof name == 'string' && name.length > 0) { - return `Function(${name})`; - } else { - return 'Function'; - } - } - // objects - if (Array.isArray(val)) { - const length = val.length; - let debug = '['; - if (length > 0) { - debug += debugString(val[0]); - } - for(let i = 1; i < length; i++) { - debug += ', ' + debugString(val[i]); - } - debug += ']'; - return debug; - } - // Test for built-in - const builtInMatches = /\[object ([^\]]+)\]/.exec(toString.call(val)); - let className; - if (builtInMatches.length > 1) { - className = builtInMatches[1]; - } else { - // Failed to match the standard '[object ClassName]' - return toString.call(val); - } - if (className == 'Object') { - // we're a user defined class or Object - // JSON.stringify avoids problems with cycles, and is generally much - // easier than looping through ownProperties of `val`. - try { - return 'Object(' + JSON.stringify(val) + ')'; - } catch (_) { - return 'Object'; - } - } - // errors - if (val instanceof Error) { - return `${val.name}: ${val.message}\n${val.stack}`; - } - // TODO we could test for more things here, like `Set`s and `Map`s. - return className; - } - - function makeMutClosure(arg0, arg1, dtor, f) { - const state = { a: arg0, b: arg1, cnt: 1, dtor }; - const real = (...args) => { - // First up with a closure we increment the internal reference - // count. This ensures that the Rust closure environment won't - // be deallocated while we're invoking it. - state.cnt++; - const a = state.a; - state.a = 0; - try { - return f(a, state.b, ...args); - } finally { - if (--state.cnt === 0) { - wasm.__wbindgen_export_2.get(state.dtor)(a, state.b); - - } else { - state.a = a; - } - } - }; - real.original = state; - - return real; - } - - let stack_pointer = 32; - - function addBorrowedObject(obj) { - if (stack_pointer == 1) throw new Error('out of js stack'); - heap[--stack_pointer] = obj; - return stack_pointer; - } - function __wbg_adapter_30(arg0, arg1, arg2) { - try { - wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h5b943b18d2a1ef55(arg0, arg1, addBorrowedObject(arg2)); - } finally { - heap[stack_pointer++] = undefined; - } - } - - function makeClosure(arg0, arg1, dtor, f) { - const state = { a: arg0, b: arg1, cnt: 1, dtor }; - const real = (...args) => { - // First up with a closure we increment the internal reference - // count. This ensures that the Rust closure environment won't - // be deallocated while we're invoking it. - state.cnt++; - try { - return f(state.a, state.b, ...args); - } finally { - if (--state.cnt === 0) { - wasm.__wbindgen_export_2.get(state.dtor)(state.a, state.b); - state.a = 0; - - } - } - }; - real.original = state; - - return real; - } - function __wbg_adapter_33(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1f3d1795f4b3ca23(arg0, arg1, addHeapObject(arg2)); - } - - function __wbg_adapter_36(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc2108db4a8fc5f49(arg0, arg1, addHeapObject(arg2)); - } - - /** - */ - function run_app() { - wasm.run_app(); - } - - let cachegetUint32Memory0 = null; - function getUint32Memory0() { - if (cachegetUint32Memory0 === null || cachegetUint32Memory0.buffer !== wasm.memory.buffer) { - cachegetUint32Memory0 = new Uint32Array(wasm.memory.buffer); - } - return cachegetUint32Memory0; - } - - function getArrayJsValueFromWasm0(ptr, len) { - const mem = getUint32Memory0(); - const slice = mem.subarray(ptr / 4, ptr / 4 + len); - const result = []; - for (let i = 0; i < slice.length; i++) { - result.push(takeObject(slice[i])); - } - return result; - } - - function handleError(f, args) { - try { - return f.apply(this, args); - } catch (e) { - wasm.__wbindgen_exn_store(addHeapObject(e)); - } - } - - async function load(module, imports) { - if (typeof Response === 'function' && module instanceof Response) { - if (typeof WebAssembly.instantiateStreaming === 'function') { - try { - return await WebAssembly.instantiateStreaming(module, imports); - - } catch (e) { - if (module.headers.get('Content-Type') != 'application/wasm') { - console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e); - - } else { - throw e; - } - } - } - - const bytes = await module.arrayBuffer(); - return await WebAssembly.instantiate(bytes, imports); - - } else { - const instance = await WebAssembly.instantiate(module, imports); - - if (instance instanceof WebAssembly.Instance) { - return { instance, module }; - - } else { - return instance; - } - } - } - - async function init(input) { - if (typeof input === 'undefined') { - input = new URL('kanidmd_web_ui_bg.wasm', (document.currentScript && document.currentScript.src || new URL('bundle.js', document.baseURI).href)); - } - const imports = {}; - imports.wbg = {}; - imports.wbg.__wbindgen_object_drop_ref = function(arg0) { - takeObject(arg0); - }; - imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - var ret = getObject(arg0); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - var ret = getStringFromWasm0(arg0, arg1); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) { - const obj = getObject(arg1); - var ret = JSON.stringify(obj === undefined ? null : obj); - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbindgen_string_get = function(arg0, arg1) { - const obj = getObject(arg1); - var ret = typeof(obj) === 'string' ? obj : undefined; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbindgen_cb_drop = function(arg0) { - const obj = takeObject(arg0).original; - if (obj.cnt-- == 1) { - obj.a = 0; - return true; - } - var ret = false; - return ret; - }; - imports.wbg.__wbindgen_boolean_get = function(arg0) { - const v = getObject(arg0); - var ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; - return ret; - }; - imports.wbg.__wbindgen_is_undefined = function(arg0) { - var ret = getObject(arg0) === undefined; - return ret; - }; - imports.wbg.__wbindgen_json_parse = function(arg0, arg1) { - var ret = JSON.parse(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_number_new = function(arg0) { - var ret = arg0; - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_number_get = function(arg0, arg1) { - const obj = getObject(arg1); - var ret = typeof(obj) === 'number' ? obj : undefined; - getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret; - getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret); - }; - imports.wbg.__wbg_new_693216e109162396 = function() { - var ret = new Error(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_stack_0ddaca5d1abfb52f = function(arg0, arg1) { - var ret = getObject(arg1).stack; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_error_09919627ac0992f5 = function(arg0, arg1) { - try { - console.error(getStringFromWasm0(arg0, arg1)); - } finally { - wasm.__wbindgen_free(arg0, arg1); - } - }; - imports.wbg.__wbg_log_06b7ffc63a0f8bee = function(arg0, arg1) { - var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice(); - wasm.__wbindgen_free(arg0, arg1 * 4); - console.log(...v0); - }; - imports.wbg.__wbg_warn_2aa0e7178e1d35f6 = function(arg0, arg1) { - var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice(); - wasm.__wbindgen_free(arg0, arg1 * 4); - console.warn(...v0); - }; - imports.wbg.__wbg_instanceof_Window_c4b70662a0d2c5ec = function(arg0) { - var ret = getObject(arg0) instanceof Window; - return ret; - }; - imports.wbg.__wbg_document_1c64944725c0d81d = function(arg0) { - var ret = getObject(arg0).document; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_location_f98ad02632f88c43 = function(arg0) { - var ret = getObject(arg0).location; - return addHeapObject(ret); - }; - imports.wbg.__wbg_history_3ac8f1466e0c0528 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).history; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_navigator_480e592af6ad365b = function(arg0) { - var ret = getObject(arg0).navigator; - return addHeapObject(ret); - }; - imports.wbg.__wbg_localStorage_6775414303ab5085 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).localStorage; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_sessionStorage_91431bb083105afe = function() { return handleError(function (arg0) { - var ret = getObject(arg0).sessionStorage; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_fetch_cfe0d1dd786e9cd4 = function(arg0, arg1) { - var ret = getObject(arg0).fetch(getObject(arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_body_78ae4fd43b446013 = function(arg0) { - var ret = getObject(arg0).body; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_createElement_86c152812a141a62 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createElementNS_ae12b8681c3957a3 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - var ret = getObject(arg0).createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_createTextNode_365db3bc3d0523ab = function(arg0, arg1, arg2) { - var ret = getObject(arg0).createTextNode(getStringFromWasm0(arg1, arg2)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_getElementById_f3e94458ce77f0d0 = function(arg0, arg1, arg2) { - var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2)); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_querySelector_b92a6c73bcfe671b = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).querySelector(getStringFromWasm0(arg1, arg2)); - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_get_398540d826c14d7c = function() { return handleError(function (arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).get(getStringFromWasm0(arg2, arg3)); - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_set_5357fedb30848723 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_pathname_3570d699aa5b91aa = function(arg0, arg1) { - var ret = getObject(arg1).pathname; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_new_3f48783ae4f87f8f = function() { return handleError(function (arg0, arg1) { - var ret = new URL(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_value_686b2a68422cb88d = function(arg0, arg1) { - var ret = getObject(arg1).value; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_setvalue_0a07023245efa3cc = function(arg0, arg1, arg2) { - getObject(arg0).value = getStringFromWasm0(arg1, arg2); - }; - imports.wbg.__wbg_instanceof_Response_e1b11afbefa5b563 = function(arg0) { - var ret = getObject(arg0) instanceof Response; - return ret; - }; - imports.wbg.__wbg_status_6d8bb444ddc5a7b2 = function(arg0) { - var ret = getObject(arg0).status; - return ret; - }; - imports.wbg.__wbg_headers_5ffa990806e04cfc = function(arg0) { - var ret = getObject(arg0).headers; - return addHeapObject(ret); - }; - imports.wbg.__wbg_json_88cc6d5cf8f61121 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).json(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_text_8279d34d73e43c68 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).text(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_add_f36d97e1d70d27b0 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).add(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_remove_89670e56a41482a8 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).remove(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_get_49ddec76fecb886f = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).get(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_href_1194e84dd750563a = function(arg0, arg1) { - var ret = getObject(arg1).href; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_headers_4764f5445b6a6c89 = function(arg0) { - var ret = getObject(arg0).headers; - return addHeapObject(ret); - }; - imports.wbg.__wbg_newwithstrandinit_9b0fa00478c37287 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_instanceof_HtmlInputElement_8cafe5f30dfdb6bc = function(arg0) { - var ret = getObject(arg0) instanceof HTMLInputElement; - return ret; - }; - imports.wbg.__wbg_setchecked_206243371da58f6a = function(arg0, arg1) { - getObject(arg0).checked = arg1 !== 0; - }; - imports.wbg.__wbg_value_0627d4b1c27534e6 = function(arg0, arg1) { - var ret = getObject(arg1).value; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_setvalue_2459f62386b6967f = function(arg0, arg1, arg2) { - getObject(arg0).value = getStringFromWasm0(arg1, arg2); - }; - imports.wbg.__wbg_instanceof_Event_480a3ec3d45b75a6 = function(arg0) { - var ret = getObject(arg0) instanceof Event; - return ret; - }; - imports.wbg.__wbg_target_cc69dde6c2d9ec90 = function(arg0) { - var ret = getObject(arg0).target; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_cancelBubble_f67c419013823f11 = function(arg0) { - var ret = getObject(arg0).cancelBubble; - return ret; - }; - imports.wbg.__wbg_preventDefault_9866c9fd51eecfb6 = function(arg0) { - getObject(arg0).preventDefault(); - }; - imports.wbg.__wbg_instanceof_HtmlDocument_1faa18f5a2da6fb3 = function(arg0) { - var ret = getObject(arg0) instanceof HTMLDocument; - return ret; - }; - imports.wbg.__wbg_cookie_becfe81fc969a9ff = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).cookie; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_getClientExtensionResults_73fef7f1197950fb = function(arg0) { - var ret = getObject(arg0).getClientExtensionResults(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_instanceof_Element_97d85e53f1805b82 = function(arg0) { - var ret = getObject(arg0) instanceof Element; - return ret; - }; - imports.wbg.__wbg_namespaceURI_f4cd665d07463337 = function(arg0, arg1) { - var ret = getObject(arg1).namespaceURI; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbg_classList_b666640fdfbcc8ab = function(arg0) { - var ret = getObject(arg0).classList; - return addHeapObject(ret); - }; - imports.wbg.__wbg_removeAttribute_eea03ed128669b8f = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).removeAttribute(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_setAttribute_1b533bf07966de55 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_instanceof_HtmlElement_df66c8b4a687aa43 = function(arg0) { - var ret = getObject(arg0) instanceof HTMLElement; - return ret; - }; - imports.wbg.__wbg_focus_00530e359f44fc6e = function() { return handleError(function (arg0) { - getObject(arg0).focus(); - }, arguments) }; - imports.wbg.__wbg_addEventListener_09e11fbf8b4b719b = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), getObject(arg4)); - }, arguments) }; - imports.wbg.__wbg_removeEventListener_24d5a7c12c3f3c39 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), arg4 !== 0); - }, arguments) }; - imports.wbg.__wbg_credentials_5339e35d156d6605 = function(arg0) { - var ret = getObject(arg0).credentials; - return addHeapObject(ret); - }; - imports.wbg.__wbg_pushState_f772e11155235e9c = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { - getObject(arg0).pushState(getObject(arg1), getStringFromWasm0(arg2, arg3), arg4 === 0 ? undefined : getStringFromWasm0(arg4, arg5)); - }, arguments) }; - imports.wbg.__wbg_parentElement_0253a5d6c3ff0ba5 = function(arg0) { - var ret = getObject(arg0).parentElement; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_lastChild_ca5bac177ef353f6 = function(arg0) { - var ret = getObject(arg0).lastChild; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }; - imports.wbg.__wbg_setnodeValue_702374ad3d0ec3df = function(arg0, arg1, arg2) { - getObject(arg0).nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2); - }; - imports.wbg.__wbg_appendChild_d318db34c4559916 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).appendChild(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_insertBefore_5b314357408fbec1 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_removeChild_d3ca7b53e537867e = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).removeChild(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_pathname_32da720074d17e34 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).pathname; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_search_f44353b4fdbdd216 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).search; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_replace_fde8d9ba8c5000f9 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).replace(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_getItem_77fb9d4666f3b93a = function() { return handleError(function (arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3)); - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_removeItem_e02016195a414450 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).removeItem(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_setItem_b0c4561489dffecd = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_new_949bbc1147195c4e = function() { - var ret = new Array(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_newnoargs_be86524d73f67598 = function(arg0, arg1) { - var ret = new Function(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_get_4d0f21c2f823742e = function() { return handleError(function (arg0, arg1) { - var ret = Reflect.get(getObject(arg0), getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_call_888d259a5fefc347 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).call(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_new_0b83d3df67ecb33e = function() { - var ret = new Object(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_push_284486ca27c6aa8b = function(arg0, arg1) { - var ret = getObject(arg0).push(getObject(arg1)); - return ret; - }; - imports.wbg.__wbg_instanceof_Error_561efcb1265706d8 = function(arg0) { - var ret = getObject(arg0) instanceof Error; - return ret; - }; - imports.wbg.__wbg_message_9f7d15ff97fc4102 = function(arg0) { - var ret = getObject(arg0).message; - return addHeapObject(ret); - }; - imports.wbg.__wbg_name_5a42234155690dbc = function(arg0) { - var ret = getObject(arg0).name; - return addHeapObject(ret); - }; - imports.wbg.__wbg_toString_0ef1ea57b966aed4 = function(arg0) { - var ret = getObject(arg0).toString(); - return addHeapObject(ret); - }; - imports.wbg.__wbg_valueOf_99d85ac83228d11b = function(arg0) { - var ret = getObject(arg0).valueOf(); - return ret; - }; - imports.wbg.__wbg_is_0f5efc7977a2c50b = function(arg0, arg1) { - var ret = Object.is(getObject(arg0), getObject(arg1)); - return ret; - }; - imports.wbg.__wbg_resolve_d23068002f584f22 = function(arg0) { - var ret = Promise.resolve(getObject(arg0)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_then_2fcac196782070cc = function(arg0, arg1) { - var ret = getObject(arg0).then(getObject(arg1)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_then_8c2d62e8ae5978f7 = function(arg0, arg1, arg2) { - var ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_self_c6fbdfc2918d5e58 = function() { return handleError(function () { - var ret = self.self; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_window_baec038b5ab35c54 = function() { return handleError(function () { - var ret = window.window; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_globalThis_3f735a5746d41fbd = function() { return handleError(function () { - var ret = globalThis.globalThis; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_global_1bc0b39582740e95 = function() { return handleError(function () { - var ret = global.global; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_buffer_397eaa4d72ee94dd = function(arg0) { - var ret = getObject(arg0).buffer; - return addHeapObject(ret); - }; - imports.wbg.__wbg_newwithbyteoffsetandlength_4b9b8c4e3f5adbff = function(arg0, arg1, arg2) { - var ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0); - return addHeapObject(ret); - }; - imports.wbg.__wbg_new_a7ce447f15ff496f = function(arg0) { - var ret = new Uint8Array(getObject(arg0)); - return addHeapObject(ret); - }; - imports.wbg.__wbg_set_969ad0a60e51d320 = function(arg0, arg1, arg2) { - getObject(arg0).set(getObject(arg1), arg2 >>> 0); - }; - imports.wbg.__wbg_length_1eb8fc608a0d4cdb = function(arg0) { - var ret = getObject(arg0).length; - return ret; - }; - imports.wbg.__wbg_set_82a4e8a85e31ac42 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2)); - return ret; - }, arguments) }; - imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { - var ret = debugString(getObject(arg1)); - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; - imports.wbg.__wbindgen_throw = function(arg0, arg1) { - throw new Error(getStringFromWasm0(arg0, arg1)); - }; - imports.wbg.__wbindgen_memory = function() { - var ret = wasm.memory; - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_closure_wrapper1165 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 484, __wbg_adapter_30); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_closure_wrapper1355 = function(arg0, arg1, arg2) { - var ret = makeClosure(arg0, arg1, 529, __wbg_adapter_33); - return addHeapObject(ret); - }; - imports.wbg.__wbindgen_closure_wrapper1491 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 568, __wbg_adapter_36); - return addHeapObject(ret); - }; - - if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) { - input = fetch(input); - } - - - - const { instance, module } = await load(await input, imports); - - wasm = instance.exports; - init.__wbindgen_wasm_module = module; - - return wasm; - } - - async function main() { - await init('/pkg/kanidmd_web_ui_bg.wasm'); - run_app(); - } - main(); - -}()); diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.js b/kanidmd_web_ui/pkg/kanidmd_web_ui.js index fdcb80796..109995371 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.js +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.js @@ -1,35 +1,6 @@ let wasm; -const heap = new Array(32).fill(undefined); - -heap.push(undefined, null, true, false); - -function getObject(idx) { return heap[idx]; } - -let heap_next = heap.length; - -function dropObject(idx) { - if (idx < 36) return; - heap[idx] = heap_next; - heap_next = idx; -} - -function takeObject(idx) { - const ret = getObject(idx); - dropObject(idx); - return ret; -} - -function addHeapObject(obj) { - if (heap_next === heap.length) heap.push(heap.length + 1); - const idx = heap_next; - heap_next = heap[idx]; - - heap[idx] = obj; - return idx; -} - let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); cachedTextDecoder.decode(); @@ -46,6 +17,35 @@ function getStringFromWasm0(ptr, len) { return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len)); } +const heap = new Array(32).fill(undefined); + +heap.push(undefined, null, true, false); + +let heap_next = heap.length; + +function addHeapObject(obj) { + if (heap_next === heap.length) heap.push(heap.length + 1); + const idx = heap_next; + heap_next = heap[idx]; + + heap[idx] = obj; + return idx; +} + +function getObject(idx) { return heap[idx]; } + +function dropObject(idx) { + if (idx < 36) return; + heap[idx] = heap_next; + heap_next = idx; +} + +function takeObject(idx) { + const ret = getObject(idx); + dropObject(idx); + return ret; +} + let WASM_VECTOR_LEN = 0; let cachedTextEncoder = new TextEncoder('utf-8'); @@ -101,6 +101,10 @@ function passStringToWasm0(arg, malloc, realloc) { return ptr; } +function isLikeNone(x) { + return x === undefined || x === null; +} + let cachegetInt32Memory0 = null; function getInt32Memory0() { if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) { @@ -109,10 +113,6 @@ function getInt32Memory0() { return cachegetInt32Memory0; } -function isLikeNone(x) { - return x === undefined || x === null; -} - let cachegetFloat64Memory0 = null; function getFloat64Memory0() { if (cachegetFloat64Memory0 === null || cachegetFloat64Memory0.buffer !== wasm.memory.buffer) { @@ -220,7 +220,7 @@ function addBorrowedObject(obj) { } function __wbg_adapter_30(arg0, arg1, arg2) { try { - wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h5b943b18d2a1ef55(arg0, arg1, addBorrowedObject(arg2)); + wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hce11f961552fa4de(arg0, arg1, addBorrowedObject(arg2)); } finally { heap[stack_pointer++] = undefined; } @@ -248,11 +248,11 @@ function makeClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_33(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1f3d1795f4b3ca23(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h46eb76f8f067dd38(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_36(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hc2108db4a8fc5f49(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h0e88b99267006220(arg0, arg1, addHeapObject(arg2)); } /** @@ -324,6 +324,10 @@ async function init(input) { } const imports = {}; imports.wbg = {}; + imports.wbg.__wbindgen_string_new = function(arg0, arg1) { + var ret = getStringFromWasm0(arg0, arg1); + return addHeapObject(ret); + }; imports.wbg.__wbindgen_object_drop_ref = function(arg0) { takeObject(arg0); }; @@ -331,9 +335,13 @@ async function init(input) { var ret = getObject(arg0); return addHeapObject(ret); }; - imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - var ret = getStringFromWasm0(arg0, arg1); - return addHeapObject(ret); + imports.wbg.__wbindgen_string_get = function(arg0, arg1) { + const obj = getObject(arg1); + var ret = typeof(obj) === 'string' ? obj : undefined; + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) { const obj = getObject(arg1); @@ -343,14 +351,6 @@ async function init(input) { getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; - imports.wbg.__wbindgen_string_get = function(arg0, arg1) { - const obj = getObject(arg1); - var ret = typeof(obj) === 'string' ? obj : undefined; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }; imports.wbg.__wbindgen_cb_drop = function(arg0) { const obj = takeObject(arg0).original; if (obj.cnt-- == 1) { @@ -797,16 +797,16 @@ async function init(input) { var ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1165 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 484, __wbg_adapter_30); + imports.wbg.__wbindgen_closure_wrapper1154 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 474, __wbg_adapter_30); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1355 = function(arg0, arg1, arg2) { - var ret = makeClosure(arg0, arg1, 529, __wbg_adapter_33); + imports.wbg.__wbindgen_closure_wrapper1351 = function(arg0, arg1, arg2) { + var ret = makeClosure(arg0, arg1, 522, __wbg_adapter_33); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1491 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 568, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper1486 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 560, __wbg_adapter_36); return addHeapObject(ret); }; diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm index c8880bbf0..ead38578b 100644 Binary files a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm and b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm differ diff --git a/kanidmd_web_ui/src/main.js b/kanidmd_web_ui/src/main.js deleted file mode 100644 index 380de0839..000000000 --- a/kanidmd_web_ui/src/main.js +++ /dev/null @@ -1,6 +0,0 @@ -import init, { run_app } from '../pkg/kanidmd_web_ui.js'; -async function main() { - await init('/pkg/kanidmd_web_ui_bg.wasm'); - run_app(); -} -main()