Compare commits

...

4 Commits

Author SHA1 Message Date
d0b57ab15f fix(client,sdk): accept empty token from parent frame
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-04-13 13:41:35 +02:00
dc93c585eb fix(sdk,client): add listener to current frame window
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-04-13 12:07:52 +02:00
de330c0042 fix(sdk,client): use origin as postmessage target
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-04-13 11:35:31 +02:00
310dac296f feat(storage,sqlite): begin tx with context
All checks were successful
arcad/edge/pipeline/head This commit looks good
2023-04-13 11:23:34 +02:00
4 changed files with 23 additions and 19 deletions

View File

@ -3960,25 +3960,26 @@ var Edge = (() => {
reject(new Error("Edge auth token request timed out !"));
}, timeout);
const listener = (evt) => {
const message = evt.data;
if (!message || !message.type || !message.data) {
const message2 = evt.data;
if (!message2 || !message2.type || !message2.data) {
return;
}
if (message.type !== EdgeAuthTokenResponse) {
if (message2.type !== EdgeAuthTokenResponse) {
return;
}
window.parent.removeEventListener("message", listener);
window.removeEventListener("message", listener);
clearTimeout(timeoutId);
if (timedOut)
return;
if (!message.data || !message.data.token) {
if (!message2.data) {
reject("Unexpected auth token request response !");
return;
}
resolve(message.data.token);
resolve(message2.data?.token || "");
};
window.parent.addEventListener("message", listener);
window.parent.postMessage({ type: EdgeAuthTokenRequest }, "*");
window.addEventListener("message", listener);
const message = { type: EdgeAuthTokenRequest };
window.parent.postMessage(message, "*");
});
}
_handleEdgeAuthTokenRequest(evt) {
@ -3990,7 +3991,7 @@ var Edge = (() => {
return;
}
const token = this._getAuthCookieToken();
evt.source.postMessage({ type: EdgeAuthTokenResponse, data: { token } });
evt.source.postMessage({ type: EdgeAuthTokenResponse, data: { token } }, evt.origin);
}
_onConnectionMessage(evt) {
const rawMessage = JSON.parse(evt.data);

File diff suppressed because one or more lines are too long

View File

@ -143,21 +143,23 @@ export class Client extends EventTarget {
return;
}
window.parent.removeEventListener('message', listener);
window.removeEventListener('message', listener);
clearTimeout(timeoutId);
if (timedOut) return;
if (!message.data || !message.data.token) {
if (!message.data) {
reject("Unexpected auth token request response !");
return;
}
resolve(message.data.token);
resolve(message.data?.token || "");
}
window.parent.addEventListener('message', listener);
window.parent.postMessage({ type: EdgeAuthTokenRequest }, '*');
window.addEventListener('message', listener);
const message = { type: EdgeAuthTokenRequest };
window.parent.postMessage(message, '*');
})
}
@ -172,7 +174,8 @@ export class Client extends EventTarget {
}
const token = this._getAuthCookieToken();
evt.source.postMessage({ type: EdgeAuthTokenResponse, data: { token }});
// @ts-ignore
evt.source.postMessage({ type: EdgeAuthTokenResponse, data: { token }}, evt.origin);
}
_onConnectionMessage(evt) {

View File

@ -25,7 +25,7 @@ func Open(path string) (*sql.DB, error) {
func withTx(ctx context.Context, db *sql.DB, fn func(tx *sql.Tx) error) error {
var tx *sql.Tx
tx, err := db.Begin()
tx, err := db.BeginTx(ctx, nil)
if err != nil {
return errors.WithStack(err)
}