Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: log out user if not authorized #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kptdobe wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat: log out user if not authorized #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6eef53e
feat: log out user if not authorized
kptdobe Sep 15, 2025
6194a85
Merge branch 'main' into kickout
kptdobe Sep 15, 2025
25a9479
chore: add async delay to give IMS time
kptdobe Sep 16, 2025
9a7f4ca
fix: properly init permissions
kptdobe Sep 16, 2025
5e76a44
chore: try with a page reload
kptdobe Sep 17, 2025
b13fd4b
chore: restore necessary
kptdobe Sep 17, 2025
fcc4964
Merge branch 'main' into kickout
kptdobe Sep 23, 2025
97ee222
fix: on signout on socket error
kptdobe Sep 23, 2025
a26179a
chore: revert
kptdobe Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blocks/edit/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function setUI(el, utils) {
}

const { daFetch } = await utils;
const { permissions } = await daFetch(details.sourceUrl, { method: 'HEAD' });
const { permissions = [] } = await daFetch(details.sourceUrl, { method: 'HEAD' });
daTitle.permissions = permissions;
daContent.permissions = permissions;

Expand Down
5 changes: 5 additions & 0 deletions blocks/edit/prose/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import linkConverter from './plugins/linkConverter.js';
import sectionPasteHandler from './plugins/sectionPasteHandler.js';
import base64Uploader from './plugins/base64uploader.js';
import { COLLAB_ORIGIN, DA_ORIGIN } from '../../shared/constants.js';
import { logOut } from '../../shared/utils.js';
import toggleLibrary from '../da-library/da-library.js';
import { getLocClass } from './loc-utils.js';
import { getSchema } from './schema.js';
Expand Down Expand Up @@ -219,6 +220,10 @@ export default function initProse({ path, permissions }) {
const canWrite = permissions.some((permission) => permission === 'write');

const wsProvider = new WebsocketProvider(server, roomName, ydoc, opts);
wsProvider.on('connection-error', async () => {
await logOut();
});

addSyncedListener(wsProvider, canWrite);

createAwarenessStatusWidget(wsProvider, window);
Expand Down
13 changes: 13 additions & 0 deletions blocks/shared/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ export async function initIms() {
}
}

export async function logOut() {
imsDetails = null;
try {
const { handleSignOut } = await import(`${getNx()}/utils/ims.js`);
handleSignOut();
} catch {
// do nothing
}
window.location.reload();
}

export const daFetch = async (url, opts = {}) => {
opts.headers = opts.headers || {};
let accessToken;
Expand Down Expand Up @@ -50,6 +61,8 @@ export const daFetch = async (url, opts = {}) => {
const { loadIms, handleSignIn } = await import(`${getNx()}/utils/ims.js`);
await loadIms();
handleSignIn();
// wait 1 second to let ims do its things
await new Promise((resolve) => { setTimeout(resolve, 1000); });
Copy link
Contributor

@chrischrischris chrischrischris Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to verify - handleSignIn will force a page redirect to ims, so this await will be cut short on page navigation?

}
}

Expand Down
Loading