Decoupled models into a separate package. Plus more refactoring.

Author: RichardKnop

Godeps/Godeps.json

@@ -1,18 +1,13 @@
 package cmd
 
 import (
-	"log"
-
-	"github.com/RichardKnop/go-oauth2-server/migrations"
-	"github.com/RichardKnop/go-oauth2-server/oauth"
+	"github.com/RichardKnop/go-oauth2-server/models"
+	"github.com/RichardKnop/go-oauth2-server/util/migrations"
 )
 
 // Migrate runs database migrations
 func Migrate() error {
 	_, db, err := initConfigDB(true, false)
-	log.Print(db)
-	log.Print("NFIOANFUWA")
-	log.Print(err)
 	if err != nil {
 		return err
 	}
@@ -24,7 +19,7 @@ func Migrate() error {
 	}
 
 	// Run migrations for the oauth service
-	if err := oauth.MigrateAll(db); err != nil {
+	if err := models.MigrateAll(db); err != nil {
 		return err
 	}
 

cmd/migrate.go

@@ -2,7 +2,7 @@ package health
 
 import (
 	"github.com/gorilla/mux"
-	"github.com/RichardKnop/go-oauth2-server/routes"
+	"github.com/RichardKnop/go-oauth2-server/util/routes"
 )
 
 // RegisterRoutes registers route handlers for the health service

health/routes.go

@@ -2,7 +2,7 @@ package health
 
 import (
 	"github.com/gorilla/mux"
-	"github.com/RichardKnop/go-oauth2-server/routes"
+	"github.com/RichardKnop/go-oauth2-server/util/routes"
 )
 
 // ServiceInterface defines exported methods

health/service_interface.go

@@ -0,0 +1,24 @@
+package models
+
+import (
+	"time"
+
+	"github.com/jinzhu/gorm"
+)
+
+// TimestampModel ...
+type TimestampModel struct {
+	CreatedAt time.Time
+	UpdatedAt time.Time
+	DeletedAt *time.Time
+}
+
+// EmailTokenModel is an abstract model which can be used for objects from which
+// we derive redirect emails (email confirmation, password reset and such)
+type EmailTokenModel struct {
+	gorm.Model
+	Reference   string `sql:"type:varchar(40);unique;not null"`
+	EmailSent   bool   `sql:"index;not null"`
+	EmailSentAt *time.Time
+	ExpiresAt   time.Time `sql:"index;not null"`
+}

models/common.go

@@ -1,16 +1,16 @@
-package oauth
+package models
 
 import (
 	"fmt"
 
+	"github.com/RichardKnop/go-oauth2-server/util/migrations"
 	"github.com/jinzhu/gorm"
-	"github.com/RichardKnop/go-oauth2-server/migrations"
 )
 
 var (
 	list = []migrations.MigrationStage{
 		{
-			Name:     "oauth_initial",
+			Name:     "initial",
 			Function: migrate0001,
 		},
 	}
@@ -22,77 +22,81 @@ func MigrateAll(db *gorm.DB) error {
 }
 
 func migrate0001(db *gorm.DB, name string) error {
+	//-------------
+	// OAUTH models
+	//-------------
+
 	// Create tables
-	if err := db.CreateTable(new(Client)).Error; err != nil {
+	if err := db.CreateTable(new(OauthClient)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_clients table: %s", err)
 	}
-	if err := db.CreateTable(new(Scope)).Error; err != nil {
+	if err := db.CreateTable(new(OauthScope)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_scopes table: %s", err)
 	}
-	if err := db.CreateTable(new(Role)).Error; err != nil {
+	if err := db.CreateTable(new(OauthRole)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_roles table: %s", err)
 	}
-	if err := db.CreateTable(new(User)).Error; err != nil {
+	if err := db.CreateTable(new(OauthUser)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_users table: %s", err)
 	}
-	if err := db.CreateTable(new(RefreshToken)).Error; err != nil {
+	if err := db.CreateTable(new(OauthRefreshToken)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_refresh_tokens table: %s", err)
 	}
-	if err := db.CreateTable(new(AccessToken)).Error; err != nil {
+	if err := db.CreateTable(new(OauthAccessToken)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_access_tokens table: %s", err)
 	}
-	if err := db.CreateTable(new(AuthorizationCode)).Error; err != nil {
+	if err := db.CreateTable(new(OauthAuthorizationCode)).Error; err != nil {
 		return fmt.Errorf("Error creating oauth_authorization_codes table: %s", err)
 	}
-	err := db.Model(new(User)).AddForeignKey(
+	err := db.Model(new(OauthUser)).AddForeignKey(
 		"role_id", "oauth_roles(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_users.role_id for oauth_roles(id): %s", err)
 	}
-	err = db.Model(new(RefreshToken)).AddForeignKey(
+	err = db.Model(new(OauthRefreshToken)).AddForeignKey(
 		"client_id", "oauth_clients(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_refresh_tokens.client_id for oauth_clients(id): %s", err)
 	}
-	err = db.Model(new(RefreshToken)).AddForeignKey(
+	err = db.Model(new(OauthRefreshToken)).AddForeignKey(
 		"user_id", "oauth_users(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_refresh_tokens.user_id for oauth_users(id): %s", err)
 	}
-	err = db.Model(new(AccessToken)).AddForeignKey(
+	err = db.Model(new(OauthAccessToken)).AddForeignKey(
 		"client_id", "oauth_clients(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_access_tokens.client_id for oauth_clients(id): %s", err)
 	}
-	err = db.Model(new(AccessToken)).AddForeignKey(
+	err = db.Model(new(OauthAccessToken)).AddForeignKey(
 		"user_id", "oauth_users(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_access_tokens.user_id for oauth_users(id): %s", err)
 	}
-	err = db.Model(new(AuthorizationCode)).AddForeignKey(
+	err = db.Model(new(OauthAuthorizationCode)).AddForeignKey(
 		"client_id", "oauth_clients(id)",
 		"RESTRICT", "RESTRICT",
 	).Error
 	if err != nil {
 		return fmt.Errorf("Error creating foreign key on "+
 			"oauth_authorization_codes.client_id for oauth_clients(id): %s", err)
 	}
-	err = db.Model(new(AuthorizationCode)).AddForeignKey(
+	err = db.Model(new(OauthAuthorizationCode)).AddForeignKey(
 		"user_id", "oauth_users(id)",
 		"RESTRICT", "RESTRICT",
 	).Error