directus-template-cli 0.3.0-beta.6 → 0.3.0-beta.7

package/dist/lib/extract/extract-permissions.d.ts

@@ -1,2 +1 @@
-export declare function extractPublicPermissions(dir: string): Promise<void>;
 export declare function extractPermissions(dir: string): Promise<void>;

package/dist/lib/extract/extract-permissions.js

@@ -1,35 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractPermissions = exports.extractPublicPermissions = void 0;
+exports.extractPermissions = void 0;
 const tslib_1 = require("tslib");
 const api_1 = require("../api");
 const write_to_file_1 = tslib_1.__importDefault(require("../utils/write-to-file"));
-async function extractPublicPermissions(dir) {
-    try {
-        const { data } = await api_1.api.get("permissions", {
-            params: {
-                limit: "-1",
-                "filter[role][_null]": true,
-            },
-        });
-        // Delete the id field from the permissions so we don't have to reset the autoincrement on the db
-        data.data.forEach((permission) => {
-            delete permission.id;
-        });
-        // Write the public permissions to the specified directory
-        await (0, write_to_file_1.default)("public-permissions", data.data, dir);
-    }
-    catch (error) {
-        console.log("Error fetching public permissions:", error);
-    }
-}
-exports.extractPublicPermissions = extractPublicPermissions;
 async function extractPermissions(dir) {
     try {
         const { data } = await api_1.api.get("permissions", {
             params: {
                 limit: "-1",
-                "filter[role][_null]": true,
             },
         });
         // Delete the id field from the permissions so we don't have to reset the autoincrement on the db

package/dist/lib/extract/index.js

@@ -42,13 +42,10 @@ async function extract(dir, cli) {
     await (0, extract_files_1.default)(destination);
     await (0, extract_presets_1.default)(destination);
     await (0, extract_permissions_1.extractPermissions)(destination);
-    await (0, extract_permissions_1.extractPermissions)(destination);
     // Iterate through the endpoints
     for (const endpoint of endpoints) {
         await (0, extract_from_endpoint_1.default)(endpoint, destination);
     }
-    // Extract public permissions
-    await (0, extract_permissions_1.extractPublicPermissions)(destination);
     // Extract content
     await (0, extract_content_1.extractContent)(destination);
     // Extract assets

package/dist/lib/load/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const api_1 = require("../api");
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 const load_to_destination_1 = tslib_1.__importDefault(require("../utils/load-to-destination"));
 const load_schema_1 = tslib_1.__importDefault(require("./load-schema"));
@@ -14,18 +15,23 @@ const load_operations_1 = tslib_1.__importDefault(require("./load-operations"));
 const load_data_1 = tslib_1.__importDefault(require("./load-data"));
 const load_presets_1 = tslib_1.__importDefault(require("./load-presets"));
 const load_settings_1 = tslib_1.__importDefault(require("./load-settings"));
-const load_public_permissions_1 = require("./load-public-permissions");
+const load_permissions_1 = require("./load-permissions");
 async function apply(dir, cli) {
     // Get the source directory for the actual files
     const source = dir + "/src";
     // Load the template files into the destination
     await (0, load_schema_1.default)(source + "/schema");
     cli.log("Loaded Schema");
-    await (0, load_roles_1.default)((0, read_file_1.default)("roles", source));
+    // Role Loading Logic
+    const roles = (0, read_file_1.default)("roles", source);
+    const legacyAdminRoleId = roles.find((role) => role.name === "Administrator").id;
+    const currentUser = await api_1.api.get("users/me");
+    const newAdminRoleId = currentUser.data.data.role;
+    await (0, load_roles_1.default)(roles);
     cli.log("Loaded Roles");
     await (0, load_files_1.default)((0, read_file_1.default)("files", source), source); // Comes after folders
     cli.log("Loaded Files");
-    await (0, load_users_1.default)((0, read_file_1.default)("users", source)); // Comes after roles, files
+    await (0, load_users_1.default)((0, read_file_1.default)("users", source), legacyAdminRoleId, newAdminRoleId); // Comes after roles, files
     cli.log("Loaded Users");
     await (0, load_folders_1.default)(source);
     cli.log("Loaded Folders");
@@ -44,7 +50,7 @@ async function apply(dir, cli) {
     cli.log("Loaded Presets");
     await (0, load_settings_1.default)((0, read_file_1.default)("settings", source));
     cli.log("Loaded Settings");
-    await (0, load_public_permissions_1.loadPermissions)((0, read_file_1.default)("permissions", source));
+    await (0, load_permissions_1.loadPermissions)((0, read_file_1.default)("permissions", source), legacyAdminRoleId, newAdminRoleId);
     cli.log("Loaded Permissions");
     return {};
 }

package/dist/lib/load/load-permissions.d.ts

@@ -0,0 +1 @@
+export declare function loadPermissions(permissions: any, legacyAdminRoleId: string | number, newAdminRoleId: string | number): Promise<void>;

package/dist/lib/load/{load-public-permissions.js → load-permissions.js}

@@ -14,8 +14,12 @@ async function removeallPublicPermissions() {
         data: ids,
     });
 }
-async function loadPermissions(permissions) {
+const clearAdminPermissions = (permissions, legacyAdminRoleId) => {
+    return permissions.filter((permission) => permission.role !== legacyAdminRoleId);
+};
+async function loadPermissions(permissions, legacyAdminRoleId, newAdminRoleId) {
     await removeallPublicPermissions();
+    permissions = clearAdminPermissions(permissions, legacyAdminRoleId);
     await (0, load_to_destination_1.default)("permissions", permissions);
 }
 exports.loadPermissions = loadPermissions;

package/dist/lib/load/load-users.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (users: any[]) => Promise<void>;
+declare const _default: (users: any[], legacyAdminRoleId: string | number, newAdminRoleId: string | number) => Promise<void>;
 export default _default;

package/dist/lib/load/load-users.js

@@ -1,31 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const api_1 = require("../api");
-const generate_password_1 = tslib_1.__importDefault(require("generate-password"));
-exports.default = async (users) => {
-    const cleanedUpUsers = users.map(user => {
-        // TODO: Find user role by id in the saved roles.json file. If it's the Directus boostrapped admin role, replace it with the Administrator role id from the new Directus instance.
-        delete user.role;
-        //
+exports.default = async (users, legacyAdminRoleId, newAdminRoleId) => {
+    const cleanedUpUsers = users.map((user) => {
+        // If the user is an admin, we need to change their role to the new admin role
+        const isAdmin = user.role === legacyAdminRoleId;
+        user.role = isAdmin ? newAdminRoleId : user.role;
+        // Delete the unneeded fields
         delete user.last_page;
         delete user.token;
-        // user.password = getNewPassword()
         return user;
     });
     for (const user of cleanedUpUsers) {
         try {
-            await api_1.api.post('users', user);
+            await api_1.api.post("users", user);
             // console.log('Uploaded User' + user.email)
         }
         catch (error) {
-            console.log('Error uploading user.', error.response.data.errors);
+            console.log("Error uploading user.", error.response.data.errors);
         }
     }
 };
-const getNewPassword = () => {
-    return generate_password_1.default.generate({
-        length: 12,
-        numbers: true,
-    });
-};

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0-beta.6",
+  "version": "0.3.0-beta.7",
   "commands": {
     "apply": {
       "id": "apply",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.3.0-beta.6",
+  "version": "0.3.0-beta.7",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "bin": {