From 791c1b6d6b36946521b214b8c8b8b5ef15342832 Mon Sep 17 00:00:00 2001
From: Bevan Hunt <bevan@bevanhunt.com>
Date: Fri, 30 Apr 2021 17:57:04 -0700
Subject: [PATCH] add scopes to verify endpoint

---
 CHANGELOG.md | 5 +++++
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 src/main.rs  | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82318d4..b0a3ef6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [15.1.0] - 2021-04-30
+
+### Added
+- scopes to verify endpoint
+
 ## [15.0.0] - 2021-04-16
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index 6ee3288..e6b8eb0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -543,7 +543,7 @@ dependencies = [
 
 [[package]]
 name = "broker"
-version = "15.0.0"
+version = "15.1.0"
 dependencies = [
  "anyhow",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index b6b50d5..d70f1c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "broker"
-version = "15.0.0"
+version = "15.1.0"
 authors = ["Bevan Hunt <bevan@bevanhunt.com>"]
 edition = "2018"
 license = "MIT"
diff --git a/src/main.rs b/src/main.rs
index c25b607..4dfc1bf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -318,7 +318,7 @@ fn jwt_aud(scopes: Vec<String>, exp: i64, username: String) -> Result<Option<Str
 
     let mut builder = Biscuit::builder(&biscuit_root);
 
-    for scope in scopes {
+    for scope in scopes.clone() {
         let mut parts = scope.split(":");
         let first = parts.next().unwrap_or_else(|| "INTERNAL_ERROR");
         let second = parts.next().unwrap_or_else(|| "INTERNAL_ERROR");
@@ -331,7 +331,7 @@ fn jwt_aud(scopes: Vec<String>, exp: i64, username: String) -> Result<Option<Str
     }
     
     let biscuit = builder.build()?;
-    Ok(Some(json!({"key": public_key_bytes, "token": biscuit.to_vec()?, "expiry": exp, "username": username}).to_string()))
+    Ok(Some(json!({"key": public_key_bytes, "token": biscuit.to_vec()?, "expiry": exp, "username": username, "scopes": scopes}).to_string()))
 }
 
 fn user_create(user_form: UserForm) -> Result<Option<String>> {