diff --git a/lib/auth/auth.lisp b/lib/auth/auth.lisp index 8b21483..c3400a7 100644 --- a/lib/auth/auth.lisp +++ b/lib/auth/auth.lisp @@ -2,12 +2,16 @@ (defpackage :scopes-auth (:use :common-lisp) - (:local-nicknames (:dom :scopes/web/dom) + (:local-nicknames (:config :scopes/config) (:util :scopes/util)) (:import-from :scopes/web/dom #:div #:label) - (:export #:login)) + (:export #:config + #:login)) (in-package :scopes-auth) +(defclass config (config:base) + ((admin-credentials :initarg :admin-credentials))) + (defun login (cred) (util:lgi cred)) diff --git a/lib/auth/test/.test.env b/lib/auth/test/.test.env new file mode 100644 index 0000000..a7d2279 --- /dev/null +++ b/lib/auth/test/.test.env @@ -0,0 +1,4 @@ +# lib/auth/test/.test.env - environment file for overriding config settings + +SCOPES_ADMIN_LOGIN=admin +SCOPES_ADMIN_PASSWORD=sc0pes diff --git a/lib/auth/test/config.lisp b/lib/auth/test/config.lisp index 2a02f5c..aac6ec1 100644 --- a/lib/auth/test/config.lisp +++ b/lib/auth/test/config.lisp @@ -5,17 +5,21 @@ (in-package :scopes-auth/test) -(config:root :env-keys - '(:address :port - :db-name :db-user :db-password)) +(config:root + :env-keys '(:address :port :db-name :db-user :db-password + :admin-login :admin-password) + :env-path (t:test-path ".test.env")) (config:add :logger :class 'logging:config :loglevel :info :logfile (t:test-path "scopes-test.log" "log") :console nil) -(config:add :server - :class 'server:config +(config:add :auth :class 'auth:config + :admin-credentials `(:login ,(config:from-env :admin-login "admin") + :password ,(config:from-env :admin-password "secret"))) + +(config:add :server :class 'server:config :port "8899" :routes `((("hx") server:message-handler :html-responder cs-hx:response) @@ -23,7 +27,6 @@ :doc-root ,(t:test-path "" "docs")))) (config:add-action '(:auth :login) #'auth:login) -(config:add :client - :class 'client:config +(config:add :client :class 'client:config :base-url "http://localhost:8899" :doc-path "/" :api-path "/hx/")