Merge pull request #78 from vapor/beta

jwt beta
vapor · Feb 28, 2018 · f912bda · f912bda
2 parents 43a184c + c3cb06e
commit f912bda
Show file tree

Hide file tree

Showing 45 changed files with 635 additions and 1,592 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,17 @@
+// swift-tools-version:4.0
 import PackageDescription
 
 let package = Package(
     name: "JWT",
+    products: [
+        .library(name: "JWT", targets: ["JWT"]),
+    ],
     dependencies: [
-        .Package(url: "https://github.com/vapor/crypto.git", majorVersion: 2),
-        .Package(url: "https://github.com/vapor/json.git", majorVersion: 2),
+        // 🔑 Hashing (BCrypt, SHA, HMAC, etc), encryption, and randomness.
+        .package(url: "https://github.com/vapor/crypto.git", from: "3.0.0-rc"),
     ],
-    exclude: [
-        "Playground"
+    targets: [
+        .target(name: "JWT", dependencies: ["Crypto"]),
+        .testTarget(name: "JWTTests", dependencies: ["JWT"]),
     ]
 )
diff --git a/[email protected] b/[email protected]
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 <p align="center">
-    <img src="https://cloud.githubusercontent.com/assets/1342803/24798188/0915659c-1b95-11e7-9a99-7c75d760c904.png" width="320" alt="JWT">
+    <img src="https://user-images.githubusercontent.com/1342803/36768561-e10bba90-1c0d-11e8-85b5-f9d1e605cc8a.png" height="64" alt="JWT">
     <br>
     <br>
-    <a href="https://docs.vapor.codes/2.0/jwt/package/">
-        <img src="http://img.shields.io/badge/read_the-docs-92A8D1.svg" alt="Documentation">
+    <a href="https://docs.vapor.codes/3.0/jwt/getting-started/">
+        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="http://vapor.team">
         <img src="http://vapor.team/badge.svg" alt="Slack Team">
@@ -15,6 +15,12 @@
         <img src="https://circleci.com/gh/vapor/jwt.svg?style=shield" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
-        <img src="http://img.shields.io/badge/swift-3.1-brightgreen.svg" alt="Swift 3.1">
+        <img src="http://img.shields.io/badge/swift-4.1-brightgreen.svg" alt="Swift 4.1">
     </a>
 </p>
+
+<hr>
+
+**Original author**
+
+- Siemen Sikkema, [@siemensikkema](http://github.com/siemensikkema)  
diff --git a/Sources/JWT/Claims/AudienceClaim.swift b/Sources/JWT/Claims/AudienceClaim.swift
diff --git a/Sources/JWT/Claims/Claim.swift b/Sources/JWT/Claims/Claim.swift
diff --git a/Sources/JWT/Claims/EqualityClaim.swift b/Sources/JWT/Claims/EqualityClaim.swift
diff --git a/Sources/JWT/Claims/ExpirationTimeClaim.swift b/Sources/JWT/Claims/ExpirationTimeClaim.swift
diff --git a/Sources/JWT/Claims/IssuedAtClaim.swift b/Sources/JWT/Claims/IssuedAtClaim.swift
diff --git a/Sources/JWT/Claims/IssuerClaim.swift b/Sources/JWT/Claims/IssuerClaim.swift
diff --git a/Sources/JWT/Claims/JWTIDClaim.swift b/Sources/JWT/Claims/JWTIDClaim.swift
diff --git a/Sources/JWT/Claims/NotBeforeClaim.swift b/Sources/JWT/Claims/NotBeforeClaim.swift
diff --git a/Sources/JWT/Claims/SubjectClaim.swift b/Sources/JWT/Claims/SubjectClaim.swift
diff --git a/Sources/JWT/Claims/TimeBasedClaim.swift b/Sources/JWT/Claims/TimeBasedClaim.swift
diff --git a/Sources/JWT/ClaimsVerifiable.swift b/Sources/JWT/ClaimsVerifiable.swift
diff --git a/Sources/JWT/Exports.swift b/Sources/JWT/Exports.swift
diff --git a/Sources/JWT/Headers/AlgorithmHeader.swift b/Sources/JWT/Headers/AlgorithmHeader.swift
diff --git a/Sources/JWT/Headers/Header.swift b/Sources/JWT/Headers/Header.swift
diff --git a/Sources/JWT/Headers/KeyIDHeader.swift b/Sources/JWT/Headers/KeyIDHeader.swift
diff --git a/Sources/JWT/Headers/TypeHeader.swift b/Sources/JWT/Headers/TypeHeader.swift