Add extra data from token introspection to session

ory · Nov 28, 2017 · ce8f9f2 · ce8f9f2
1 parent 73994b8
commit ce8f9f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/evaluator/evaluator_warden.go b/evaluator/evaluator_warden.go
@@ -161,6 +161,7 @@ func (d *WardenEvaluator) EvaluateAccessRequest(r *http.Request) (*Session, erro
 			User:      introspection.Sub,
 			ClientID:  introspection.ClientId,
 			Anonymous: false,
+			Extra:     introspection.Ext,
 		}, nil
 	case rule.AuthenticatedMode:
 		if token == "" {
@@ -229,6 +230,7 @@ func (d *WardenEvaluator) EvaluateAccessRequest(r *http.Request) (*Session, erro
 			User:      introspection.Sub,
 			ClientID:  introspection.ClientId,
 			Anonymous: false,
+			Extra:     introspection.Ext,
 		}, nil
 	case rule.PolicyMode:
 		if token == "" {
@@ -297,6 +299,7 @@ func (d *WardenEvaluator) EvaluateAccessRequest(r *http.Request) (*Session, erro
 			User:      introspection.Subject,
 			ClientID:  introspection.ClientId,
 			Anonymous: false,
+			Extra:     introspection.AccessTokenExtra,
 		}, nil
 	default:
 		d.Logger.WithError(err).

diff --git a/evaluator/session.go b/evaluator/session.go
@@ -8,11 +8,12 @@ import (
 )
 
 type Session struct {
-	User      string `json:"user"`
-	Anonymous bool   `json:"anonymous"`
-	Disabled  bool   `json:"disabled"`
-	ClientID  string `json:"clientId"`
-	Issuer    string `json:"issuer"`
+	User      string      `json:"user"`
+	Anonymous bool        `json:"anonymous"`
+	Disabled  bool        `json:"disabled"`
+	ClientID  string      `json:"clientId"`
+	Issuer    string      `json:"issuer"`
+	Extra     interface{} `json:"extra"`
 }
 
 func (s *Session) ToClaims() jwt.MapClaims {
@@ -25,5 +26,6 @@ func (s *Session) ToClaims() jwt.MapClaims {
 		"anon": s.Anonymous,
 		"aud":  s.ClientID,
 		"jti":  uuid.New(),
+		"ext":  s.Extra,
 	}
 }