[native] rename siwe auth loading status selector
ClosedPublic
Actions

Authored by varun on Feb 5 2024, 9:53 PM.

Details

Reviewers

ashoat
inka
tomek

Commits

rCOMM8dfe7cc3e11e: [native] rename siwe auth loading status selector

Summary

prefixing with legacy to distinguish with new loading status selector

Depends on D10881

Test Plan

ran flow

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

varun created this revision.Feb 5 2024, 9:53 PM

varun added a child revision: D10959: [native] rename siweServerCall.

for some reason the build status never updated even though Shellcheck passed

Harbormaster completed remote builds in B26526: Diff 36663.Feb 6 2024, 3:05 PM

ashoat accepted this revision.Feb 7 2024, 10:09 AM

This revision is now accepted and ready to land.Feb 7 2024, 10:09 AM

Closed by commit rCOMM8dfe7cc3e11e: [native] rename siwe auth loading status selector (authored by varun). · Explain WhyFeb 7 2024, 9:58 PM

This revision was automatically updated to reflect the committed changes.

varun added a commit: rCOMM8dfe7cc3e11e: [native] rename siwe auth loading status selector.

Revision Contents
Changeset List

Path

Size

native/

account/

siwe-panel.react.js

8 lines

Diff 36663

View Options

native/account/siwe-panel.react.js

	// @flow			// @flow

	import invariant from 'invariant';			import invariant from 'invariant';
	import * as React from 'react';			import * as React from 'react';

	import { logOutActionTypes, useLogOut } from '../actions/user-actions.js';			import { logOutActionTypes, useLogOut } from '../actions/user-actions.js';
	import { connectionSelector } from '../selectors/keyserver-selectors.js';			import {
				connectionSelector,
				cookieSelector,
				} from '../selectors/keyserver-selectors.js';
	import { IdentityClientContext } from '../shared/identity-client-context.js';			import { IdentityClientContext } from '../shared/identity-client-context.js';
				import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
	import type { BaseSocketProps } from '../socket/socket.react.js';			import type { BaseSocketProps } from '../socket/socket.react.js';
	import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';			import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
	import { useSelector } from '../utils/redux-utils.js';			import { useSelector } from '../utils/redux-utils.js';
	import { usingCommServicesAccessToken } from '../utils/services-utils.js';			import { usingCommServicesAccessToken } from '../utils/services-utils.js';
	import { ashoatKeyserverID } from '../utils/validation-utils.js';			import { ashoatKeyserverID } from '../utils/validation-utils.js';

	type Props = {			type Props = {
	...BaseSocketProps,			...BaseSocketProps,
	+keyserverID: string,			+keyserverID: string,
	+socketComponent: React.ComponentType<BaseSocketProps>,			+socketComponent: React.ComponentType<BaseSocketProps>,
	};			};
	function KeyserverConnectionHandler(props: Props) {			function KeyserverConnectionHandler(props: Props) {
	const { socketComponent: Socket, keyserverID, ...rest } = props;			const { socketComponent: Socket, keyserverID, ...rest } = props;

	const dispatchActionPromise = useDispatchActionPromise();			const dispatchActionPromise = useDispatchActionPromise();
	const callLogOut = useLogOut();			const callLogOut = useLogOut();

	const hasConnectionIssue = useSelector(			const hasConnectionIssue = useSelector(
	state => !!connectionSelector(keyserverID)(state)?.connectionIssue,			state => !!connectionSelector(keyserverID)(state)?.connectionIssue,
	);			);
				const cookie = useSelector(cookieSelector(keyserverID));

	React.useEffect(() => {			React.useEffect(() => {
	if (hasConnectionIssue) {			if (hasConnectionIssue) {
	void dispatchActionPromise(logOutActionTypes, callLogOut());			void dispatchActionPromise(logOutActionTypes, callLogOut());
	}			}
	}, [callLogOut, hasConnectionIssue, dispatchActionPromise]);			}, [callLogOut, hasConnectionIssue, dispatchActionPromise]);

	const identityClient = React.useContext(			const identityClient = React.useContext(
	IdentityClientContext,			IdentityClientContext,
	)?.identityClient;			)?.identityClient;
	invariant(identityClient, 'Identity client should be set');			invariant(identityClient, 'Identity client should be set');

				const olmSessionCreator = React.useContext(OlmSessionCreatorContext);
				invariant(olmSessionCreator, 'Olm session creator should be set');

	React.useEffect(() => {			React.useEffect(() => {
	if (!usingCommServicesAccessToken) {			if (!usingCommServicesAccessToken) {
	return;			return;
	}			}

	void (async () => {			void (async () => {
	try {			try {
				const keyserverKeys =
	await identityClient.getKeyserverKeys(keyserverID);			await identityClient.getKeyserverKeys(keyserverID);

				await olmSessionCreator.notificationsSessionCreator(
				cookie,
				keyserverKeys.identityKeysBlob.notificationIdentityPublicKeys,
				keyserverKeys.notifInitializationInfo,
				keyserverID,
				);
	} catch (e) {			} catch (e) {
	console.log(			console.log(
	`Error getting keys for keyserver with id ${keyserverID}`,			`Error getting keys for keyserver with id ${keyserverID}`,
	e,			e,
	);			);
	}			}
	})();			})();
	}, [keyserverID, identityClient]);			}, [keyserverID, identityClient, olmSessionCreator, cookie]);

	if (keyserverID !== ashoatKeyserverID) {			if (keyserverID !== ashoatKeyserverID) {
	return null;			return null;
	}			}
	return <Socket {...rest} />;			return <Socket {...rest} />;
	}			}

	const Handler: React.ComponentType<Props> = React.memo<Props>(			const Handler: React.ComponentType<Props> = React.memo<Props>(
	KeyserverConnectionHandler,			KeyserverConnectionHandler,
	);			);

	export default Handler;			export default Handler;

[native] rename siwe auth loading status selectorClosedPublicActions