Removed oauth_users.meta_user_id column (not needed/used) and fixed introspect endpoint.

Author: RichardKnop

Makefile

@@ -1,4 +1,4 @@
-.PHONY: update-deps install-deps fmt lint golint test test-with-coverage
+.PHONY: fmt lint golint test test-with-coverage
 # TODO: When Go 1.9 is released vendor folder should be ignored automatically
 PACKAGES=`go list ./... | grep -v vendor | grep -v mocks`
 

README.md

@@ -123,7 +123,7 @@ The authorization server authenticates the client, validates the authorization c
 
 ```json
 {
-  "user_id": 1,
+  "user_id": "1",
   "access_token": "00ccd40e-72ca-4e79-a4b6-67c95e2e3f1c",
   "expires_in": 3600,
   "token_type": "Bearer",
@@ -252,7 +252,7 @@ The client requests an access token from the authorization server's token endpoi
 curl --compressed -v localhost:8080/v1/oauth/tokens \
 	-u test_client_1:test_secret \
 	-d "grant_type=password" \
-	-d "username=test@username" \
+	-d "username=test@user" \
 	-d "password=test_password" \
 	-d "scope=read_write"
 ```
@@ -261,7 +261,7 @@ The authorization server authenticates the client and validates the resource own
 
 ```json
 {
-  "user_id": 1,
+  "user_id": "1",
   "access_token": "00ccd40e-72ca-4e79-a4b6-67c95e2e3f1c",
   "expires_in": 3600,
   "token_type": "Bearer",
@@ -334,7 +334,7 @@ If valid and authorized, the authorization server issues an access token.
 
 ```json
 {
-  "user_id": 1,
+  "user_id": "1",
   "access_token": "1f962bd5-7890-435d-b619-584b6aa32e6c",
   "expires_in": 3600,
   "token_type": "Bearer",

models/oauth.go

@@ -50,11 +50,10 @@ func (r *OauthRole) TableName() string {
 // OauthUser ...
 type OauthUser struct {
 	MyGormModel
-	RoleID     sql.NullString `sql:"type:varchar(20);index;not null"`
-	Role       *OauthRole
-	Username   string         `sql:"type:varchar(254);unique;not null"`
-	Password   sql.NullString `sql:"type:varchar(60)"`
-	MetaUserID string         `sql:"index"`
+	RoleID   sql.NullString `sql:"type:varchar(20);index;not null"`
+	Role     *OauthRole
+	Username string         `sql:"type:varchar(254);unique;not null"`
+	Password sql.NullString `sql:"type:varchar(60)"`
 }
 
 // TableName specifies table name

oauth/fixtures/test_users.yml

@@ -11,7 +11,6 @@
     role_id: 'superuser'
     username: 'test@superuser'
     password: '$2a$10$4J4t9xuWhOKhfjN0bOKNReS9sL3BVSN9zxIr2.VaWWQfRBWh1dQIS'
-    meta_user_id: "1"
     created_at: 'ON_INSERT_NOW()'
     updated_at: 'ON_UPDATE_NOW()'
 
@@ -22,7 +21,6 @@
     role_id: 'user'
     username: 'test@user'
     password: '$2a$10$4J4t9xuWhOKhfjN0bOKNReS9sL3BVSN9zxIr2.VaWWQfRBWh1dQIS'
-    meta_user_id: "2"
     created_at: 'ON_INSERT_NOW()'
     updated_at: 'ON_UPDATE_NOW()'
 
@@ -33,6 +31,5 @@
     role_id: 'user'
     username: 'test@user2'
     password: '$2a$10$4J4t9xuWhOKhfjN0bOKNReS9sL3BVSN9zxIr2.VaWWQfRBWh1dQIS'
-    meta_user_id: "3"
     created_at: 'ON_INSERT_NOW()'
     updated_at: 'ON_UPDATE_NOW()'

oauth/grant_type_authorization_code_test.go

@@ -178,7 +178,7 @@ func (suite *OauthTestSuite) TestAuthorizationCodeGrant() {
 
 	// Check the response
 	expected := &oauth.AccessTokenResponse{
-		UserID:       accessToken.User.MetaUserID,
+		UserID:       accessToken.UserID.String,
 		AccessToken:  accessToken.Token,
 		ExpiresIn:    3600,
 		TokenType:    tokentypes.Bearer,

oauth/grant_type_password_test.go

@@ -38,7 +38,7 @@ func (suite *OauthTestSuite) TestPasswordGrant() {
 
 	// Check the response
 	expected := &oauth.AccessTokenResponse{
-		UserID:       accessToken.User.MetaUserID,
+		UserID:       accessToken.UserID.String,
 		AccessToken:  accessToken.Token,
 		ExpiresIn:    3600,
 		TokenType:    tokentypes.Bearer,

oauth/grant_type_refresh_token_test.go

@@ -171,7 +171,7 @@ func (suite *OauthTestSuite) TestRefreshTokenGrantDefaultsToOriginalScope() {
 
 	// Check the response body
 	expected := &oauth.AccessTokenResponse{
-		UserID:       accessToken.User.MetaUserID,
+		UserID:       accessToken.UserID.String,
 		AccessToken:  accessToken.Token,
 		ExpiresIn:    3600,
 		TokenType:    tokentypes.Bearer,
@@ -217,7 +217,7 @@ func (suite *OauthTestSuite) TestRefreshTokenGrant() {
 
 	// Check the response
 	expected := &oauth.AccessTokenResponse{
-		UserID:       accessToken.User.MetaUserID,
+		UserID:       accessToken.UserID.String,
 		AccessToken:  accessToken.Token,
 		ExpiresIn:    3600,
 		TokenType:    tokentypes.Bearer,

oauth/response.go

@@ -32,8 +32,8 @@ func NewAccessTokenResponse(accessToken *models.OauthAccessToken, refreshToken *
 		TokenType:   theTokenType,
 		Scope:       accessToken.Scope,
 	}
-	if accessToken.User != nil {
-		response.UserID = accessToken.User.MetaUserID
+	if accessToken.UserID.Valid {
+		response.UserID = accessToken.UserID.String
 	}
 	if refreshToken != nil {
 		response.RefreshToken = refreshToken.Token