Merge branch 'main' of https://github.com/authorizerdev/authorizer

lakhansamani · lakhansamani · commit abc2991e1c51 · 2021-10-27T23:16:15.000+05:30
diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,11 @@
 # Task List
 
+## Feature Multiple sessions
+
+- Multiple sessions for users to login use hMset from redis for this
+  user_id access_token1 long_live_token1
+  user_id access_token2 long_live_token2
+
 # Feature roles
 
 For the first version we will only support setting roles master list via env
diff --git a/server/db/db.go b/server/db/db.go
@@ -27,6 +27,7 @@ type Manager interface {
 	GetVerificationByEmail(email string) (VerificationRequest, error)
 	DeleteUser(email string) error
 	SaveRoles(roles []Role) error
+	SaveSession(session Session) error
 }
 
 type manager struct {
@@ -56,7 +57,7 @@ func InitDB() {
 	if err != nil {
 		log.Fatal("Failed to init db:", err)
 	} else {
-		db.AutoMigrate(&User{}, &VerificationRequest{}, &Role{})
+		db.AutoMigrate(&User{}, &VerificationRequest{}, &Role{}, &Session{})
 	}
 
 	Mgr = &manager{db: db}
diff --git a/server/db/session.go b/server/db/session.go
@@ -0,0 +1,39 @@
+package db
+
+import (
+	"log"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+type Session struct {
+	ID        uuid.UUID `gorm:"type:uuid;"`
+	UserID    uuid.UUID `gorm:"type:uuid;"`
+	User      User
+	UserAgent string
+	IP        string
+	CreatedAt int64 `gorm:"autoCreateTime"`
+	UpdatedAt int64 `gorm:"autoUpdateTime"`
+}
+
+func (r *Session) BeforeCreate(tx *gorm.DB) (err error) {
+	r.ID = uuid.New()
+
+	return
+}
+
+// SaveSession function to save user sessiosn
+func (mgr *manager) SaveSession(session Session) error {
+	res := mgr.db.Clauses(
+		clause.OnConflict{
+			DoNothing: true,
+		}).Create(&session)
+	if res.Error != nil {
+		log.Println(`Error saving session`, res.Error)
+		return res.Error
+	}
+
+	return nil
+}
diff --git a/server/db/verificationRequests.go b/server/db/verificationRequests.go
@@ -30,6 +30,7 @@ func (mgr *manager) AddVerification(verification VerificationRequest) (Verificat
 		Columns:   []clause.Column{{Name: "email"}},
 		DoUpdates: clause.AssignmentColumns([]string{"token", "identifier", "expires_at"}),
 	}).Create(&verification)
+
 	if result.Error != nil {
 		log.Println(`Error saving verification record`, result.Error)
 		return verification, result.Error
diff --git a/server/handlers/oauthCallback.go b/server/handlers/oauthCallback.go
@@ -147,11 +147,11 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 		provider := c.Param("oauth_provider")
 		state := c.Request.FormValue("state")
 
-		sessionState := session.GetToken(state)
+		sessionState := session.GetSocailLoginState(state)
 		if sessionState == "" {
 			c.JSON(400, gin.H{"error": "invalid oauth state"})
 		}
-		session.DeleteToken(sessionState)
+		session.RemoveSocialLoginState(state)
 		// contains random token, redirect url, role
 		sessionSplit := strings.Split(state, "___")
 
@@ -254,7 +254,16 @@ func OAuthCallbackHandler() gin.HandlerFunc {
 
 		accessToken, _, _ := utils.CreateAuthToken(user, enum.AccessToken, inputRoles)
 		utils.SetCookie(c, accessToken)
-		session.SetToken(userIdStr, refreshToken)
+		session.SetToken(userIdStr, accessToken, refreshToken)
+		go func() {
+			sessionData := db.Session{
+				UserID:    user.ID,
+				UserAgent: utils.GetUserAgent(c.Request),
+				IP:        utils.GetIP(c.Request),
+			}
+
+			db.Mgr.SaveSession(sessionData)
+		}()
 
 		c.Redirect(http.StatusTemporaryRedirect, redirectURL)
 	}
diff --git a/server/handlers/oauthLogin.go b/server/handlers/oauthLogin.go
@@ -51,18 +51,18 @@ func OAuthLoginHandler() gin.HandlerFunc {
 
 		switch provider {
 		case enum.Google.String():
-			session.SetToken(oauthStateString, enum.Google.String())
+			session.SetSocailLoginState(oauthStateString, enum.Google.String())
 			// during the init of OAuthProvider authorizer url might be empty
 			oauth.OAuthProvider.GoogleConfig.RedirectURL = constants.AUTHORIZER_URL + "/oauth_callback/google"
 			url := oauth.OAuthProvider.GoogleConfig.AuthCodeURL(oauthStateString)
 			c.Redirect(http.StatusTemporaryRedirect, url)
 		case enum.Github.String():
-			session.SetToken(oauthStateString, enum.Github.String())
+			session.SetSocailLoginState(oauthStateString, enum.Github.String())
 			oauth.OAuthProvider.GithubConfig.RedirectURL = constants.AUTHORIZER_URL + "/oauth_callback/github"
 			url := oauth.OAuthProvider.GithubConfig.AuthCodeURL(oauthStateString)
 			c.Redirect(http.StatusTemporaryRedirect, url)
 		case enum.Facebook.String():
-			session.SetToken(oauthStateString, enum.Github.String())
+			session.SetSocailLoginState(oauthStateString, enum.Facebook.String())
 			oauth.OAuthProvider.FacebookConfig.RedirectURL = constants.AUTHORIZER_URL + "/oauth_callback/facebook"
 			url := oauth.OAuthProvider.FacebookConfig.AuthCodeURL(oauthStateString)
 			c.Redirect(http.StatusTemporaryRedirect, url)
diff --git a/server/handlers/verifyEmail.go b/server/handlers/verifyEmail.go
@@ -56,7 +56,16 @@ func VerifyEmailHandler() gin.HandlerFunc {
 
 		accessToken, _, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)
 
-		session.SetToken(userIdStr, refreshToken)
+		session.SetToken(userIdStr, accessToken, refreshToken)
+		go func() {
+			sessionData := db.Session{
+				UserID:    user.ID,
+				UserAgent: utils.GetUserAgent(c.Request),
+				IP:        utils.GetIP(c.Request),
+			}
+
+			db.Mgr.SaveSession(sessionData)
+		}()
 		utils.SetCookie(c, accessToken)
 		c.Redirect(http.StatusTemporaryRedirect, claim.Host)
 	}
diff --git a/server/resolvers/adminUpdateUser.go b/server/resolvers/adminUpdateUser.go
@@ -60,7 +60,7 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 			return res, fmt.Errorf("user with this email address already exists")
 		}
 
-		session.DeleteToken(fmt.Sprintf("%v", user.ID))
+		session.DeleteUserSession(fmt.Sprintf("%v", user.ID))
 		utils.DeleteCookie(gc)
 
 		user.Email = newEmail
@@ -100,7 +100,7 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m
 			rolesToSave = strings.Join(inputRoles, ",")
 		}
 
-		session.DeleteToken(fmt.Sprintf("%v", user.ID))
+		session.DeleteUserSession(fmt.Sprintf("%v", user.ID))
 		utils.DeleteCookie(gc)
 	}
 
diff --git a/server/resolvers/deleteUser.go b/server/resolvers/deleteUser.go
@@ -27,7 +27,7 @@ func DeleteUser(ctx context.Context, params model.DeleteUserInput) (*model.Respo
 		return res, err
 	}
 
-	session.DeleteToken(fmt.Sprintf("%x", user.ID))
+	session.DeleteUserSession(fmt.Sprintf("%x", user.ID))
 
 	err = db.Mgr.DeleteUser(params.Email)
 	if err != nil {
diff --git a/server/resolvers/login.go b/server/resolvers/login.go
@@ -60,7 +60,16 @@ func Login(ctx context.Context, params model.LoginInput) (*model.AuthResponse, e
 
 	accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)
 
-	session.SetToken(userIdStr, refreshToken)
+	session.SetToken(userIdStr, accessToken, refreshToken)
+	go func() {
+		sessionData := db.Session{
+			UserID:    user.ID,
+			UserAgent: utils.GetUserAgent(gc.Request),
+			IP:        utils.GetIP(gc.Request),
+		}
+
+		db.Mgr.SaveSession(sessionData)
+	}()
 
 	res = &model.AuthResponse{
 		Message:              `Logged in successfully`,
diff --git a/server/resolvers/logout.go b/server/resolvers/logout.go
@@ -27,7 +27,7 @@ func Logout(ctx context.Context) (*model.Response, error) {
 	}
 
 	userId := fmt.Sprintf("%v", claim["id"])
-	session.DeleteToken(userId)
+	session.DeleteToken(userId, token)
 	res = &model.Response{
 		Message: "Logged out successfully",
 	}
diff --git a/server/resolvers/profile.go b/server/resolvers/profile.go
@@ -30,7 +30,7 @@ func Profile(ctx context.Context) (*model.User, error) {
 
 	userID := fmt.Sprintf("%v", claim["id"])
 	email := fmt.Sprintf("%v", claim["email"])
-	sessionToken := session.GetToken(userID)
+	sessionToken := session.GetToken(userID, token)
 
 	if sessionToken == "" {
 		return res, fmt.Errorf(`unauthorized`)
diff --git a/server/resolvers/signup.go b/server/resolvers/signup.go
@@ -127,7 +127,16 @@ func Signup(ctx context.Context, params model.SignUpInput) (*model.AuthResponse,
 
 		accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)
 
-		session.SetToken(userIdStr, refreshToken)
+		session.SetToken(userIdStr, accessToken, refreshToken)
+		go func() {
+			sessionData := db.Session{
+				UserID:    user.ID,
+				UserAgent: utils.GetUserAgent(gc.Request),
+				IP:        utils.GetIP(gc.Request),
+			}
+
+			db.Mgr.SaveSession(sessionData)
+		}()
 		res = &model.AuthResponse{
 			Message:              `Signed up successfully.`,
 			AccessToken:          &accessToken,
diff --git a/server/resolvers/token.go b/server/resolvers/token.go
@@ -37,7 +37,7 @@ func Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
 
 	userIdStr := fmt.Sprintf("%v", user.ID)
 
-	sessionToken := session.GetToken(userIdStr)
+	sessionToken := session.GetToken(userIdStr, token)
 
 	if sessionToken == "" {
 		return res, fmt.Errorf(`unauthorized`)
@@ -63,7 +63,19 @@ func Token(ctx context.Context, roles []string) (*model.AuthResponse, error) {
 	if accessTokenErr != nil || expiresTimeObj.Sub(currentTimeObj).Minutes() <= 5 {
 		// if access token has expired and refresh/session token is valid
 		// generate new accessToken
+		currentRefreshToken := session.GetToken(userIdStr, token)
+		session.DeleteToken(userIdStr, token)
 		token, expiresAt, _ = utils.CreateAuthToken(user, enum.AccessToken, claimRoles)
+		session.SetToken(userIdStr, token, currentRefreshToken)
+		go func() {
+			sessionData := db.Session{
+				UserID:    user.ID,
+				UserAgent: utils.GetUserAgent(gc.Request),
+				IP:        utils.GetIP(gc.Request),
+			}
+
+			db.Mgr.SaveSession(sessionData)
+		}()
 	}
 
 	utils.SetCookie(gc, token)
diff --git a/server/resolvers/updateProfile.go b/server/resolvers/updateProfile.go
@@ -33,7 +33,7 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 	}
 
 	id := fmt.Sprintf("%v", claim["id"])
-	sessionToken := session.GetToken(id)
+	sessionToken := session.GetToken(id, token)
 
 	if sessionToken == "" {
 		return res, fmt.Errorf(`unauthorized`)
@@ -99,7 +99,7 @@ func UpdateProfile(ctx context.Context, params model.UpdateProfileInput) (*model
 			return res, fmt.Errorf("user with this email address already exists")
 		}
 
-		session.DeleteToken(fmt.Sprintf("%v", user.ID))
+		session.DeleteUserSession(fmt.Sprintf("%v", user.ID))
 		utils.DeleteCookie(gc)
 
 		user.Email = newEmail
diff --git a/server/resolvers/verifyEmail.go b/server/resolvers/verifyEmail.go
@@ -47,7 +47,16 @@ func VerifyEmail(ctx context.Context, params model.VerifyEmailInput) (*model.Aut
 
 	accessToken, expiresAt, _ := utils.CreateAuthToken(user, enum.AccessToken, roles)
 
-	session.SetToken(userIdStr, refreshToken)
+	session.SetToken(userIdStr, accessToken, refreshToken)
+	go func() {
+		sessionData := db.Session{
+			UserID:    user.ID,
+			UserAgent: utils.GetUserAgent(gc.Request),
+			IP:        utils.GetIP(gc.Request),
+		}
+
+		db.Mgr.SaveSession(sessionData)
+	}()
 
 	res = &model.AuthResponse{
 		Message:              `Email verified successfully.`,
diff --git a/server/session/inMemoryStore.go b/server/session/inMemoryStore.go
@@ -1,41 +1,88 @@
 package session
 
-import "sync"
+import (
+	"log"
+	"sync"
+)
 
 type InMemoryStore struct {
-	mu    sync.Mutex
-	store map[string]string
+	mu               sync.Mutex
+	store            map[string]map[string]string
+	socialLoginState map[string]string
 }
 
-func (c *InMemoryStore) AddToken(userId, token string) {
+func (c *InMemoryStore) AddToken(userId, accessToken, refreshToken string) {
 	c.mu.Lock()
 	// delete sessions > 500 // not recommended for production
 	if len(c.store) >= 500 {
-		c.store = make(map[string]string)
+		c.store = map[string]map[string]string{}
 	}
-	c.store[userId] = token
+	// check if entry exists in map
+	_, exists := c.store[userId]
+	if exists {
+		tempMap := c.store[userId]
+		tempMap[accessToken] = refreshToken
+		c.store[userId] = tempMap
+	} else {
+		tempMap := map[string]string{
+			accessToken: refreshToken,
+		}
+		c.store[userId] = tempMap
+	}
+
+	log.Println(c.store)
+
 	c.mu.Unlock()
 }
 
-func (c *InMemoryStore) DeleteToken(userId string) {
+func (c *InMemoryStore) DeleteUserSession(userId string) {
 	c.mu.Lock()
 	delete(c.store, userId)
 	c.mu.Unlock()
 }
 
+func (c *InMemoryStore) DeleteToken(userId, accessToken string) {
+	c.mu.Lock()
+	delete(c.store[userId], accessToken)
+	c.mu.Unlock()
+}
+
 func (c *InMemoryStore) ClearStore() {
 	c.mu.Lock()
-	c.store = make(map[string]string)
+	c.store = map[string]map[string]string{}
 	c.mu.Unlock()
 }
 
-func (c *InMemoryStore) GetToken(userId string) string {
+func (c *InMemoryStore) GetToken(userId, accessToken string) string {
 	token := ""
 	c.mu.Lock()
-	if val, ok := c.store[userId]; ok {
-		token = val
+	if sessionMap, ok := c.store[userId]; ok {
+		if val, ok := sessionMap[accessToken]; ok {
+			token = val
+		}
 	}
 	c.mu.Unlock()
 
 	return token
 }
+
+func (c *InMemoryStore) SetSocialLoginState(key, state string) {
+	c.mu.Lock()
+	c.socialLoginState[key] = state
+	c.mu.Unlock()
+}
+
+func (c *InMemoryStore) GetSocialLoginState(key string) string {
+	state := ""
+	if stateVal, ok := c.socialLoginState[key]; ok {
+		state = stateVal
+	}
+
+	return state
+}
+
+func (c *InMemoryStore) RemoveSocialLoginState(key string) {
+	c.mu.Lock()
+	delete(c.socialLoginState, key)
+	c.mu.Unlock()
+}
diff --git a/server/session/redisStore.go b/server/session/redisStore.go
diff --git a/server/session/session.go b/server/session/session.go
diff --git a/server/utils/requestInfo.go b/server/utils/requestInfo.go

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ type Manager interface {`
`27`	`27`	`GetVerificationByEmail(email string) (VerificationRequest, error)`
`28`	`28`	`DeleteUser(email string) error`
`29`	`29`	`SaveRoles(roles []Role) error`
	`30`	`+ SaveSession(session Session) error`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`type manager struct {`
`@@ -56,7 +57,7 @@ func InitDB() {`
`56`	`57`	`if err != nil {`
`57`	`58`	`log.Fatal("Failed to init db:", err)`
`58`	`59`	`} else {`
`59`		`- db.AutoMigrate(&User{}, &VerificationRequest{}, &Role{})`
	`60`	`+ db.AutoMigrate(&User{}, &VerificationRequest{}, &Role{}, &Session{})`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`Mgr = &manager{db: db}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m`
`60`	`60`	`return res, fmt.Errorf("user with this email address already exists")`
`61`	`61`	`}`
`62`	`62`
`63`		`- session.DeleteToken(fmt.Sprintf("%v", user.ID))`
	`63`	`+ session.DeleteUserSession(fmt.Sprintf("%v", user.ID))`
`64`	`64`	`utils.DeleteCookie(gc)`
`65`	`65`
`66`	`66`	`user.Email = newEmail`
`@@ -100,7 +100,7 @@ func AdminUpdateUser(ctx context.Context, params model.AdminUpdateUserInput) (*m`
`100`	`100`	`rolesToSave = strings.Join(inputRoles, ",")`
`101`	`101`	`}`
`102`	`102`
`103`		`- session.DeleteToken(fmt.Sprintf("%v", user.ID))`
	`103`	`+ session.DeleteUserSession(fmt.Sprintf("%v", user.ID))`
`104`	`104`	`utils.DeleteCookie(gc)`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func DeleteUser(ctx context.Context, params model.DeleteUserInput) (*model.Respo`
`27`	`27`	`return res, err`
`28`	`28`	`}`
`29`	`29`
`30`		`- session.DeleteToken(fmt.Sprintf("%x", user.ID))`
	`30`	`+ session.DeleteUserSession(fmt.Sprintf("%x", user.ID))`
`31`	`31`
`32`	`32`	`err = db.Mgr.DeleteUser(params.Email)`
`33`	`33`	`if err != nil {`