Skip to content

Commit

Permalink
[fix] #130 Issue
Browse files Browse the repository at this point in the history
  • Loading branch information
yoneyan committed Oct 25, 2021
1 parent a93f9d1 commit 32f3a78
Show file tree
Hide file tree
Showing 43 changed files with 154 additions and 154 deletions.
4 changes: 2 additions & 2 deletions pkg/api/core/auth/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
dbToken "github.com/homenoc/dsbd-backend/pkg/api/store/token/v0"
)

func AdminRadiusAuthentication(data auth.AdminStruct) auth.AdminResult {
func AdminRadiusAuthorization(data auth.AdminStruct) auth.AdminResult {

if config.Conf.Controller.Admin.AdminAuth.User == data.User && config.Conf.Controller.Admin.AdminAuth.Pass == data.Pass {
return auth.AdminResult{AdminID: 0, Err: nil}
Expand All @@ -18,7 +18,7 @@ func AdminRadiusAuthentication(data auth.AdminStruct) auth.AdminResult {
return auth.AdminResult{Err: fmt.Errorf("failed")}
}

func AdminAuthentication(accessToken string) auth.AdminResult {
func AdminAuthorization(accessToken string) auth.AdminResult {
tokenResult := dbToken.Get(token.AdminToken, &core.Token{AccessToken: accessToken})
if tokenResult.Err != nil {
return auth.AdminResult{Err: tokenResult.Err}
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/core/auth/v0/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"
)

func UserAuthentication(data core.Token) auth.UserResult {
func UserAuthorization(data core.Token) auth.UserResult {
resultToken := dbToken.Get(token.UserTokenAndAccessToken, &data)
if len(resultToken.Token) == 0 {
return auth.UserResult{Err: fmt.Errorf("auth failed")}
Expand All @@ -30,7 +30,7 @@ func UserAuthentication(data core.Token) auth.UserResult {
}

// errorType 0: 未審査の場合はエラーを返す(厳格)　1: 未審査の場合エラーを返さない
func GroupAuthentication(errorType uint, data core.Token) auth.GroupResult {
func GroupAuthorization(errorType uint, data core.Token) auth.GroupResult {
resultToken := dbToken.Get(token.UserTokenAndAccessToken, &data)
if len(resultToken.Token) == 0 {
return auth.GroupResult{Err: fmt.Errorf("auth failed")}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/core/auth/v0/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/homenoc/dsbd-backend/pkg/api/core/tool/hash"
)

func ControllerAuthentication(con controller.Controller) error {
func ControllerAuthorization(con controller.Controller) error {
if con.Token1 != config.Conf.Controller.Auth.Token1 {
return fmt.Errorf("auth error! ")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/core/controller/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func ReceiveChatByAdmin(c *gin.Context) {
token1 := c.Request.Header.Get("TOKEN_1")
token2 := c.Request.Header.Get("TOKEN_2")

if err := auth.ControllerAuthentication(controller.Controller{Token1: token1, Token2: token2}); err != nil {
if err := auth.ControllerAuthorization(controller.Controller{Token1: token1, Token2: token2}); err != nil {
log.Println(err)
return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/core/controller/v0/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func ReceiveChatUser(c *gin.Context) {
token1 := c.Request.Header.Get("TOKEN_1")
token2 := c.Request.Header.Get("TOKEN_2")

if err := auth.ControllerAuthentication(controller.Controller{Token1: token1, Token2: token2}); err != nil {
if err := auth.ControllerAuthorization(controller.Controller{Token1: token1, Token2: token2}); err != nil {
log.Println(err)
return
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/core/group/connection/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func AddByAdmin(c *gin.Context) {

var input connection.Input

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -150,7 +150,7 @@ func AddByAdmin(c *gin.Context) {
}

func DeleteByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -178,7 +178,7 @@ func UpdateByAdmin(c *gin.Context) {
return
}

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -209,7 +209,7 @@ func UpdateByAdmin(c *gin.Context) {
}

func GetByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -229,7 +229,7 @@ func GetByAdmin(c *gin.Context) {
}

func GetAllByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/core/group/connection/v0/connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func Add(c *gin.Context) {
return
}

result := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken})
result := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken})
if result.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()})
return
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/core/group/info/v0/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func Get(c *gin.Context) {
userToken := c.Request.Header.Get("USER_TOKEN")
accessToken := c.Request.Header.Get("ACCESS_TOKEN")

authResult := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken})
authResult := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken})
if authResult.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: authResult.Err.Error()})
return
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/core/group/memo/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
func AddByAdmin(c *gin.Context) {
var input core.Memo

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -44,7 +44,7 @@ func AddByAdmin(c *gin.Context) {
}

func DeleteByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/core/group/service/ip/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

//func DeleteByAdmin(c *gin.Context) {
// resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
// resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
// if resultAdmin.Err != nil {
// c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
// return
Expand Down Expand Up @@ -49,7 +49,7 @@ func UpdateByAdmin(c *gin.Context) {
return
}

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/core/group/service/jpnicAdmin/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
func AddByAdmin(c *gin.Context) {
var input core.JPNICAdmin

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -37,7 +37,7 @@ func AddByAdmin(c *gin.Context) {
}

func DeleteByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -59,7 +59,7 @@ func DeleteByAdmin(c *gin.Context) {
func UpdateByAdmin(c *gin.Context) {
var input core.JPNICAdmin

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -80,7 +80,7 @@ func UpdateByAdmin(c *gin.Context) {
}

func GetByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -100,7 +100,7 @@ func GetByAdmin(c *gin.Context) {
}

func GetAllByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func Add(c *gin.Context) {
return
}

result := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken})
result := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken})
if result.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()})
return
Expand Down Expand Up @@ -88,7 +88,7 @@ func Delete(c *gin.Context) {
return
}

result := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken})
result := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken})
if result.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()})
return
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/core/group/service/jpnicTech/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
func AddByAdmin(c *gin.Context) {
var input core.JPNICTech

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -37,7 +37,7 @@ func AddByAdmin(c *gin.Context) {
}

func DeleteByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -59,7 +59,7 @@ func DeleteByAdmin(c *gin.Context) {
func UpdateByAdmin(c *gin.Context) {
var input core.JPNICTech

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -80,7 +80,7 @@ func UpdateByAdmin(c *gin.Context) {
}

func GetByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusInternalServerError, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -100,7 +100,7 @@ func GetByAdmin(c *gin.Context) {
}

func GetAllByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func Add(c *gin.Context) {
return
}

result := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken})
result := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken})
if result.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()})
return
Expand Down Expand Up @@ -87,7 +87,7 @@ func Delete(c *gin.Context) {
return
}

result := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken})
result := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken})
if result.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()})
return
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/core/group/service/v0/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func AddByAdmin(c *gin.Context) {

var input service.Input

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -160,7 +160,7 @@ func AddByAdmin(c *gin.Context) {
}

func DeleteByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -196,7 +196,7 @@ func UpdateByAdmin(c *gin.Context) {
return
}

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -219,7 +219,7 @@ func UpdateByAdmin(c *gin.Context) {
}

func GetByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -240,7 +240,7 @@ func GetByAdmin(c *gin.Context) {
}

func GetAllByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/core/group/service/v0/admin_ip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func AddIPByAdmin(c *gin.Context) {
return
}

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -55,7 +55,7 @@ func AddIPByAdmin(c *gin.Context) {
}

func DeleteIPByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -93,7 +93,7 @@ func UpdateIPByAdmin(c *gin.Context) {
return
}

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/core/group/service/v0/admin_jpnic_admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
func AddJPNICAdminByAdmin(c *gin.Context) {
var input core.JPNICAdmin

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down Expand Up @@ -45,7 +45,7 @@ func AddJPNICAdminByAdmin(c *gin.Context) {
}

func DeleteJPNICAdminByAdmin(c *gin.Context) {
resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand All @@ -68,7 +68,7 @@ func DeleteJPNICAdminByAdmin(c *gin.Context) {
func UpdateJPNICAdminByAdmin(c *gin.Context) {
var input core.JPNICAdmin

resultAdmin := auth.AdminAuthentication(c.Request.Header.Get("ACCESS_TOKEN"))
resultAdmin := auth.AdminAuthorization(c.Request.Header.Get("ACCESS_TOKEN"))
if resultAdmin.Err != nil {
c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()})
return
Expand Down
Loading

0 comments on commit 32f3a78

Please sign in to comment.