Allow removing subdomain

This commit is contained in:
Tom Moor 2018-11-03 23:24:44 -07:00
parent 1be8e13828
commit 8de074b275
3 changed files with 5 additions and 5 deletions

View File

@ -24,10 +24,7 @@ const Auth = observer(({ auth, children }: Props) => {
return <LoadingIndicator />;
}
if (
team.subdomain &&
!window.location.hostname.startsWith(team.subdomain)
) {
if (window.location.origin !== team.url) {
window.location.href = `${team.url}${window.location.pathname}`;
return <LoadingIndicator />;
}

View File

@ -39,6 +39,8 @@ class ApiClient {
const headers = new Headers({
Accept: 'application/json',
'Content-Type': 'application/json',
'cache-control': 'no-cache',
pragma: 'no-cache',
});
if (stores.auth.authenticated) {
invariant(stores.auth.token, 'JWT token not set properly');
@ -52,6 +54,7 @@ class ApiClient {
headers,
redirect: 'follow',
credentials: 'omit',
cache: 'no-cache',
});
if (response.status >= 200 && response.status < 300) {

View File

@ -19,8 +19,8 @@ router.post('team.update', auth(), async ctx => {
const team = await Team.findById(user.teamId);
authorize(user, 'update', team);
team.subdomain = subdomain === '' ? null : subdomain;
if (name) team.name = name;
if (subdomain !== undefined) team.subdomain = subdomain;
if (sharing !== undefined) team.sharing = sharing;
if (avatarUrl && avatarUrl.startsWith(`${endpoint}/uploads/${user.id}`)) {
team.avatarUrl = avatarUrl;