* Big upgrades * WIP: Stash * Stash, 30 flow errors left * Downgrade mobx * WIP * When I understand the difference between class and instance methods * 💚 * Fixes: File import Model saving edge cases pinning and starring docs Collection editing Upgrade mobx devtools * Notification settings saving works * Disabled settings * Document mailer * Working notifications * Colletion created notification Ensure not notified for own actions * Tidy up * Document updated event only for document creation Add indexes Notification setting on user creation * Commentary * Fixed: Notification setting on signup * Fix document move / duplicate stale data Add BaseModel.refresh method * Fixes: Title in sidebar not updated after editing document * 💚 * Improve / restore error handling Better handle offline errors * 👕
42 lines
1.1 KiB
JavaScript
42 lines
1.1 KiB
JavaScript
// @flow
|
|
import * as React from 'react';
|
|
import { observer, inject } from 'mobx-react';
|
|
import AuthStore from 'stores/AuthStore';
|
|
import LoadingIndicator from 'components/LoadingIndicator';
|
|
import { isCustomSubdomain } from 'shared/utils/domains';
|
|
|
|
type Props = {
|
|
auth: AuthStore,
|
|
children?: React.Node,
|
|
};
|
|
|
|
const Authenticated = observer(({ auth, children }: Props) => {
|
|
if (auth.authenticated) {
|
|
const { user, team } = auth;
|
|
const { hostname } = window.location;
|
|
|
|
if (!team || !user) {
|
|
return <LoadingIndicator />;
|
|
}
|
|
|
|
// If we're authenticated but viewing a subdomain that doesn't match the
|
|
// currently authenticated team then kick the user to the teams subdomain.
|
|
if (
|
|
process.env.SUBDOMAINS_ENABLED &&
|
|
team.subdomain &&
|
|
isCustomSubdomain(hostname) &&
|
|
!hostname.startsWith(`${team.subdomain}.`)
|
|
) {
|
|
window.location.href = `${team.url}${window.location.pathname}`;
|
|
return <LoadingIndicator />;
|
|
}
|
|
|
|
return children;
|
|
}
|
|
|
|
auth.logout();
|
|
return null;
|
|
});
|
|
|
|
export default inject('auth')(Authenticated);
|