@wiztivi/dana-cli 0.0.9 → 0.0.10

package/dist/commands/authentication/AuthenticationManager.d.ts

@@ -13,6 +13,7 @@ export interface AuthCredentials {
 export declare class AuthenticationManager {
     private static getAPIURL;
     static login(organization: string): Promise<AuthCredentials>;
+    static logout(organization: string, creds?: Partial<DanaToken>): Promise<void>;
     static refresh(organization: string, token: string): Promise<AuthCredentials>;
     static isTokenExpired(token: string): boolean;
     static loginNPM(organization: string, credentials: AwsCredentials): Promise<{

package/dist/commands/authentication/AuthenticationManager.js

@@ -15,7 +15,11 @@ export class AuthenticationManager {
         const app = express();
         app.disable("x-powered-by");
         const promise = new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                reject(new Error("Login timed out."));
+            }, 5 * 60 * 1000);
             app.get("/callback", (req, res) => {
+                clearTimeout(timeout);
                 try {
                     if (req.query.error) {
                         res.send("Login failed. Check the CLI for details.");
@@ -42,6 +46,17 @@ export class AuthenticationManager {
             server.close();
         });
     }
+    static async logout(organization, creds) {
+        const url = new URL(`${AuthenticationManager.getAPIURL(organization)}/logout`);
+        if (creds?.id_token) {
+            url.searchParams.append("id_token", creds.id_token);
+        }
+        if (creds?.refresh_token) {
+            url.searchParams.append("refresh_token", creds.refresh_token);
+        }
+        await open(url.toString());
+        CredentialsHelper.delete(organization);
+    }
     static async refresh(organization, token) {
         const data = await fetch(`${AuthenticationManager.getAPIURL(organization)}/login?refresh_token=${token}`);
         if (!data.ok) {

package/dist/commands/authentication/authDefinition.js

@@ -1,7 +1,10 @@
-import { Command } from "commander";
+import { Command, Option } from "commander";
 import translation from "../../common/translation/translation.js";
 import login from "./commands/login.js";
 import { statusAction } from "./commands/status.js";
+import logout from "./commands/logout.js";
+import { getPackagesToken } from "./commands/get-packages-token.js";
+import { authHook } from "./authHook.js";
 const addAuthDefinition = () => {
     const command = new Command("auth").description(translation["command.auth.description"]);
     const loginCmd = new Command("login")
@@ -9,10 +12,22 @@ const addAuthDefinition = () => {
         .option("-o, --org <organization>", translation["command.auth.login.option.org"])
         .action(login);
     command.addCommand(loginCmd);
+    const logoutCmd = new Command("logout")
+        .description(translation["command.auth.logout.description"])
+        .option("-o, --org <organization>", translation["command.auth.login.option.org"])
+        .action(logout);
+    command.addCommand(logoutCmd);
     const statusCmd = new Command("status")
         .description(translation["command.auth.status.description"])
         .action(statusAction);
     command.addCommand(statusCmd);
+    const getPackagesTokenCmd = new Command("get-packages-token")
+        .description(translation["command.auth.get-packages-token.description"])
+        .addOption(new Option("-t, --target <target>", "Packages target").makeOptionMandatory(true).choices(["android"]))
+        .option("-o, --org <organization>", translation["command.auth.login.option.org"])
+        .hook("preAction", authHook)
+        .action(getPackagesToken);
+    command.addCommand(getPackagesTokenCmd);
     return command;
 };
 export default addAuthDefinition;

package/dist/commands/authentication/commands/get-packages-token.d.ts

@@ -0,0 +1,6 @@
+interface GetPackageTokenOptions {
+    target: "android";
+    org?: string;
+}
+declare const getPackagesToken: (options: GetPackageTokenOptions) => Promise<void>;
+export { getPackagesToken };

package/dist/commands/authentication/commands/get-packages-token.js

@@ -0,0 +1,30 @@
+import { CredentialsHelper } from "../helper/CredentialsHelper.js";
+import { createCodeArtifactClient } from "../helper/CodeArtifactHelper.js";
+import { GetAuthorizationTokenCommand } from "@aws-sdk/client-codeartifact";
+import * as prompts from "@clack/prompts";
+import { GET_PACKAGES_TOKEN_ERROR } from "../../../common/const/exitCodeConst.js";
+import { DOMAIN, DOMAIN_OWNER } from "../authentConst.js";
+const getAndroidToken = async (creds) => {
+    const client = createCodeArtifactClient(creds);
+    const command = new GetAuthorizationTokenCommand({
+        domain: DOMAIN,
+        domainOwner: DOMAIN_OWNER,
+    });
+    try {
+        const result = await client.send(command);
+        console.log(result.authorizationToken);
+    }
+    catch (error) {
+        prompts.log.error(error.message);
+        process.exit(GET_PACKAGES_TOKEN_ERROR);
+    }
+};
+const getPackagesToken = async (options) => {
+    const creds = CredentialsHelper.get(options.org);
+    switch (options.target) {
+        case "android":
+            // authHook ensure credentials are valid
+            return getAndroidToken(creds.aws);
+    }
+};
+export { getPackagesToken };

package/dist/commands/authentication/commands/login.js

@@ -1,8 +1,8 @@
 import * as prompts from "@clack/prompts";
 import colors from "picocolors";
-import { LOGIN_ERROR } from "../../../common/const/exitCodeConst.js";
 import { CredentialsHelper } from "../helper/CredentialsHelper.js";
 import { AuthenticationManager } from "../AuthenticationManager.js";
+import { handleError } from "../helper/CommandHelper.js";
 /*
 Login to DANA backend (with aws and cognito) and connect to npm codeartifact
 More info: https://github.com/wiztivi-rd/dana-cli/wiki/Login
@@ -24,9 +24,4 @@ const login = async ({ org }) => {
         handleError(error);
     }
 };
-const handleError = (error) => {
-    const message = error instanceof Error ? error.message : error;
-    prompts.outro(colors.red(`An issue occurred :` + message));
-    process.exit(LOGIN_ERROR);
-};
 export default login;

package/dist/commands/authentication/commands/logout.d.ts

@@ -0,0 +1,5 @@
+interface LogoutOptions {
+    org?: string;
+}
+declare const logout: ({ org }: LogoutOptions) => Promise<void>;
+export default logout;

package/dist/commands/authentication/commands/logout.js

@@ -0,0 +1,20 @@
+import * as prompts from "@clack/prompts";
+import colors from "picocolors";
+import { CredentialsHelper } from "../helper/CredentialsHelper.js";
+import { AuthenticationManager } from "../AuthenticationManager.js";
+import { handleError } from "../helper/CommandHelper.js";
+/*
+Logout from DANA backend
+*/
+const logout = async ({ org }) => {
+    const credentials = CredentialsHelper.get(org);
+    try {
+        prompts.intro(`Logout from ${credentials.org}...`);
+        await AuthenticationManager.logout(credentials.org, credentials.dana);
+        prompts.outro(colors.green("✓") + ` Logout successful. You are now being logged out in your browser.`);
+    }
+    catch (error) {
+        handleError(error);
+    }
+};
+export default logout;

package/dist/commands/authentication/helper/CommandHelper.d.ts

@@ -0,0 +1 @@
+export declare const handleError: (error: unknown) => void;

package/dist/commands/authentication/helper/CommandHelper.js

@@ -0,0 +1,8 @@
+import * as prompts from "@clack/prompts";
+import colors from "picocolors";
+import translation from "../../../common/translation/translation.js";
+import { LOGIN_ERROR } from "../../../common/const/exitCodeConst.js";
+export const handleError = (error) => {
+    prompts.outro(colors.red(error.message ?? translation["error.common.start.message"]));
+    process.exit(LOGIN_ERROR);
+};

package/dist/commands/authentication/helper/CredentialsHelper.d.ts

@@ -18,11 +18,14 @@ export interface OrgCredentials {
 }
 export interface DanaConfig {
     lastUsedOrg: string;
+    version: number;
     credentials: Record<string, OrgCredentials>;
 }
+export declare const CURRENT_DANA_JSON_VERSION = 2;
 export declare class CredentialsHelper {
     static readonly filePath: string;
-    private static getConfig;
+    static getConfig(): DanaConfig | null;
+    private static migrateConfig;
     static store(credentials: {
         aws: AwsCredentials;
         dana: DanaToken;
@@ -33,4 +36,5 @@ export declare class CredentialsHelper {
         dana?: DanaToken;
         org: string;
     };
+    static delete(org: string): void;
 }

package/dist/commands/authentication/helper/CredentialsHelper.js

@@ -2,17 +2,40 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
 import { DEFAULT_ORG } from "../authentConst.js";
+export const CURRENT_DANA_JSON_VERSION = 2;
 export class CredentialsHelper {
     static filePath = path.join(homedir(), ".dana.json");
     static getConfig() {
         if (!existsSync(this.filePath)) {
             return null;
         }
-        return JSON.parse(readFileSync(this.filePath, { encoding: "utf-8" }));
+        let config = JSON.parse(readFileSync(this.filePath, { encoding: "utf-8" }));
+        const configVersion = config.version ?? 1;
+        if (configVersion != CURRENT_DANA_JSON_VERSION) {
+            config = CredentialsHelper.migrateConfig(config, configVersion);
+            writeFileSync(this.filePath, JSON.stringify(config, null, 4));
+        }
+        return config;
+    }
+    static migrateConfig(config, from) {
+        if (from === 1) {
+            const v1 = config;
+            return {
+                lastUsedOrg: v1.org,
+                credentials: {
+                    [v1.org]: {
+                        dana: v1.dana,
+                        aws: v1.aws,
+                    },
+                },
+                version: CURRENT_DANA_JSON_VERSION,
+            };
+        }
+        return config;
     }
     static store(credentials) {
         let config = this.getConfig();
-        config ??= { lastUsedOrg: credentials.org, credentials: {} };
+        config ??= { lastUsedOrg: credentials.org, credentials: {}, version: CURRENT_DANA_JSON_VERSION };
         config.credentials ??= {};
         config.lastUsedOrg = credentials.org;
         config.credentials[credentials.org] = { aws: credentials.aws, dana: credentials.dana };
@@ -32,4 +55,11 @@ export class CredentialsHelper {
         }
         return creds;
     }
+    static delete(org) {
+        const config = this.getConfig();
+        if (config) {
+            delete config.credentials[org];
+            writeFileSync(this.filePath, JSON.stringify(config, null, 4));
+        }
+    }
 }

package/dist/common/const/exitCodeConst.d.ts

@@ -5,3 +5,4 @@ export declare const DEVICE_ERROR = 5;
 export declare const LOGIN_ERROR = 6;
 export declare const COMMAND_ERROR = 7;
 export declare const SETUP_ERROR = 8;
+export declare const GET_PACKAGES_TOKEN_ERROR = 9;

package/dist/common/const/exitCodeConst.js

@@ -5,3 +5,4 @@ export const DEVICE_ERROR = 5;
 export const LOGIN_ERROR = 6;
 export const COMMAND_ERROR = 7;
 export const SETUP_ERROR = 8;
+export const GET_PACKAGES_TOKEN_ERROR = 9;

package/dist/common/helpers/CreateFileHelper.js

@@ -60,7 +60,7 @@ class CreateFileHelper {
                 credentials: credentials?.aws,
                 format: "maven",
             });
-            let gruntOptions = `--appUrl="${registryAccount}" `;
+            let gruntOptions = `--appUrl="${registryAccount}" --organization="${credentials.org}" `;
             const optionsToAdd = ["appId", "appName", "appVersion", "appVersionCode", "wtvAndroidVersion"];
             for (const option of optionsToAdd) {
                 gruntOptions += `--${option}="${config.androidtv?.device[option]}" `;

package/dist/common/helpers/UpdateFileHelper.js

@@ -122,7 +122,7 @@ class UpdateFileHelper {
     static getConfigFileOutput = function (directory) {
         const configFiles = [
             "gitignoreTemplate.hbs",
-            "editorConfigTemplate.hbs",
+            "editorconfigTemplate.hbs",
             "eslintrc.jsonTemplate.hbs",
             "nvmrcTemplate.hbs",
         ];

package/dist/common/translation/en.json

@@ -22,8 +22,10 @@
     "helper.git.status.error": "Git status is not clean or an error occurred. Try to commit your change.",
     "command.auth.description": "Authenticate to Dana framework",
     "command.auth.login.description": "Login to Dana",
-    "command.auth.login.option.org": "Organization to login",
+    "command.auth.logout.description": "Logout from Dana",
+    "command.auth.login.option.org": "Organization to login/logout",
     "command.auth.status.description": "Get login status",
+    "command.auth.get-packages-token.description": "Get token for packages repository",
     "command.scrollView.description": "Add a scrollView of rails",
     "command.scrollView.option.itemView": "Item to be used in the scrollView. Default: pre-made rail",
     "command.scrollView.option.itemMargin": "Margin between items. Default: 550",
@@ -56,7 +58,7 @@
     "command.completion.argument": "Shell. Bash or zsh",
     "command.completion.success": "Completion installed to ",
     "login.info.token_expired": "Your token has expired.",
-    "login.info.please_login": "Please run dana auth login command",
+    "login.info.please_login": "Please run 'dana auth login' command",
     "login.error.not_logged": "You're not logged in.",
     "login.info.logged": "You're currently logged in to Dana"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wiztivi/dana-cli",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "description": "Dana create app CLI",
     "type": "module",
     "exports": "./dist/index.js",
@@ -28,7 +28,7 @@
     "dependencies": {
         "@aws-sdk/client-codeartifact": "^3.859.0",
         "@clack/prompts": "0.10.0",
-        "@wiztivi/dana-templates": "^0.0.9",
+        "@wiztivi/dana-templates": "^0.0.10",
         "child_process": "1.0.x",
         "command-exists": "1.2.9",
         "commander": "11.1.x",