@hexclave/js 1.0.67 → 1.0.69

package/dist/esm/lib/hexclave-app/apps/implementations/client-app-impl.js

@@ -356,6 +356,7 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 		this._storedBrowserCookieTokenStore = null;
 		this._mostRecentQueuedCookieRefreshIndex = 0;
 		this._sessionsByTokenStoreAndSessionKey = /* @__PURE__ */ new WeakMap();
+		this._signInAttemptCounter = 0;
 		const resolvedOptions = resolveConstructorOptions(options);
 		if (!_HexclaveClientAppImplIncomplete.LazyStackAdminAppImpl.value) throw new HexclaveAssertionError("Admin app implementation not initialized. Did you import the _HexclaveClientApp from hexclave-app/apps/implementations/index.ts? You can't import it directly from ./apps/implementations/client-app-impl.ts as that causes a circular dependency (see the comment at _LazyHexclaveAdminAppImpl for more details).");
 		this._options = resolvedOptions;
@@ -949,8 +950,12 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 				throw new Error(`Invalid token store ${tokenStoreInit}`);
 		}
 	}
-	_getSessionFromTokenStore(tokenStore) {
-		const tokenObj = tokenStore.get();
+	/**
+	* @param overrideTokenObj The tokens to build the session for, if they haven't been written to the token store yet
+	*                         (so we can warm a sign-in's session before the token store publishes it).
+	*/
+	_getSessionFromTokenStore(tokenStore, overrideTokenObj) {
+		const tokenObj = overrideTokenObj ?? tokenStore.get();
 		const sessionKey = InternalSession.calculateSessionKey(tokenObj);
 		const existing = sessionKey ? this._sessionsByTokenStoreAndSessionKey.get(tokenStore)?.get(sessionKey) : null;
 		if (existing) return existing;
@@ -983,11 +988,13 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 	}
 	async _signInToAccountWithTokens(tokens) {
 		if (!("accessToken" in tokens) || !("refreshToken" in tokens)) throw new HexclaveAssertionError("Invalid tokens object; can't sign in with this", { tokens });
+		const attemptId = ++this._signInAttemptCounter;
 		const tokenStore = this._getOrCreateTokenStore(await this._createCookieHelper());
-		tokenStore.set(tokens);
-		const session = this._getSessionFromTokenStore(tokenStore);
+		const session = this._getSessionFromTokenStore(tokenStore, tokens);
 		session.updateAccessToken(tokens);
-		runAsynchronously(this._currentUserCache.getOrWait([session], "write-only"));
+		await Result.fromPromise(this._currentUserCache.getOrWait([session], "write-only"));
+		if (attemptId !== this._signInAttemptCounter) return;
+		tokenStore.set(tokens);
 	}
 	_getTokenStoreInitForFreshTokens(tokens) {
 		if (tokens.accessToken == null) return;
@@ -1128,6 +1135,12 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			async listUsers() {
 				return Result.orThrow(await app._teamMemberProfilesCache.getOrWait([session, crud.id], "write-only")).map((crud) => app._clientTeamUserFromCrud(crud));
 			},
+			async removeUser(userId) {
+				await app._interface.removeUserFromTeam(crud.id, userId, session);
+				await app._teamMemberProfilesCache.refresh([session, crud.id]);
+				await app._currentUserTeamsCache.refresh([session]);
+				await app._currentUserCache.refresh([session]);
+			},
 			async listInvitations() {
 				return Result.orThrow(await app._teamInvitationsCache.getOrWait([session, crud.id], "write-only")).map((crud) => app._clientSentTeamInvitationFromCrud(session, crud));
 			},
@@ -1328,6 +1341,8 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			isAnonymous: crud.is_anonymous,
 			isRestricted: crud.is_restricted,
 			restrictedReason: crud.restricted_reason,
+			restrictedByAdmin: crud.restricted_by_admin,
+			restrictedByAdminReason: crud.restricted_by_admin_reason,
 			toClientJson() {
 				return crud;
 			}
@@ -1401,6 +1416,8 @@ var _HexclaveClientAppImplIncomplete = class _HexclaveClientAppImplIncomplete {
 			},
 			async leaveTeam(team) {
 				await app._interface.leaveTeam(team.id, session);
+				await app._currentUserTeamsCache.refresh([session]);
+				await app._currentUserCache.refresh([session]);
 			},
 			async listTeamInvitations() {
 				return Result.orThrow(await app._currentUserTeamInvitationsCache.getOrWait([session], "write-only")).map((crud) => app._clientReceivedTeamInvitationFromCrud(session, crud));