Merge pull request #24 from CodeDead/release/v2.1.0

Release/v2.1.0

Author: CodeDead

.github/workflows/release.yml

@@ -18,9 +18,9 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Node.js setup
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Rust setup
         uses: actions-rs/toolchain@v1

.github/workflows/test.yml

@@ -26,9 +26,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 18
     - name: Install Rust stable
       uses: actions-rs/toolchain@v1
       with:

README.md

@@ -1,6 +1,6 @@
 # Advanced PassGen
 
-![Advanced PassGen](https://i.imgur.com/bVTaGO7.png)
+![Advanced PassGen](https://i.imgur.com/ci8x6rX.png)
 
 ![GitHub](https://img.shields.io/badge/language-JavaScript+Rust-green)
 ![GitHub](https://img.shields.io/github/license/CodeDead/Advanced-PassGen)
@@ -53,7 +53,7 @@ yarn tauri build
 
 ### macOS
 
-#### DMG
+#### dmg
 
 You can create a macOS build by running the `yarn tauri build` command on a macOS host:
 ```shell
@@ -85,6 +85,10 @@ The theme used in this application is [MUI](https://mui.com/).
 
 The application icon was provided by [RemixIcon](https://remixicon.com/).
 
+### Translations
+
+* German: [uDEV2019](https://github.com/uDEV2019)
+
 ## About
 
 This library is maintained by CodeDead. You can find more about us using the following links:

package.json

@@ -1,13 +1,13 @@
 {
   "name": "advanced-passgen",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "private": true,
   "dependencies": {
-    "@emotion/react": "^11.10.4",
-    "@emotion/styled": "^11.10.4",
+    "@emotion/react": "^11.10.5",
+    "@emotion/styled": "^11.10.5",
     "@fontsource/roboto": "^4.5.8",
     "@mui/icons-material": "^5.10.9",
-    "@mui/material": "^5.10.9",
+    "@mui/material": "^5.10.12",
     "@shopify/react-web-worker": "^5.0.6",
     "@tauri-apps/api": "^1.1.0",
     "@testing-library/jest-dom": "^5.16.5",
@@ -16,10 +16,10 @@
     "clsx": "^1.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.4.2",
+    "react-router-dom": "^6.4.3",
     "react-scripts": "^5.0.1",
     "react-virtualized": "^9.22.3",
-    "web-vitals": "^3.0.3"
+    "web-vitals": "^3.0.4"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -50,7 +50,7 @@
   "devDependencies": {
     "@tauri-apps/cli": "^1.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.25.0",
+    "eslint": "^8.26.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.6.1",

src-tauri/Cargo.lock

@@ -1,13 +1,13 @@
 [package]
 name = "advanced-passgen"
-version = "2.0.0"
+version = "2.1.0"
 description = "Advanced PassGen can be used to quickly generate thousands of passwords"
 authors = ["CodeDead <admin@codedead.com>"]
 license = "GPL-3.0-only"
 repository = "https://github.com/CodeDead/Advanced-PassGen"
 default-run = "advanced-passgen"
 edition = "2021"
-rust-version = "1.64.0"
+rust-version = "1.65.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -19,6 +19,8 @@ serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.1.1", features = ["api-all"] }
 open = "3.0.3"
+rand = "0.8.5"
+unicode-segmentation = "1.10.0"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/Cargo.toml

@@ -1,33 +1,81 @@
 #![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
 )]
 
+use rand::Rng;
 use std::fs;
+use unicode_segmentation::UnicodeSegmentation;
 
 fn main() {
-  tauri::Builder::default()
-    .invoke_handler(tauri::generate_handler![open_website, save_string_to_disk])
-    .run(tauri::generate_context!())
-    .expect("error while running tauri application");
+    tauri::Builder::default()
+        .invoke_handler(tauri::generate_handler![
+            open_website,
+            save_string_to_disk,
+            generate_passwords
+        ])
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
 }
 
 #[tauri::command]
 fn open_website(website: &str) -> Result<String, String> {
-  match open::that(website) {
-    Ok(_) => {
-      Ok(String::from("Success"))
+    match open::that(website) {
+        Ok(_) => Ok(String::from("Success")),
+        Err(e) => Err(e.to_string()),
     }
-    Err(e) => {
-      Err(e.to_string())
-    }
-  }
 }
 
 #[tauri::command]
 fn save_string_to_disk(content: &str, path: &str) -> Result<String, String> {
-  match fs::write(path, content) {
-    Ok(_) => Ok(String::from("Success")),
-    Err(e) => Err(e.to_string()),
-  }
+    match fs::write(path, content) {
+        Ok(_) => Ok(String::from("Success")),
+        Err(e) => Err(e.to_string()),
+    }
+}
+
+#[tauri::command]
+async fn generate_passwords(
+    min_length: u64,
+    max_length: u64,
+    character_set: &str,
+    amount: u64,
+    allow_duplicates: bool,
+) -> Result<Vec<String>, String> {
+    let mut password_list: Vec<String> = Vec::new();
+    let mut max_count: f64 = 0.0;
+    let char_count = character_set.graphemes(true).count();
+
+    if !allow_duplicates {
+        let mut current = min_length;
+        while current <= max_length {
+            max_count += (char_count as f64).powf(current as f64);
+            current += 1;
+        }
+    }
+
+    let mut rng = rand::thread_rng();
+    let chars = character_set.chars();
+    for _n in 0..amount {
+        let mut can_continue = false;
+        while !can_continue {
+            let mut password = String::from("");
+            let length = rng.gen_range(min_length..(max_length + 1));
+            for _j in 0..length {
+                let index = rng.gen_range(0..char_count);
+                password.push(chars.clone().nth(index).unwrap());
+            }
+
+            if allow_duplicates || (!allow_duplicates && !password_list.contains(&password)) {
+                password_list.push(password);
+                can_continue = true;
+            }
+
+            if !can_continue && !allow_duplicates && password_list.len() as f64 == max_count {
+                return Ok(password_list);
+            }
+        }
+    }
+
+    Ok(password_list)
 }

src-tauri/src/main.rs

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "advanced-passgen",
-    "version": "2.0.0"
+    "version": "2.1.0"
   },
   "tauri": {
     "allowlist": {
@@ -19,7 +19,7 @@
     },
     "bundle": {
       "active": true,
-      "category": "DeveloperTool",
+      "category": "Utility",
       "copyright": "Copyright © 2022 CodeDead",
       "deb": {
         "depends": []
@@ -33,7 +33,7 @@
         "icons/icon.ico"
       ],
       "identifier": "com.codedead.advancedpassgen",
-      "longDescription": "",
+      "longDescription": "Advanced PassGen is a free and open-source application that can help you generate passwords and export them",
       "macOS": {
         "entitlements": null,
         "exceptionDomain": "",
@@ -42,7 +42,7 @@
         "signingIdentity": null
       },
       "resources": [],
-      "shortDescription": "",
+      "shortDescription": "Generate passwords with ease",
       "targets": "all",
       "windows": {
         "certificateThumbprint": null,
@@ -62,7 +62,7 @@
         "height": 600,
         "resizable": true,
         "title": "Advanced PassGen",
-        "width": 950
+        "width": 1000
       }
     ]
   }

src-tauri/tauri.conf.json

@@ -7,12 +7,18 @@ import Toolbar from '@mui/material/Toolbar';
 import Box from '@mui/material/Box';
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import { type } from '@tauri-apps/api/os';
+import Alert from '@mui/material/Alert';
+import Snackbar from '@mui/material/Snackbar';
+import Button from '@mui/material/Button';
+import Typography from '@mui/material/Typography';
 import { MainContext } from '../../contexts/MainContextProvider';
 import ThemeSelector from '../../utils/ThemeSelector';
 import TopBar from '../TopBar';
 import ClippedDrawer from '../ClippedDrawer';
 import UpdateDialog from '../UpdateDialog';
-import { openWebSite, setError, setUpdate } from '../../reducers/MainReducer/Actions';
+import {
+  openWebSite, setError, setLoading, setUpdate,
+} from '../../reducers/MainReducer/Actions';
 import Updater from '../../utils/Updater';
 import AlertDialog from '../AlertDialog';
 import packageJson from '../../../package.json';
@@ -29,10 +35,10 @@ const NotFound = lazy(() => import('../../routes/NotFound'));
 const App = () => {
   const [state, d1] = useContext(MainContext);
   const {
-    themeIndex, themeType, update, languageIndex, autoUpdate, error,
+    themeIndex, themeType, update, languageIndex, autoUpdate, error, loading,
   } = state;
 
-  const [loading, setLoading] = useState(false);
+  const [snackOpen, setSnackOpen] = useState(false);
   const language = state.languages[languageIndex];
 
   const color = ThemeSelector(themeIndex);
@@ -44,14 +50,6 @@ const App = () => {
     },
   });
 
-  /**
-   * Open a website
-   * @param website The website that needs to be opened
-   */
-  const openWebsite = (website) => {
-    d1(openWebSite(website));
-  };
-
   /**
    * Check for updates
    */
@@ -77,7 +75,7 @@ const App = () => {
         d1(setError(e));
       })
       .finally(() => {
-        setLoading(false);
+        d1(setLoading(false));
       });
   };
 
@@ -88,10 +86,21 @@ const App = () => {
     d1(setError(null));
   };
 
+  /**
+   * Close the snack bar
+   */
+  const closeSnack = () => {
+    setSnackOpen(false);
+  };
+
   useEffect(() => {
     // eslint-disable-next-line no-underscore-dangle
-    if (autoUpdate && window.__TAURI__) {
-      checkForUpdates();
+    if (window.__TAURI__) {
+      if (autoUpdate) {
+        checkForUpdates();
+      }
+    } else {
+      setSnackOpen(true);
     }
   }, []);
 
@@ -131,7 +140,7 @@ const App = () => {
           <UpdateDialog
             downloadUrl={update.updateUrl}
             infoUrl={update.infoUrl}
-            openWebsite={openWebsite}
+            openWebsite={openWebSite}
             newVersion={update.version}
             onClose={() => d1(setUpdate(null))}
             updateAvailable={language.updateAvailable}
@@ -141,6 +150,20 @@ const App = () => {
             cancel={language.cancel}
           />
         ) : null}
+        <Snackbar open={snackOpen} onClose={closeSnack}>
+          <Alert onClose={closeSnack} severity="info" sx={{ width: '100%' }}>
+            <Typography>
+              {language.downloadApp}
+            </Typography>
+            <Button
+              onClick={() => window.open('https://codedead.com/software/advanced-passgen')}
+              size="small"
+              color="secondary"
+            >
+              {language.download}
+            </Button>
+          </Alert>
+        </Snackbar>
       </BrowserRouter>
     </ThemeProvider>
   );