Rewrite admin. (#1713)

* Rewrite admin.

* Clean up password forms.

* Fix naming issues.

* CSS Naming.

pages/api/users/[id]/index.ts

@@ -26,7 +26,7 @@ export default async (
   const { id } = req.query;
 
   if (req.method === 'GET') {
-    if (await canViewUser(userId, id)) {
+    if (!isAdmin && !(await canViewUser(userId, id))) {
       return unauthorized(res);
     }
 
@@ -36,7 +36,7 @@ export default async (
   }
 
   if (req.method === 'POST') {
-    if (await canUpdateUser(userId, id)) {
+    if (!isAdmin && !(await canUpdateUser(userId, id))) {
       return unauthorized(res);
     }
 
@@ -46,7 +46,8 @@ export default async (
 
     const data: any = {};
 
-    if (password) {
+    // Only admin can change these fields
+    if (password && isAdmin) {
       data.password = hashPassword(password);
     }
 
@@ -70,7 +71,7 @@ export default async (
   }
 
   if (req.method === 'DELETE') {
-    if (isAdmin) {
+    if (!isAdmin) {
       return unauthorized(res);
     }
 

pages/api/users/[id]/password.ts

@@ -30,15 +30,15 @@ export default async (
   const { current_password, new_password } = req.body;
   const { id } = req.query;
   const {
-    user: { id: userId },
+    user: { id: userId, isAdmin },
   } = req.auth;
 
   if (req.method === 'POST') {
-    if (canUpdateUser(userId, id)) {
+    if (!isAdmin && !(await canUpdateUser(userId, id))) {
       return unauthorized(res);
     }
 
-    const user = await getUser({ id });
+    const user = await getUser({ id }, { includePassword: true });
 
     if (!checkPassword(current_password, user.password)) {
       return badRequest(res, 'Current password is incorrect');

pages/api/users/index.ts

@@ -23,7 +23,7 @@ export default async (
   } = req.auth;
 
   if (req.method === 'GET') {
-    if (isAdmin) {
+    if (!isAdmin) {
       return unauthorized(res);
     }
 
@@ -33,7 +33,7 @@ export default async (
   }
 
   if (req.method === 'POST') {
-    if (isAdmin) {
+    if (!isAdmin) {
       return unauthorized(res);
     }
 

pages/profile/index.js

@@ -0,0 +1,18 @@
+import Settings from 'components/pages/Settings';
+import ProfileSettings from 'components/pages/ProfileSettings';
+import useRequireLogin from 'hooks/useRequireLogin';
+import React from 'react';
+
+export default function TeamsPage() {
+  const { loading } = useRequireLogin();
+
+  if (loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <ProfileSettings />
+    </Settings>
+  );
+}

pages/settings/profile.js

@@ -1,3 +0,0 @@
-import Index from './index';
-
-export default Index;

pages/settings/users.js

@@ -1,3 +0,0 @@
-import Index from './index';
-
-export default Index;

pages/teams/[...id].js

@@ -0,0 +1,21 @@
+import Settings from 'components/pages/Settings';
+import TeamDetails from 'components/pages/TeamDetails';
+import useRequireLogin from 'hooks/useRequireLogin';
+import { useRouter } from 'next/router';
+import React from 'react';
+
+export default function TeamDetailPage() {
+  const { loading } = useRequireLogin();
+  const router = useRouter();
+  const { id } = router.query;
+
+  if (loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <TeamDetails teamId={id} />
+    </Settings>
+  );
+}

pages/teams/index.js

@@ -0,0 +1,18 @@
+import Settings from 'components/pages/Settings';
+import TeamsList from 'components/pages/TeamsList';
+import useRequireLogin from 'hooks/useRequireLogin';
+import React from 'react';
+
+export default function TeamsPage() {
+  const { loading } = useRequireLogin();
+
+  if (loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <TeamsList />
+    </Settings>
+  );
+}

pages/users/[...id].js

@@ -0,0 +1,21 @@
+import Settings from 'components/pages/Settings';
+import UserSettings from 'components/pages/UserSettings';
+import useRequireLogin from 'hooks/useRequireLogin';
+import { useRouter } from 'next/router';
+import React from 'react';
+
+export default function TeamDetailPage() {
+  const { loading } = useRequireLogin();
+  const router = useRouter();
+  const { id } = router.query;
+
+  if (loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <UserSettings userId={id} />
+    </Settings>
+  );
+}

pages/users/index.js

@@ -1,10 +1,10 @@
-import React from 'react';
-import Layout from 'components/layout/Layout';
 import Settings from 'components/pages/Settings';
-import useRequireLogin from 'hooks/useRequireLogin';
 import useConfig from 'hooks/useConfig';
+import useRequireLogin from 'hooks/useRequireLogin';
+import React from 'react';
+import UsersList from 'components/pages/UsersList';
 
-export default function SettingsPage() {
+export default function UsersPage() {
   const { loading } = useRequireLogin();
   const { adminDisabled } = useConfig();
 
@@ -13,8 +13,8 @@ export default function SettingsPage() {
   }
 
   return (
-    <Layout>
-      <Settings />
-    </Layout>
+    <Settings>
+      <UsersList />
+    </Settings>
   );
 }

pages/websites/[id]/index.js

@@ -13,11 +13,9 @@ export default function DetailsPage() {
     return null;
   }
 
-  const [websiteId] = id;
-
   return (
     <Layout>
-      <WebsiteDetails websiteId={websiteId} />
+      <WebsiteDetails websiteId={id} />
     </Layout>
   );
 }

pages/websites/[id]/settings.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { useRouter } from 'next/router';
+import WebsiteSettings from 'components/pages/WebsiteSettings';
+import useRequireLogin from 'hooks/useRequireLogin';
+import Settings from 'components/pages/Settings';
+
+export default function WebsiteSettingsPage() {
+  const { loading } = useRequireLogin();
+  const router = useRouter();
+  const { id } = router.query;
+
+  if (!id || loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <WebsiteSettings websiteId={id} />
+    </Settings>
+  );
+}

pages/websites/index.js

@@ -0,0 +1,20 @@
+import Settings from 'components/pages/Settings';
+import useConfig from 'hooks/useConfig';
+import useRequireLogin from 'hooks/useRequireLogin';
+import React from 'react';
+import WebsitesList from 'components/pages/WebsitesList';
+
+export default function WebsitesPage() {
+  const { loading } = useRequireLogin();
+  const { adminDisabled } = useConfig();
+
+  if (adminDisabled || loading) {
+    return null;
+  }
+
+  return (
+    <Settings>
+      <WebsitesList />
+    </Settings>
+  );
+}