diff --git a/README.md b/README.md index 4493f91..ab497df 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ A Clojure library for JSON Web Token(JWT) ```clojure (ns foo (:require - [jwt.core :refer :all] - [jwt.rsa.key :refer [rsa-private-key]] - [clj-time.core :refer [now plus days]])) + [clj-jwt.core :refer :all] + [clj-jwt.rsa.key :refer [rsa-private-key]] + [clj-time.core :refer [now plus days]])) (def claim {:iss "foo" @@ -44,9 +44,9 @@ A Clojure library for JSON Web Token(JWT) ```clojure (ns foo (:require - [jwt.core :refer :all] - [jwt.rsa.key :refer [rsa-private-key rsa-public-key]] - [clj-time.core :refer [now plus days]])) + [clj-jwt.core :refer :all] + [clj-jwt.rsa.key :refer [rsa-private-key rsa-public-key]] + [clj-time.core :refer [now plus days]])) (def claim {:iss "foo" diff --git a/src/jwt/base64.clj b/src/clj_jwt/base64.clj similarity index 98% rename from src/jwt/base64.clj rename to src/clj_jwt/base64.clj index 283d3f3..d07e11e 100644 --- a/src/jwt/base64.clj +++ b/src/clj_jwt/base64.clj @@ -1,4 +1,4 @@ -(ns jwt.base64 +(ns clj-jwt.base64 (:require [clojure.data.codec.base64 :as base64] [clojure.string :as str]) (:import [java.io ByteArrayInputStream ByteArrayOutputStream])) diff --git a/src/jwt/core.clj b/src/clj_jwt/core.clj similarity index 95% rename from src/jwt/core.clj rename to src/clj_jwt/core.clj index 40ba140..8b0b9d8 100644 --- a/src/jwt/core.clj +++ b/src/clj_jwt/core.clj @@ -1,7 +1,7 @@ -(ns jwt.core +(ns clj-jwt.core (:require - [jwt.base64 :refer [url-safe-encode-str url-safe-decode-str]] - [jwt.sign :refer [get-signature-fn get-verify-fn supported-algorithm?]] + [clj-jwt.base64 :refer [url-safe-encode-str url-safe-decode-str]] + [clj-jwt.sign :refer [get-signature-fn get-verify-fn supported-algorithm?]] [clj-time.coerce :refer [to-long]] [clojure.data.json :as json] [clojure.string :as str])) diff --git a/src/jwt/rsa/key.clj b/src/clj_jwt/rsa/key.clj similarity index 97% rename from src/jwt/rsa/key.clj rename to src/clj_jwt/rsa/key.clj index 18b8fc9..e1966c7 100644 --- a/src/jwt/rsa/key.clj +++ b/src/clj_jwt/rsa/key.clj @@ -1,4 +1,4 @@ -(ns jwt.rsa.key +(ns clj-jwt.rsa.key (:require [clojure.java.io :as io]) (:import [org.bouncycastle.openssl PasswordFinder PEMReader])) diff --git a/src/jwt/sign.clj b/src/clj_jwt/sign.clj similarity index 96% rename from src/jwt/sign.clj rename to src/clj_jwt/sign.clj index 3884e93..02b0d52 100644 --- a/src/jwt/sign.clj +++ b/src/clj_jwt/sign.clj @@ -1,6 +1,6 @@ -(ns jwt.sign +(ns clj-jwt.sign (:require - [jwt.base64 :refer [url-safe-encode-str url-safe-decode]])) + [clj-jwt.base64 :refer [url-safe-encode-str url-safe-decode]])) (java.security.Security/addProvider (org.bouncycastle.jce.provider.BouncyCastleProvider.)) diff --git a/test/jwt/base64_test.clj b/test/clj_jwt/base64_test.clj similarity index 96% rename from test/jwt/base64_test.clj rename to test/clj_jwt/base64_test.clj index fcac453..a85543f 100644 --- a/test/jwt/base64_test.clj +++ b/test/clj_jwt/base64_test.clj @@ -1,7 +1,7 @@ -(ns jwt.base64-test +(ns clj-jwt.base64-test (:require - [jwt.base64 :refer :all] - [midje.sweet :refer :all])) + [clj-jwt.base64 :refer :all] + [midje.sweet :refer :all])) (facts "base64/encode" (fact "string -> byte array encode" diff --git a/test/jwt/core_test.clj b/test/clj_jwt/core_test.clj similarity index 97% rename from test/jwt/core_test.clj rename to test/clj_jwt/core_test.clj index 74eae0a..b02e9c3 100644 --- a/test/jwt/core_test.clj +++ b/test/clj_jwt/core_test.clj @@ -1,9 +1,9 @@ -(ns jwt.core-test +(ns clj-jwt.core-test (:require - [jwt.core :refer :all] - [jwt.rsa.key :refer [rsa-private-key rsa-public-key]] - [clj-time.core :refer [date-time plus days now]] - [midje.sweet :refer :all])) + [clj-jwt.core :refer :all] + [clj-jwt.rsa.key :refer [rsa-private-key rsa-public-key]] + [clj-time.core :refer [date-time plus days now]] + [midje.sweet :refer :all])) (def claim {:iss "foo"}) (def prv-key (rsa-private-key "test/files/rsa/no_pass.key")) diff --git a/test/jwt/rsa/key_test.clj b/test/clj_jwt/rsa/key_test.clj similarity index 85% rename from test/jwt/rsa/key_test.clj rename to test/clj_jwt/rsa/key_test.clj index baf6daa..a945f47 100644 --- a/test/jwt/rsa/key_test.clj +++ b/test/clj_jwt/rsa/key_test.clj @@ -1,7 +1,7 @@ -(ns jwt.rsa.key-test +(ns clj-jwt.rsa.key-test (:require - [jwt.rsa.key :refer :all] - [midje.sweet :refer :all])) + [clj-jwt.rsa.key :refer :all] + [midje.sweet :refer :all])) (facts "rsa private key" (fact "non encrypt key" @@ -27,10 +27,5 @@ ) (fact "encrypted key with wrong pass phrase" (type (rsa-public-key "test/files/rsa/3des.key" "wrong pass phrase")) - => (throws org.bouncycastle.openssl.EncryptionException) - ) - ) - - - + => (throws org.bouncycastle.openssl.EncryptionException))) diff --git a/test/jwt/sign_test.clj b/test/clj_jwt/sign_test.clj similarity index 89% rename from test/jwt/sign_test.clj rename to test/clj_jwt/sign_test.clj index 2174407..f4eec23 100644 --- a/test/jwt/sign_test.clj +++ b/test/clj_jwt/sign_test.clj @@ -1,9 +1,9 @@ -(ns jwt.sign-test +(ns clj-jwt.sign-test (:require - [jwt.sign :refer :all] - [jwt.base64 :refer [url-safe-encode-str]] - [jwt.rsa.key :refer [rsa-private-key]] - [midje.sweet :refer :all])) + [clj-jwt.sign :refer :all] + [clj-jwt.base64 :refer [url-safe-encode-str]] + [clj-jwt.rsa.key :refer [rsa-private-key]] + [midje.sweet :refer :all])) (facts "HMAC" (let [[hs256 hs384 hs512] (map get-signature-fn [:HS256 :HS384 :HS512])