Update bcrypt dependency and code moved to gophish group

README.md

@@ -1,4 +1,4 @@
-![gophish logo](https://raw.github.com/jordan-wright/gophish/master/static/images/gophish_purple.png)
+![gophish logo](https://raw.github.com/gophish/gophish/master/static/images/gophish_purple.png)
 
 gophish
 =======
@@ -34,7 +34,7 @@ Documentation is a work in progress. Existing documentation can be found on our
 
 ###Issues
 
-Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/jordan-wright/gophish/issues/new) and we'll get right on it.
+Find a bug? Want more features? Find something missing in the documentation? Let us know! Please don't hesitate to [file an issue](https://github.com/gophish/gophish/issues/new) and we'll get right on it.
 
 ###License
 ```

auth/auth.go

@@ -9,11 +9,11 @@ import (
 
 	"crypto/rand"
 
-	"code.google.com/p/go.crypto/bcrypt"
+	"golang.org/x/crypto/bcrypt"
 	ctx "github.com/gorilla/context"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/models"
 )
 
 //init registers the necessary models to be saved in the session later

controllers/api.go

@@ -14,10 +14,10 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/jinzhu/gorm"
 	"github.com/jordan-wright/email"
-	"github.com/jordan-wright/gophish/auth"
-	"github.com/jordan-wright/gophish/models"
-	"github.com/jordan-wright/gophish/util"
-	"github.com/jordan-wright/gophish/worker"
+	"github.com/gophish/gophish/auth"
+	"github.com/gophish/gophish/models"
+	"github.com/gophish/gophish/util"
+	"github.com/gophish/gophish/worker"
 )
 
 // Worker is the worker that processes phishing events and updates campaigns.

controllers/api_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"github.com/gorilla/handlers"
-	"github.com/jordan-wright/gophish/config"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/config"
+	"github.com/gophish/gophish/models"
 	"github.com/stretchr/testify/suite"
 )
 

controllers/route.go

@@ -11,9 +11,9 @@ import (
 	ctx "github.com/gorilla/context"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
-	"github.com/jordan-wright/gophish/auth"
-	mid "github.com/jordan-wright/gophish/middleware"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/auth"
+	mid "github.com/gophish/gophish/middleware"
+	"github.com/gophish/gophish/models"
 	"github.com/justinas/nosurf"
 )
 

gophish.go

@@ -32,9 +32,9 @@ import (
 	"os"
 
 	"github.com/gorilla/handlers"
-	"github.com/jordan-wright/gophish/config"
-	"github.com/jordan-wright/gophish/controllers"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/config"
+	"github.com/gophish/gophish/controllers"
+	"github.com/gophish/gophish/models"
 )
 
 var Logger = log.New(os.Stdout, " ", log.Ldate|log.Ltime|log.Lshortfile)

middleware/middleware.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	ctx "github.com/gorilla/context"
-	"github.com/jordan-wright/gophish/auth"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/auth"
+	"github.com/gophish/gophish/models"
 )
 
 // GetContext wraps each request in a function which fills in the context for a given request.

models/models.go

@@ -6,7 +6,7 @@ import (
 	"os"
 
 	"github.com/jinzhu/gorm"
-	"github.com/jordan-wright/gophish/config"
+	"github.com/gophish/gophish/config"
 	_ "github.com/mattn/go-sqlite3" // Blank import needed to import sqlite3
 )
 

models/models_test.go

@@ -3,7 +3,7 @@ package models
 import (
 	"testing"
 
-	"github.com/jordan-wright/gophish/config"
+	"github.com/gophish/gophish/config"
 	"gopkg.in/check.v1"
 )
 

templates/gophish.apib

@@ -4,7 +4,7 @@ HOST: http://localhost:3333/api/
 # Gophish API
 Gophish was built from the ground-up with a JSON API that makes it easy for developers and sysadmins to automate simulated phishing campaigns.
 
-These docs describe how to use the [gophish](https://github.com/jordan-wright/gophish) API.
+These docs describe how to use the [gophish](https://github.com/gophish/gophish) API.
 
 ::: note
 ## Authorization

util/util.go

@@ -9,7 +9,7 @@ import (
 	"net/mail"
 
 	"github.com/jordan-wright/email"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/models"
 )
 
 // ParseMail takes in an HTTP Request and returns an Email object

worker/worker.go

@@ -10,7 +10,7 @@ import (
 	"text/template"
 
 	"github.com/jordan-wright/email"
-	"github.com/jordan-wright/gophish/models"
+	"github.com/gophish/gophish/models"
 )
 
 // Logger is the logger for the worker