Feat(tenant): Add instance root also for admin

Inist-CNRS · Sep 21, 2023 · c01a67b · c01a67b
1 parent 9fe6da0
commit c01a67b
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 21 deletions.
diff --git a/config.json b/config.json
@@ -5,6 +5,10 @@
         "username": "user",
         "password": "secret"
     },
+    "rootAuth": {
+        "username": "root",
+        "password": "secret"
+    },
     "enrichmentBatchSize": 10,
     "routinesCache": false,
     "routines": [
@@ -145,6 +149,15 @@
                 "position": "advanced",
                 "role": "admin"
             },
+            {
+                "label": {
+                    "en": "Instances settings",
+                    "fr": "Gestion instances"
+                },
+                "icon": "faCogs",
+                "position": "advanced",
+                "role": "root"
+            },
             {
                 "label": {
                     "en": "Sign in",

diff --git a/src/api/controller/api/login.js b/src/api/controller/api/login.js
@@ -21,6 +21,7 @@ export const postLogin = date => ctx => {
 
     const { username, password } = ctx.request.body;
     const userAuth = get(ctx, 'ezMasterConfig.userAuth', {});
+    const rootAuth = get(ctx, 'ezMasterConfig.rootAuth', {});
 
     let role;
     if (
@@ -38,6 +39,14 @@ export const postLogin = date => ctx => {
         role = 'user';
     }
 
+    if (
+        rootAuth &&
+        username === rootAuth.username &&
+        password === rootAuth.password
+    ) {
+        role = 'root';
+    }
+
     if (!role) {
         ctx.status = 401;
         return;

diff --git a/src/api/controller/front.js b/src/api/controller/front.js
@@ -54,18 +54,6 @@ const indexHtml = fs
     .toString()
     .replace(REGEX_JS_HOST, jsHost);
 
-const adminIndexHtml = fs
-    .readFileSync(path.resolve(__dirname, '../../app/admin.html'))
-    .toString()
-    .replace(
-        '</body>',
-        ` <script>window.__DBNAME__ = ${JSON.stringify(
-            mongo.dbName,
-        )}</script><script src="{|__JS_HOST__|}/admin/index.js"></script>
-        </body>`,
-    )
-    .replace(REGEX_JS_HOST, jsHost);
-
 const getDefaultInitialState = (token, cookie, locale) => ({
     fields: {
         loading: false,
@@ -265,6 +253,22 @@ const handleRender = async (ctx, next) => {
     ctx.body = renderFullPage(html, css, preloadedState, helmet, ctx.tenant);
 };
 
+const renderAdminIndexHtml = ctx => {
+    ctx.body = fs
+        .readFileSync(path.resolve(__dirname, '../../app/admin.html'))
+        .toString()
+        .replace(
+            '</body>',
+            ` <script>window.__DBNAME__ = ${JSON.stringify(
+                mongo.dbName,
+            )}</script><script>window.__TENANT__ = ${JSON.stringify(
+                ctx.tenant,
+            )}</script><script src="{|__JS_HOST__|}/admin/index.js"></script>
+        </body>`,
+        )
+        .replace(REGEX_JS_HOST, jsHost);
+};
+
 const app = new Koa();
 
 if (config.userAuth) {
@@ -298,9 +302,15 @@ if (config.userAuth) {
 
 app.use(handleRender);
 
+app.use(
+    route.get('/instance/:slug/admin', async ctx => {
+        renderAdminIndexHtml(ctx);
+    }),
+);
+
 app.use(
     route.get('/admin', async ctx => {
-        ctx.body = adminIndexHtml;
+        ctx.body = `<div>Super Root Admin</div>`;
     }),
 );
 

diff --git a/src/app/custom/robots.txt b/src/app/custom/robots.txt
@@ -1,5 +1,6 @@
 User-agent: *
 Disallow: /admin
+Disallow: /instance/*/admin
 Disallow: /login
 Sitemap: /api/export/sitemap
 
diff --git a/src/app/js/admin/Appbar/Menu.js b/src/app/js/admin/Appbar/Menu.js
@@ -135,12 +135,7 @@ const MenuComponent = ({
     };
 
     function setTenant(tenant) {
-        if (tenant === 'default') {
-            sessionStorage.removeItem('lodex-tenant');
-        } else {
-            sessionStorage.setItem('lodex-tenant', tenant);
-        }
-        window.location.reload();
+        window.location.href = `/instance/${tenant}/admin`;
     }
 
     const modelMenuItems = [

diff --git a/src/app/js/admin/index.js b/src/app/js/admin/index.js
@@ -53,7 +53,9 @@ if (process.env.NODE_ENV === 'e2e') {
     sessionStorage.setItem('lodex-dbName', 'lodex_test');
 } else {
     const dbName = window.__DBNAME__;
+    const tenant = window.__TENANT__;
     sessionStorage.setItem('lodex-dbName', dbName);
+    sessionStorage.setItem('lodex-tenant', tenant);
 }
 
 render(

diff --git a/src/app/js/public/menu/MenuItem.js b/src/app/js/public/menu/MenuItem.js
@@ -78,6 +78,11 @@ const getIcon = icon => {
     );
 };
 
+function extractTenantFromUrl(url) {
+    const match = url.match(/\/instance\/([^/]+)/);
+    return match ? match[1] : null;
+}
+
 const MenuItem = ({
     config,
     polyglot,
@@ -193,12 +198,31 @@ const MenuItem = ({
             return (
                 role === 'admin' && (
                     <a
-                        href="/admin"
+                        href={`/instance/${extractTenantFromUrl(
+                            window.location.href,
+                        ) || 'default'}/admin`}
+                        className={classnames(
+                            'nav-item',
+                            styles.menuItem,
+                            styles.link,
+                        )}
+                    >
+                        {icon}
+                        {label}
+                    </a>
+                )
+            );
+        case 'root':
+            return (
+                role === 'root' && (
+                    <a
+                        href={`/admin`}
                         className={classnames(
                             'nav-item',
                             styles.menuItem,
                             styles.link,
                         )}
+                        style={{ maxWidth: 'none' }} // TODO: Quick Fix, check why maxWidth is set to 90px
                     >
                         {icon}
                         {label}

diff --git a/src/app/js/user/index.js b/src/app/js/user/index.js
@@ -50,7 +50,7 @@ export const loginSuccess = createAction(LOGIN_SUCCESS);
 export const logout = createAction(LOGOUT);
 export const signOut = createAction(SIGNOUT);
 
-export const isAdmin = state => state.role === 'admin';
+export const isAdmin = state => state.role === 'admin' || state.role === 'root';
 export const getRole = state => state.role || 'not logged';
 export const getToken = state => state.token;
 export const getCookie = state => state.cookie;