merge conflicts

Reviewed-on: #1

README.md

@@ -17,8 +17,6 @@ You can read more about the algorithm here:
 
 ## How to use
 
-![Use example](use_example.gif)
-
 First, you must have installed a Java Runtime Environment. Check https://adoptium.net/es if you are
 unsure how to install.
 
@@ -147,16 +145,11 @@ clj-totp.sh import <alias> "<url>"
 - [x] Show several OTPs at once
 
 ### v1.2
-- [x] Show progress bar
-- [x] Styles for progress bar
-- [x] Native compilation script corrections
-
-### v2
 - [ ] REST API
 - [ ] User management
 - [ ] Robust BD backend (H2, datomic, or similar)
 
-### v3
+### v1.3
 - [ ] Simple web connected to REST API
 
 

build.clj

@@ -1,101 +1,37 @@
 (ns build
-  (:refer-clojure :exclude [test])
-  (:require [clojure.tools.build.api :as b]
-            [clojure.java.io :as io]))
+  (:require [clojure.tools.build.api :as b]))
 
-(def lib-group "es.rcorral")
-(def artifact-prefix "clj-totp")
-(def curr-version (format "2.0.%s" (b/git-count-revs nil)))
+(def lib 'es.rcorral/clj-totp)
+(def version (format "1.1.%s" (b/git-count-revs nil)))
+(def target-dir "target")
+(def class-dir (str target-dir "/classes"))
+(def uber-file (format "target/%s-%s-standalone.jar" (name lib) version))
 
-;; Builds artifact's full descriptor for each subproject
-(defn lib [subproj]
-  (symbol (str lib-group "/" artifact-prefix "-" subproj )))
+;; delay to defer side effects (artifact downloads)
+(def basis (delay (b/create-basis {:project "deps.edn"})))
 
-;; Basis for each subproject, using their own deps.edn
-(defn basis [subproj]
-  ;(b/create-basis {:project (str subproj "/deps.edn")}))
-  (delay (b/create-basis {:project (str "projects/" subproj "/deps.edn")})))
+(defn clean [_]
+  (b/delete {:path "target"}))
 
-;; Target dir for each subproject
-(defn target-dir [subproj]
-  (str "target/" subproj))
-
-;; Path for compiled classes
-(defn class-dir [subproj]
-  (str (target-dir subproj) "/" "classes"))
-
-;; Jar file for each subproject. :uber type adds -standalone suffix
-(defn jar-file [subproj version type]
-  (format "target/%s-%s-%s%s.jar" artifact-prefix subproj version
-          (if (= type :uber) "-standalone" "")))
-
-;; Clean target dir for subproject
-(defn clean [{:keys [subproj]}]
-  (b/delete {:path (target-dir subproj)})
-  (println "Project" subproj "cleaned"))
-
-;; Compile java classes, only if java subdir exists
-(defn compile-java [subproj]
-  (let [java-dir (str "projects/" subproj "/java")]
-    (if (.exists (io/file java-dir))
-      (do
-        (println "Compiling java code for" subproj)
-        (b/javac {:src-dirs [java-dir]
-                  :class-dir (class-dir subproj)
-                  :basis @(basis subproj)
-                  :javac-opts ["-source" "11" "--target" "11" "-proc:none"]}))
-      (println "No java code for" subproj ", skipping compilation"))))
-
-;; Create a jar file
-(defn jar
-  "Build a simple jar file, with no dependencies included."
-  [{:keys [subproj version]}]
-  (let [real-version (if version version curr-version)
-        target-dir (target-dir subproj)
-        class-dir (class-dir subproj)
-        src-dir (str "projects/" subproj "/src")
-        resources-dir (str "projects/" subproj "/resources")
-        basis (basis subproj)
-        jar-file (jar-file subproj real-version :plain)]
-    ;; Clean only class dir
-    (b/delete {:path class-dir})
-    ;; Copy code
-    (b/copy-dir {:src-dirs [src-dir]
-                 :target-dir class-dir})
-    ;; Copy resources
-    (b/copy-dir {:src-dirs [resources-dir]
-                 :target-dir target-dir})
-    ;; Compile java code, if exists
-    (compile-java subproj)
-    ;; Build jar
-    (b/jar {:class-dir class-dir
+(defn compile-java [_]
+  (b/javac {:src-dirs ["java"]
+            :class-dir class-dir
             :basis @basis
-            :jar-file jar-file
-            :lib (lib subproj)
-            :version real-version})
-    (println "Generated jar file:" jar-file)))
+            :javac-opts ["-source" "11" "--target" "11" "-proc:none"]}))
 
-;; Create an uber jar, with all dependencies inside
-(defn uber
-  "Build a uberjar with all dependencies included"
-  [{:keys [subproj version main-ns]}]
-  (let [real-version (if version version curr-version)target-dir (target-dir subproj)
-        basis (basis subproj)
-        class-dir (class-dir subproj)
-        src-dir (str "projects/" subproj "/src")
-        resources-dir (str "projects/" subproj "/resources")
-        uber-file (jar-file subproj real-version :uber)]
-    (b/delete {:path class-dir})
-    (b/copy-dir {:src-dirs [src-dir]
+
+#_{:clojure-lsp/ignore [:clojure-lsp/unused-public-var]}
+(defn uber [_]
+  (clean nil)
+  (b/copy-dir {:src-dirs ["src"]
                :target-dir class-dir})
-    (b/copy-dir {:src-dirs [resources-dir]
-                 :target-dir target-dir})
-    (compile-java subproj)
+  (b/copy-file {:src "resources/clj-totp.sh"
+                :target "target/clj-totp.sh"})
+  (compile-java nil)
   (b/compile-clj {:basis @basis
-                    :src-dirs [src-dir] :class-dir class-dir})
+                  :ns-compile '[totp.app]
+                  :class-dir class-dir})
   (b/uber {:class-dir class-dir
            :uber-file uber-file
            :basis @basis
-             :main main-ns})
-    (println "Generated uberjar executable:" uber-file)))
-
+           :main 'totp.app}))

deps.edn

@@ -1,9 +1,14 @@
 {:paths   ["src" "resources" "target/classes"]
  :deps    {org.clojure/clojure                 {:mvn/version "1.12.1"}
+           io.github.clojure/tools.build       {:mvn/version "0.10.10"}
+           mvxcvi/alphabase                    {:mvn/version "3.0.185"} ;; https://github.com/greglook/alphabase
+           cli-matic/cli-matic                 {:mvn/version "0.5.4"}   ;; https://github.com/l3nz/cli-matic
            ;; Native image (GraalVM)
-           com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"}}
+           com.github.clj-easy/graal-build-time {:mvn/version "1.0.5"};; Tutorial: https://shagunagrawal.me/posts/setup-clojure-with-graalvm-for-native-image/
+           ;; Protobuf for java
+           com.google.protobuf/protobuf-java   {:mvn/version "3.25.8"}}
 
- :aliases {;; Execute the app. Tutorial: https://shagunagrawal.me/posts/setup-clojure-with-graalvm-for-native-image/
+ :aliases {;; Execute the app
            :run      {:main-opts   ["-m" "totp.app"]}
 
            ;; Kaocha runner. You can use the 'kaocha' wrapper located in ~/bin/kaocha
@@ -13,46 +18,5 @@
 
            ;; Run with clj -T:build function-in-build
            :build    {:deps {io.github.clojure/tools.build {:mvn/version "0.10.10"}}
-                      :ns-default build}
-
-
-           ;; COMMON ALIASES FOR ALL PROJECTS
-           :root/run-x {:exec-fn -main}
-           :root/extra-paths [:totp.core/extra-paths
-                              :totp.cli/extra-paths
-                              :totp.web/extra-paths]
-
-           :root/all {:extra-paths ["src" "resources"
-                                    :root/extra-paths]}
-
-           :root/test {:extra-paths ["test"]
-                       :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}
-                       :main-opts   ["-m" "kaocha.runner"]}
-
-           :boot/build {:extra-paths ["build"]
-                        :deps {io.github.clojure/tools.build {:mvn/version "0.10.10"}}
-                        :ns-default build
-                        ;:exec-fn ci
-                        ;:exec-args {:app-alias :com.example.core}
-                        }
-
-           :totp.core/extra-paths ["projects/core/src"
-                                   "projects/core/test"
-                                   "projects/core/java"
-                                   "projects/core/resources"]
-           :totp.core {:ns-default totp.core
-                              :main-opts ["-m" "totp.core"]
-                              :extra-deps {projects/core {:local/root "projects/core"}}
-                              :exec-args {:dirs ["projects/core"]}}
-
-
-           :totp.cli/extra-paths ["projects/app/src"]
-           :totp.cli {:ns-default totp.cli
-                              :main-opts ["-m" "totp.cli"]
-                              :extra-deps {;; does not use parts/grugstack {:local/root "parts"}
-                                           projects/cli {:local/root "projects/cli"}}
-                              :exec-args {:dirs ["projects/cli"]}}
-           
-           :totp.web/extra-paths ["projects/web/src"]
-           }}
+                      :ns-default build}}}
 

doc/db.plantuml

@@ -1,34 +0,0 @@
-@startuml
-' configuration
-skinparam linetype ortho
-
-entity "user" as user {
-        id: number
-        --
-        login: varchar(64)
-        passw: varchar(512)
-        active: shortint
-        desc: varchar(512)
-        config: varchar(512)
-}
-
-entity "app" as app {
-        id: number
-        --
-        name: varchar(32)
-        desc: varchar(512)
-        secret: varchar(512)
-        period: int
-        config: varchar(512)
-}
-
-entity "user_app" as user_app {
-        user_id: number
-        app_id: number
-        --
-}
-
-user ||--o{ user_app
-app ||--o{ user_app
-
-@enduml

native.cmd

@@ -1,33 +0,0 @@
-
-@echo off
-
-setlocal
-
-REM YOUR LOCAL GRAAL VM INSTALLATION
-set JAVA_HOME=D:\programas\graalvm-jdk-21.0.7+8.1
-REM generated file
-set BIN_FILE=totp
-
-set DEST_DIR=C:\Users\rubencj\util
-
-set PATH=%JAVA_HOME%\bin;%CLOJURE_HOME%;%PATH%
-set NATIVE=%JAVA_HOME%\bin\native-image.cmd
-
-
-echo Using GraalVM native compiler: %NATIVE%
-
-echo Creating uberjar
-clojure -T:build uber
-
-set UBERJAR=
-for /f "delims=" %%a in ('dir /b /s target\clj-totp-*-standalone.jar') do @set UBERJAR=%%a
-echo Created uberjar: %UBERJAR%
-
-echo "Creating native image"
-cmd /c %NATIVE% -jar %UBERJAR% -o target\%BIN_FILE% -H:+ReportExceptionStackTraces --features=clj_easy.graal_build_time.InitClojureClasses --report-unsupported-elements-at-runtime --verbose --no-fallback -H:ReflectionConfigurationFiles=reflect_config.json -H:-CheckToolchain --initialize-at-build-time=org.fusesource.jansi.Ansi
-
-
-echo Executable created: target\%BIN_FILE%.exe
-
-copy target\%BIN_FILE%.exe %DEST_DIR%
-echo Native image copied to %DEST_DIR%\%BIN_FILE%.exe

native.sh

@@ -8,23 +8,8 @@ clojure -T:build uber
 UBERJAR=$(realpath --relative-to=target target/clj-totp-*-standalone.jar)
 
 echo "Creating native image"
-$NATIVE -jar target/$UBERJAR -o target/$BIN_FILE\
-    -H:+ReportExceptionStackTraces\
-    -H:ReflectionConfigurationFiles=./reflect_config.json\
-    --verbose --no-fallback\
-    --features=clj_easy.graal_build_time.InitClojureClasses\
-    --report-unsupported-elements-at-runtime\
-    --strict-image-heap\
-    -march=native\
-    -R:MaxHeapSize=10m\
-    --initialize-at-build-time=org.fusesource.jansi.Ansi\
-    --initialize-at-build-time='org.fusesource.jansi.Ansi$Color'\
-    --initialize-at-build-time='org.fusesource.jansi.Ansi$Attribute'\
-    '--initialize-at-build-time=org.fusesource.jansi.Ansi$1'
+$NATIVE -jar target/$UBERJAR -o target/$BIN_FILE -H:+ReportExceptionStackTraces --features=clj_easy.graal_build_time.InitClojureClasses --report-unsupported-elements-at-runtime --verbose --no-fallback -H:ReflectionConfigurationFiles=./reflect_config.json
 
 echo "Executable created on target/$BIN_FILE"
 cp target/$BIN_FILE ~/bin
 echo "Copied to ~/bin/$BIN_FILE"
-
-echo "Compress executable for distribution"
-xz -fv target/$BIN_FILE

projects/cli/deps.edn

@@ -1,16 +0,0 @@
-{:paths   ["src" "resources" "target/classes"]
- :deps    {clj-totp/core                       {:local/root "projects/core"}
-           org.clojure/clojure                 {:mvn/version "1.12.1"}
-           io.github.clojure/tools.build       {:mvn/version "0.10.10"}
-           cli-matic/cli-matic                 {:mvn/version "0.5.4"}   ;; https://github.com/l3nz/cli-matic
-           ;; Progress bar
-           com.github.pmonks/spinner           {:mvn/version "2.0.284"}}
-
- :aliases {;; Execute the app
-           :run      {:main-opts   ["-m" "totp.app"]}
-
-           ;; Kaocha runner. You can use the 'kaocha' wrapper located in ~/bin/kaocha
-           :test     {:extra-paths ["test"]
-                      :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}
-                      :main-opts   ["-m" "kaocha.runner"]}}}
-

projects/cli/tests.edn

@@ -1 +0,0 @@
-#kaocha/v1 {}

projects/core/.cpcache/425892293.main

@@ -1,2 +0,0 @@
--m
-kaocha.runner

projects/core/deps.edn

@@ -1,14 +0,0 @@
-{:paths   ["src" "resources" "target/classes"]
- :deps    {org.clojure/clojure                 {:mvn/version "1.12.1"}
-           io.github.clojure/tools.build       {:mvn/version "0.10.10"}
-           mvxcvi/alphabase                    {:mvn/version "3.0.185"} ;; https://github.com/greglook/alphabase
-           cli-matic/cli-matic                 {:mvn/version "0.5.4"}   ;; https://github.com/l3nz/cli-matic
-           ;; Protobuf for java
-           com.google.protobuf/protobuf-java   {:mvn/version "3.25.8"}
-           }
-
- :aliases {;; Kaocha runner. You can use the 'kaocha' wrapper located in ~/bin/kaocha
-           :test     {:extra-paths ["test"]
-                      :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}
-                      :main-opts   ["-m" "kaocha.runner"]}}}
-

projects/core/target/classes/totp/core.clj

@@ -1,101 +0,0 @@
-(ns totp.core
-  (:require [alphabase.base32 :as b32]
-            [clojure.math :as m])
-  (:import (javax.crypto Mac)
-           (javax.crypto.spec SecretKeySpec)
-           (java.util Base64 Arrays)
-           (java.nio ByteBuffer)))
-
-(def ^:private byte-array-type (type (.getBytes "")))
-
-(defn timestamp->steps
-  "Converts from UNIX timestamp in milliseconds to a number os steps of 's' seconds of duration"
-  [time, step-size]
-  (if (or (nil? time) (nil? step-size) (zero? step-size))
-    0
-    (int (quot time (* 1000 step-size)))))
-
-
-(defn bytes-array?
-  "Return true if x is a byte[]"
-  [x]
-  (= byte-array-type (type x)))
-
-
-(defn get-alg
-  [alg]
-  (case alg
-    "sha1"  "HmacSHA1"
-    "sha256" "HmacSHA256"
-    "sha512" "HmacSHA512"
-    ""))
-
-
-(defmulti hmac
-  "Generates an HMAC. Algorithms supported: sha1, sha256, sha512.
-   The key and the message can be (both) string or array of bytes, nil otherwise"
-  (fn [algorithm key message]
-    (cond
-      (and (string? key) (string? message) (some? (get-alg algorithm))) :string
-      (and (bytes-array? key) (bytes-array? message) (some? (get-alg algorithm))) :byte
-      :else :nil)))
-
-;; By default
-(defmethod hmac :nil [_ _ _]
-  nil)
-
-;; When key and message are strings
-(defmethod hmac :string [algorithm key message]
-  (if (or (empty? key) (empty? message))
-    ""
-    (let [mac (doto (Mac/getInstance (get-alg algorithm)) (.init (SecretKeySpec. (.getBytes key) (get-alg algorithm))))
-          hmac-bytes (.doFinal mac (.getBytes message))]
-      ;; Return the Base64 encoded HMAC
-      (.encodeToString (Base64/getEncoder) hmac-bytes))))
-
-;; When key and message are arrays of bytes
-(defmethod hmac :byte [algorithm key message]
-  (if (nil? message)
-    (bytes (byte-array 0))
-    (let [mac (doto (Mac/getInstance (get-alg algorithm)) (.init (SecretKeySpec. key (get-alg algorithm))))
-          hmac-bytes (.doFinal mac message)]
-      ;; Return the Base64 encoded HMAC
-      (Base64/getEncoder) hmac-bytes)))
-
-
-(defn long->bytes
-  "Converts a long to an array of 8 bytes"
-  [l]
-  ;;Java equivalent: ByteBuffer.allocate(Long.SIZE / Byte.SIZE).putLong(someLong).array();
-  (when (integer? l)
-    (-> (ByteBuffer/allocate (/ Long/SIZE Byte/SIZE))
-        (.putLong l)
-        (.array))))
-
-
-(defn bytes->int
-  "Converts an array of 4 bytes to an integer"
-  [bytes]
-  ;;Java equivalent:  ByteBuffer.wrap(data).getInt()
-  (when (some? bytes)
-    (.getInt (ByteBuffer/wrap bytes))))
-
-
-(defn get-otp
-  "Generate an OTP with the given secret (in base32) for the specified timestep"
-  ([secret algorithm digits period] ;;algorithm digits period
-   (when (and secret period)
-     (let [step (timestamp->steps (System/currentTimeMillis) period)
-           k (b32/decode secret)
-           c (long->bytes step)
-           hs (hmac algorithm k c)
-           offset (bit-and (get hs (dec (count hs))) 0x0f) ;; int offset = hs[hs.length-1] & 0xf;
-           chunk (Arrays/copyOfRange hs offset (+ offset 4)) ;(take 4 (drop offset hs)) ;; byte[] chunk = Arrays.copyOfRange(hs, offset, offset+4) 
-           ]
-       (format (str "%0" digits "d")
-               (-> chunk
-                   (bytes->int)
-                   (bit-and 0x7fffffff)
-                   (rem (int (m/pow 10 digits))))))))
-  ([secret]
-   (get-otp secret "sha1" 6 30)))

projects/core/target/classes/totp/data.clj

@@ -1,246 +0,0 @@
-(ns totp.data
-  (:require [clojure.edn :as e]
-            [clojure.string :as str]
-            [clojure.java.io :as io]
-            [clojure.pprint :as pp]
-            [alphabase.base64 :as b64]
-            [alphabase.base32 :as b32])
-  (:import [protoc OtpauthMigration$MigrationPayload]))
-
-(defn join-path
-  "Joins several subpaths using system's path separator (/ un *NIX and \\ in windows)"
-  [& col]
-  (str/join java.io.File/separator col))
-
-
-(def cfg-path (join-path (System/getProperty "user.home") ".config" "totp"))
-
-(def cfg-file (join-path cfg-path "apps.edn"))
-
-(def cfg-header ";; clj-totp configuration file
-;; This file contents a list of maps with :name and :secret entries
-;; Secrets must be encoded in BASE32
-
-")
-
-
-(defn exists-config
-  "Checks if the config file exists"
-  []
-  (.exists (io/file cfg-file)))
-
-
-(defn create-cfg-file
-  "Creates the config file"
-  []
-  (println "Creating " cfg-file)
-  (io/delete-file cfg-file true)
-  (io/make-parents cfg-file)
-  (spit cfg-file cfg-header)
-  true)
-
-
-(defn create-cfg?
-  "Create configuration file if not exists. Overridable with allways = true"
-  ([] (create-cfg? false))
-  ([allways]
-   (if (or allways (not (exists-config)))
-     (create-cfg-file)
-     false)))
-
-(comment
-  (exists-config)
-  (create-cfg?))
-
-
-(defn load-config
-  "Loads configuration from file"
-  []
-  (e/read-string (slurp cfg-file)))
-
-
-(defn store-config
-  "Store configuration to file"
-  [cfg]
-  (when cfg
-    (spit cfg-file (str cfg-header (with-out-str
-                                     (binding [pp/*print-right-margin* 50]
-                                       (pp/pprint cfg)))))))
-
-
-(defn delete-app
-  [cfg name]
-  (filter #(not= name (:name %)) cfg))
-
-
-(defn create-app
-  ([name secret] (create-app name secret nil nil "sha1" 6 30))
-  ([name secret user issuer] (create-app name secret user issuer "sha1" 6 30))
-  ([name secret user issuer algorithm digits period] 
-   {:name name :secret secret :user user :issuer issuer :algorithm algorithm :digits digits :period period}))
-
-
-(defn add-app
-  ([cfg app-map] (apply add-app (cons cfg (vals app-map))))
-  ([cfg name secret] (add-app cfg name secret nil nil "sha1" 6 30))
-  ([cfg name secret user issuer algorithm digits period]
-   (conj (delete-app cfg name) (create-app name secret user issuer algorithm digits period))))
-
-
-(defn list-apps
-  [cfg]
-  (map :name
-       (filter #(contains? % :name) cfg)))
-
-(comment
-  (list-apps (load-config)))
-
-(defn get-app
-  [cfg name]
-  (let [app (first (filter #(= name (:name %)) cfg))]
-    (if app
-      app
-      (println "App" name "not found"))))
-
-
-(comment
-  (exists-config)
-  (create-cfg?)
-  (load-config)
-
-  (get-app [{:name "abc" :secret "def"} {:name "my-app" :secret "abc123"} {:name "another app" :secret "ABCDEF1234"}] "my-app2")
-
-  (with-out-str
-    (binding [pp/*print-right-margin* 50]
-      (pp/pprint [{:name "abc" :secret "def"} {:name "my-app" :secret "abc123"}])))
-
-  (store-config [{:name "abc" :secret "def"} {:name "my-app" :secret "abc123"} {:name "another app" :secret "ABCDEF1234"}])
-
-  (-> nil
-      (add-app "app1" "abc123abc123")
-      (add-app "app2" "abc123abc123")
-      (add-app "app1" "123456789012")
-      (store-config))
-)
-
-
-(defmacro with-config
-  "Loads config file and stores it in a cfg binding.
-  You can use the cfg var the inner code.
-
-  Next example will print config data:
-  (with-config (println cfg))
-
-  Be cafefull: dont use a binding called cfg in any module.
-  "
-  [form]
-    (let [cfg (symbol "cfg")]   ;; This symbol will prevent error with qualified in the inner let
-        `(if (exists-config)
-             (let [~cfg (load-config)] ;; This is the problematic let binding. See: https://stackoverflow.com/a/15122414
-               (if (some? ~cfg)
-                 (do ~form)))
-        (println "Config file not found"))))
-
-
-(comment
-  #_{:clj-kondo/ignore [:unresolved-symbol]}
-  (with-config (first cfg))
-
-  (macroexpand-1 '(with-config (first cfg)))
-  )
-
-
-
-(defn url-create->app
-  "Import data from url using the protocol otpauth://
-   
-   Example: otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example
-
-  https://github.com/google/google-authenticator/wiki/Key-Uri-Format"
-  [name url]
-  (when (str/starts-with? url "otpauth://")
-    (let [parts (str/split url #"\?")
-          meta-parts (str/split (first parts) #"/" -1)
-          data-parts (str/split (second parts) #"&" -1)
-          otp-type (nth meta-parts 2)]
-      (if (not= "totp" otp-type) ;; Only totp is supported
-        (println "Invalid protocol OTP type:" otp-type)
-        (let [user-data (str/split (nth meta-parts 3) #":" -1)
-              issuer (first user-data)
-              user (second user-data)
-              ;data-map (apply hash-map (flatten (map #(str/split % #"=") data-parts)))
-              data-map (reduce (fn [acc v]  ;; From array to map
-                                 (let [[k v] (str/split v #"=")]
-                                   (assoc acc (keyword k) v)))
-                               {} data-parts)
-              secret (:secret data-map)
-              ;;issuer2 (:issuer data-map)
-              ]
-          (create-app name secret user issuer))))))
-
-(comment
-  (url-create->app "app1" "otpauth://totp/Reddit:errepunto?issuer=Reddit&secret=3RR2")
-
-  (url-create->app "app2" "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example")
-
-  (add-app [{:a 1 :b 2}] (url-create->app "app2" "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example"))
-  )
-
-(defn import-from-url-create
-  [cfg name url]
-  (add-app cfg (url-create->app name url)))
-
-(comment
-  #_{:clj-kondo/ignore [:unresolved-symbol]}
-  (with-config (import-from-url-create cfg "app1" "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example"))
-  )
-
-
-
-(defn url-export->app
-  [name url]
-  (when (some? url)
-    (let [b64-data   (second (str/split url #"=" -1))
-          data-b     (b64/decode b64-data)
-          parsed     (OtpauthMigration$MigrationPayload/parseFrom data-b)
-          payload    (bean (.getOtpParameters parsed 0))
-          ;{:keys [name secret name issuer digitsValue algorithmValue typeValue]} payload
-          secret-b   (:secret payload)
-          secret     (b32/encode (.toByteArray secret-b))
-          user       (:name payload)
-          issuer     (:issuer payload)
-          algorithm  (case (:algorithmValuei payload) 2 "sha256" 3 "sha512" "sha1")
-          digits     (case (:digitsValue payload) 2 8 6)
-          valid-type (= 2 (:typeValue payload))
-          ]
-      (println "name:" name "user:" user "issuer:" issuer "digitsValue:" digits "algorithm:" algorithm "valid type?" valid-type)
-      (if valid-type
-        (create-app name secret user issuer algorithm digits 30)
-        (println "Invalid OTP type" (:typeValue payload)))
-      )))
-
-(comment
-  (url-export->app "test"
-                    "otpauth-migration://offline?data=CkkKEJ0M4MyHfITKCwCfqPIttjESFHJ1YmVuY2pAMThCMTY5RDVGRjAwGgRTTldMIAEoATACQhMzYjkxMDQxNzI3NzgzNDIzNDYyEAIYASAA"
-                    )
-  )
-
-
-
-(defn import-from-url-export
-  "Import data from url using the protocol otpauth-migration://
-
-  https://alexbakker.me/post/parsing-google-auth-export-qr-code.html"
-  [cfg name url]
-  (add-app cfg (url-export->app name url)))
-
-(comment
-  #_{:clj-kondo/ignore [:unresolved-symbol]}
-  (with-config (import-from-url-export
-                cfg
-                "app2"
-                "otpauth-migration://offline?data=CkkKEJ0M4MyHfITKCwCfqPIttjESFHJ1YmVuY2pAMThCMTY5RDVGRjAwGgRTTldMIAEoATACQhMzYjkxMDQxNzI3NzgzNDIzNDYyEAIYASAA")
-    )
-  )
-
-

projects/core/target/clj-totp.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-JAVA_EXECUTABLE=java
-UBER_JAR=$(realpath clj-totp-*-standalone.jar)
-OPTS="-Xms256m -Xmx256m -client -Dclojure.spec.skip-macros=true"
-
-
-$JAVA_EXECUTABLE $OPTS -jar $UBER_JAR $@

projects/core/tests.edn

@@ -1 +0,0 @@
-#kaocha/v1 {}

projects/web/deps.edn

@@ -1,19 +0,0 @@
-{:paths   ["src" "resources" "target/classes"]
- :deps    {clj-totp/core                       {:local/root "projects/core"}
-           org.clojure/clojure                 {:mvn/version "1.12.1"}
-           io.github.clojure/tools.build       {:mvn/version "0.10.10"}
-           ;; For SQLite
-           com.github.seancorfield/next.jdbc   {:mvn/version "1.3.1048"}
-           org.xerial/sqlite-jdbc              {:mvn/version "3.50.3.0"}
-           ;; For Datomic local
-           com.datomic/local                   {:mvn/version "1.0.291"};; https://docs.datomic.com/datomic-local.html
-           }
-
- :aliases {;; Execute the app
-           :run      {:main-opts   ["-m" "totp.app"]}
-
-           ;; Kaocha runner. You can use the 'kaocha' wrapper located in ~/bin/kaocha
-           :test     {:extra-paths ["test"]
-                      :extra-deps  {lambdaisland/kaocha {:mvn/version "1.91.1392"}}
-                      :main-opts   ["-m" "kaocha.runner"]}}}
-

projects/web/src/totp/db/datomic.clj

@@ -1,68 +0,0 @@
-(ns totp.db.datomic
-  (:require [totp.data :as data]
-            [datomic.client.api :as d]))
-
-
-(def cfg-path (data/join-path (System/getProperty "user.home") ".config" "totp"))
-(def db-path (str cfg-path java.io.File/separator "data"))
-
-(def cfg {:server-type :datomic-local
-          :system "local-data"
-          :storage-dir db-path})
-
-(def client (d/client cfg))
-
-;; Schema for our database
-
-(def totp-schema [{:db/ident :app/name
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/unique :db.unique/identity
-                   :db/doc "Unique name of the application. Between 2 and 32 chars"
-                   :db.attr/preds  (fn [s] (<= 3 (count s) 15))}
-                  {:db/ident :app/desc
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "(optional) Description of the application"}
-                  {:db/ident :app/secret
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "Secret BASE32"}
-                  {:db/ident :app/period
-                   :db/valueType :db.type/long
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "Time slice in seconds (30 by default)"}
-                  {:db/ident :app/config
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "(Optional) Extra config"}
-
-                  {:db/ident :user/login
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/unique :db.unique/identity
-                   :db/doc "Identifier for the user"}
-                  {:db/ident :user/passwd
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "Password"}
-                  {:db/ident :user/active
-                   :db/valueType :db.type/boolean
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "Is the user active?"}
-                  {:db/ident :user/desc
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "(Optional) Description of the user"}
-                  {:db/ident :user/config
-                   :db/valueType :db.type/string
-                   :db/cardinality :db.cardinality/one
-                   :db/doc "(Optional) Extra config"}
-                  {:db/ident :user/apps
-                   :db/valueType :db.type/ref
-                   :db/cardinality :db.cardinality/many
-                   :db/doc "Applications for this user"}])
-
-(defn init-db
-  [client]
-  (d/create-database client {:db-name "totp"}))

projects/web/src/totp/db/sqlite.clj

@@ -1,23 +0,0 @@
-(ns totp.db.sqlite
-  (:require [next.jdbc :as jdbc]))
-
-;; DB configuration
-(def db {:dbname "totp-data.sqlite"
-         :dbtype "sqlite"})
-
-;; DB parsed config
-(def data-source (jdbc/get-datasource db))
-
-(defn init-db
-  "Create an empty DB"
-  []
-  (jdbc/execute! data-source ["
-  create table apps (
-    id int auto_increment primary key,
-    name varchar(32),
-    desc varchar(255)
-  )"]))
-
-(comment 
-  (init-db)
-  )

projects/web/tests.edn

@@ -1 +0,0 @@
-#kaocha/v1 {}