From 32f3a780a020c857b8c359b1bd9dcdf7432558c9 Mon Sep 17 00:00:00 2001 From: yoneyan Date: Tue, 26 Oct 2021 02:21:18 +0900 Subject: [PATCH] [fix] #130 Issue --- pkg/api/core/auth/v0/admin.go | 4 ++-- pkg/api/core/auth/v0/auth.go | 4 ++-- pkg/api/core/auth/v0/controller.go | 2 +- pkg/api/core/controller/v0/admin.go | 2 +- pkg/api/core/controller/v0/user.go | 2 +- pkg/api/core/group/connection/v0/admin.go | 10 +++++----- pkg/api/core/group/connection/v0/connection.go | 2 +- pkg/api/core/group/info/v0/info.go | 2 +- pkg/api/core/group/memo/v0/admin.go | 4 ++-- pkg/api/core/group/service/ip/v0/admin.go | 4 ++-- pkg/api/core/group/service/jpnicAdmin/v0/admin.go | 10 +++++----- .../core/group/service/jpnicAdmin/v0/jpnicAdmin.go | 4 ++-- pkg/api/core/group/service/jpnicTech/v0/admin.go | 10 +++++----- .../core/group/service/jpnicTech/v0/jpnicTech.go | 4 ++-- pkg/api/core/group/service/v0/admin.go | 10 +++++----- pkg/api/core/group/service/v0/admin_ip.go | 6 +++--- pkg/api/core/group/service/v0/admin_jpnic_admin.go | 6 +++--- pkg/api/core/group/service/v0/admin_jpnic_tech.go | 6 +++--- pkg/api/core/group/service/v0/admin_plan.go | 6 +++--- pkg/api/core/group/service/v0/service.go | 8 ++++---- pkg/api/core/group/v0/admin.go | 12 ++++++------ pkg/api/core/group/v0/group.go | 2 +- pkg/api/core/jpnic/jpnic.go | 10 +++++----- pkg/api/core/mail/v0/admin.go | 2 +- pkg/api/core/noc/bgpRouter/v0/bgpRouter.go | 10 +++++----- .../v0/tunnelEndPointRouter.go | 10 +++++----- .../v0/tunnelEndPointRouterIP.go | 10 +++++----- pkg/api/core/noc/v0/admin.go | 10 +++++----- pkg/api/core/notice/v0/admin.go | 10 +++++----- pkg/api/core/payment/v0/admin.go | 10 +++++----- pkg/api/core/payment/v0/payment.go | 8 ++++---- pkg/api/core/support/ticket/v0/admin.go | 10 +++++----- pkg/api/core/support/ticket/v0/ticket.go | 14 +++++++------- pkg/api/core/template/connection/v0/admin.go | 10 +++++----- pkg/api/core/template/ipv4/v0/admin.go | 10 +++++----- pkg/api/core/template/ipv6/v0/admin.go | 10 +++++----- pkg/api/core/template/ntt/v0/admin.go | 10 +++++----- pkg/api/core/template/service/v0/admin.go | 10 +++++----- pkg/api/core/template/v0/admin.go | 2 +- pkg/api/core/template/v0/template.go | 2 +- pkg/api/core/token/v0/admin.go | 14 +++++++------- pkg/api/core/user/v0/admin.go | 10 +++++----- pkg/api/core/user/v0/user.go | 6 +++--- 43 files changed, 154 insertions(+), 154 deletions(-) diff --git a/pkg/api/core/auth/v0/admin.go b/pkg/api/core/auth/v0/admin.go index 13f622bb..621570c4 100644 --- a/pkg/api/core/auth/v0/admin.go +++ b/pkg/api/core/auth/v0/admin.go @@ -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} @@ -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} diff --git a/pkg/api/core/auth/v0/auth.go b/pkg/api/core/auth/v0/auth.go index 4f7ceeeb..8920024e 100644 --- a/pkg/api/core/auth/v0/auth.go +++ b/pkg/api/core/auth/v0/auth.go @@ -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")} @@ -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")} diff --git a/pkg/api/core/auth/v0/controller.go b/pkg/api/core/auth/v0/controller.go index aad16579..1b47eb93 100644 --- a/pkg/api/core/auth/v0/controller.go +++ b/pkg/api/core/auth/v0/controller.go @@ -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! ") } diff --git a/pkg/api/core/controller/v0/admin.go b/pkg/api/core/controller/v0/admin.go index 3bd2a7ea..1d96e7ac 100644 --- a/pkg/api/core/controller/v0/admin.go +++ b/pkg/api/core/controller/v0/admin.go @@ -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 } diff --git a/pkg/api/core/controller/v0/user.go b/pkg/api/core/controller/v0/user.go index 7466e898..a5259762 100644 --- a/pkg/api/core/controller/v0/user.go +++ b/pkg/api/core/controller/v0/user.go @@ -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 } diff --git a/pkg/api/core/group/connection/v0/admin.go b/pkg/api/core/group/connection/v0/admin.go index 4a48c330..29c39d71 100644 --- a/pkg/api/core/group/connection/v0/admin.go +++ b/pkg/api/core/group/connection/v0/admin.go @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/connection/v0/connection.go b/pkg/api/core/group/connection/v0/connection.go index 1f6f67bd..2d559165 100644 --- a/pkg/api/core/group/connection/v0/connection.go +++ b/pkg/api/core/group/connection/v0/connection.go @@ -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 diff --git a/pkg/api/core/group/info/v0/info.go b/pkg/api/core/group/info/v0/info.go index 4078c3d8..4e695b19 100644 --- a/pkg/api/core/group/info/v0/info.go +++ b/pkg/api/core/group/info/v0/info.go @@ -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 diff --git a/pkg/api/core/group/memo/v0/admin.go b/pkg/api/core/group/memo/v0/admin.go index 8b6d97c2..1af442e8 100644 --- a/pkg/api/core/group/memo/v0/admin.go +++ b/pkg/api/core/group/memo/v0/admin.go @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/ip/v0/admin.go b/pkg/api/core/group/service/ip/v0/admin.go index 4418e584..a90372b6 100644 --- a/pkg/api/core/group/service/ip/v0/admin.go +++ b/pkg/api/core/group/service/ip/v0/admin.go @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/jpnicAdmin/v0/admin.go b/pkg/api/core/group/service/jpnicAdmin/v0/admin.go index f4dc1b45..03fc0031 100644 --- a/pkg/api/core/group/service/jpnicAdmin/v0/admin.go +++ b/pkg/api/core/group/service/jpnicAdmin/v0/admin.go @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go b/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go index 6a27c3b2..3e129447 100644 --- a/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go +++ b/pkg/api/core/group/service/jpnicAdmin/v0/jpnicAdmin.go @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/jpnicTech/v0/admin.go b/pkg/api/core/group/service/jpnicTech/v0/admin.go index c29827bb..d0e18a6a 100644 --- a/pkg/api/core/group/service/jpnicTech/v0/admin.go +++ b/pkg/api/core/group/service/jpnicTech/v0/admin.go @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go b/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go index c1dd571e..5a1493e5 100644 --- a/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go +++ b/pkg/api/core/group/service/jpnicTech/v0/jpnicTech.go @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/v0/admin.go b/pkg/api/core/group/service/v0/admin.go index f4ceed48..09c93af1 100644 --- a/pkg/api/core/group/service/v0/admin.go +++ b/pkg/api/core/group/service/v0/admin.go @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/v0/admin_ip.go b/pkg/api/core/group/service/v0/admin_ip.go index b6a69008..54afc927 100644 --- a/pkg/api/core/group/service/v0/admin_ip.go +++ b/pkg/api/core/group/service/v0/admin_ip.go @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/v0/admin_jpnic_admin.go b/pkg/api/core/group/service/v0/admin_jpnic_admin.go index 8d9d2650..a8b7fd7d 100644 --- a/pkg/api/core/group/service/v0/admin_jpnic_admin.go +++ b/pkg/api/core/group/service/v0/admin_jpnic_admin.go @@ -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 @@ -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 @@ -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 diff --git a/pkg/api/core/group/service/v0/admin_jpnic_tech.go b/pkg/api/core/group/service/v0/admin_jpnic_tech.go index 6b9dd525..28f7b075 100644 --- a/pkg/api/core/group/service/v0/admin_jpnic_tech.go +++ b/pkg/api/core/group/service/v0/admin_jpnic_tech.go @@ -17,7 +17,7 @@ import ( func AddJPNICTechByAdmin(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 @@ -48,7 +48,7 @@ func AddJPNICTechByAdmin(c *gin.Context) { } func DeleteJPNICTechByAdmin(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 @@ -71,7 +71,7 @@ func DeleteJPNICTechByAdmin(c *gin.Context) { func UpdateJPNICTechByAdmin(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 diff --git a/pkg/api/core/group/service/v0/admin_plan.go b/pkg/api/core/group/service/v0/admin_plan.go index 7acd49e0..51e967c2 100644 --- a/pkg/api/core/group/service/v0/admin_plan.go +++ b/pkg/api/core/group/service/v0/admin_plan.go @@ -28,7 +28,7 @@ func AddPlanByAdmin(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 @@ -45,7 +45,7 @@ func AddPlanByAdmin(c *gin.Context) { } func DeletePlanByAdmin(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 @@ -68,7 +68,7 @@ func DeletePlanByAdmin(c *gin.Context) { func UpdatePlanByAdmin(c *gin.Context) { var input core.Plan - 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 diff --git a/pkg/api/core/group/service/v0/service.go b/pkg/api/core/group/service/v0/service.go index 1bf3907c..ee1a8da8 100644 --- a/pkg/api/core/group/service/v0/service.go +++ b/pkg/api/core/group/service/v0/service.go @@ -34,7 +34,7 @@ func Add(c *gin.Context) { } // group authentication - 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 @@ -224,7 +224,7 @@ func Update(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 @@ -246,7 +246,7 @@ func Update(c *gin.Context) { return } if resultNetwork.Service[0].GroupID != result.User.Group.ID { - c.JSON(http.StatusInternalServerError, common.Error{Error: "Authentication failure"}) + c.JSON(http.StatusInternalServerError, common.Error{Error: "Authorization failure"}) return } @@ -264,7 +264,7 @@ func GetAddAllow(c *gin.Context) { userToken := c.Request.Header.Get("USER_TOKEN") accessToken := c.Request.Header.Get("ACCESS_TOKEN") - 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 diff --git a/pkg/api/core/group/v0/admin.go b/pkg/api/core/group/v0/admin.go index f62e84f6..d15ec5b3 100644 --- a/pkg/api/core/group/v0/admin.go +++ b/pkg/api/core/group/v0/admin.go @@ -20,7 +20,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.Group - 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 @@ -41,7 +41,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 @@ -76,7 +76,7 @@ func UpdateByAdmin(c *gin.Context) { var input core.Group - 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 @@ -113,7 +113,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 @@ -136,7 +136,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 @@ -163,7 +163,7 @@ func CancelSubscription(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 diff --git a/pkg/api/core/group/v0/group.go b/pkg/api/core/group/v0/group.go index b90fcd8a..9694cdcd 100644 --- a/pkg/api/core/group/v0/group.go +++ b/pkg/api/core/group/v0/group.go @@ -34,7 +34,7 @@ func Add(c *gin.Context) { return } - userResult := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + userResult := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if userResult.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: userResult.Err.Error()}) return diff --git a/pkg/api/core/jpnic/jpnic.go b/pkg/api/core/jpnic/jpnic.go index 5224eb12..09321535 100644 --- a/pkg/api/core/jpnic/jpnic.go +++ b/pkg/api/core/jpnic/jpnic.go @@ -14,7 +14,7 @@ import ( func ManualRegistration(c *gin.Context) { var input jpnicTransaction.WebTransaction - 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 @@ -56,7 +56,7 @@ func ManualRegistration(c *gin.Context) { } func Get(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 @@ -106,7 +106,7 @@ func Get(c *gin.Context) { } func GetHandle(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 @@ -156,7 +156,7 @@ func GetHandle(c *gin.Context) { func GetAll(c *gin.Context) { var input GetAllInput - 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 @@ -208,7 +208,7 @@ func GetAll(c *gin.Context) { func Return(c *gin.Context) { var input ReturnInput - 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 diff --git a/pkg/api/core/mail/v0/admin.go b/pkg/api/core/mail/v0/admin.go index 0b16a6fa..ddbbd0e0 100644 --- a/pkg/api/core/mail/v0/admin.go +++ b/pkg/api/core/mail/v0/admin.go @@ -11,7 +11,7 @@ import ( func SendByAdmin(c *gin.Context) { var input mail.Mail - 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 diff --git a/pkg/api/core/noc/bgpRouter/v0/bgpRouter.go b/pkg/api/core/noc/bgpRouter/v0/bgpRouter.go index 24e42ba6..3450d433 100644 --- a/pkg/api/core/noc/bgpRouter/v0/bgpRouter.go +++ b/pkg/api/core/noc/bgpRouter/v0/bgpRouter.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.BGPRouter - 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 @@ -36,7 +36,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 @@ -58,7 +58,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.BGPRouter - 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 @@ -91,7 +91,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 @@ -112,7 +112,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 diff --git a/pkg/api/core/noc/tunnelEndPointRouter/v0/tunnelEndPointRouter.go b/pkg/api/core/noc/tunnelEndPointRouter/v0/tunnelEndPointRouter.go index b73ab7a3..f9f9c206 100644 --- a/pkg/api/core/noc/tunnelEndPointRouter/v0/tunnelEndPointRouter.go +++ b/pkg/api/core/noc/tunnelEndPointRouter/v0/tunnelEndPointRouter.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.TunnelEndPointRouter - 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 @@ -36,7 +36,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 @@ -58,7 +58,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.TunnelEndPointRouter - 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 @@ -91,7 +91,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 @@ -112,7 +112,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 diff --git a/pkg/api/core/noc/tunnelEndPointRouterIP/v0/tunnelEndPointRouterIP.go b/pkg/api/core/noc/tunnelEndPointRouterIP/v0/tunnelEndPointRouterIP.go index fb970a25..964e61ac 100644 --- a/pkg/api/core/noc/tunnelEndPointRouterIP/v0/tunnelEndPointRouterIP.go +++ b/pkg/api/core/noc/tunnelEndPointRouterIP/v0/tunnelEndPointRouterIP.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.TunnelEndPointRouterIP - 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 @@ -36,7 +36,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 @@ -58,7 +58,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.TunnelEndPointRouterIP - 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 @@ -91,7 +91,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 @@ -112,7 +112,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 diff --git a/pkg/api/core/noc/v0/admin.go b/pkg/api/core/noc/v0/admin.go index 7b4beca9..a1c6c09f 100644 --- a/pkg/api/core/noc/v0/admin.go +++ b/pkg/api/core/noc/v0/admin.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.NOC - 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 @@ -36,7 +36,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 @@ -58,7 +58,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.NOC - 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 @@ -91,7 +91,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 @@ -112,7 +112,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 diff --git a/pkg/api/core/notice/v0/admin.go b/pkg/api/core/notice/v0/admin.go index cca6df91..0472185d 100644 --- a/pkg/api/core/notice/v0/admin.go +++ b/pkg/api/core/notice/v0/admin.go @@ -19,7 +19,7 @@ import ( func AddByAdmin(c *gin.Context) { var input notice.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 @@ -83,7 +83,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 @@ -105,7 +105,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input notice.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 @@ -158,7 +158,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 @@ -178,7 +178,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 diff --git a/pkg/api/core/payment/v0/admin.go b/pkg/api/core/payment/v0/admin.go index d6ed25dd..f16338a2 100644 --- a/pkg/api/core/payment/v0/admin.go +++ b/pkg/api/core/payment/v0/admin.go @@ -19,7 +19,7 @@ import ( func AddByAdmin(c *gin.Context) { //var input notice.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 @@ -79,7 +79,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 @@ -99,7 +99,7 @@ func DeleteByAdmin(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 @@ -119,7 +119,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 @@ -133,7 +133,7 @@ func GetAllByAdmin(c *gin.Context) { } func RefundByAdmin(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 diff --git a/pkg/api/core/payment/v0/payment.go b/pkg/api/core/payment/v0/payment.go index debab6bb..1a4ad171 100644 --- a/pkg/api/core/payment/v0/payment.go +++ b/pkg/api/core/payment/v0/payment.go @@ -35,7 +35,7 @@ func MembershipPayment(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 @@ -118,7 +118,7 @@ func DonatePayment(c *gin.Context) { return } - result := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -172,7 +172,7 @@ func ChangeCardPayment(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 @@ -232,7 +232,7 @@ func ChangeCardPaymentInit(c *gin.Context) { userToken := c.Request.Header.Get("USER_TOKEN") accessToken := c.Request.Header.Get("ACCESS_TOKEN") - result := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return diff --git a/pkg/api/core/support/ticket/v0/admin.go b/pkg/api/core/support/ticket/v0/admin.go index 248a6954..4eafd014 100644 --- a/pkg/api/core/support/ticket/v0/admin.go +++ b/pkg/api/core/support/ticket/v0/admin.go @@ -29,7 +29,7 @@ func CreateByAdmin(c *gin.Context) { var input support.FirstInput // Admin authentication - 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 @@ -102,7 +102,7 @@ func CreateByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.Ticket // Admin authentication - 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 @@ -149,7 +149,7 @@ func UpdateByAdmin(c *gin.Context) { func GetByAdmin(c *gin.Context) { // Admin authentication - 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 @@ -172,7 +172,7 @@ func GetByAdmin(c *gin.Context) { func GetAllByAdmin(c *gin.Context) { // Admin authentication - 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 @@ -210,7 +210,7 @@ func GetAdminWebSocket(c *gin.Context) { defer conn.Close() // Admin authentication - resultAdmin := auth.AdminAuthentication(accessToken) + resultAdmin := auth.AdminAuthorization(accessToken) if resultAdmin.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: resultAdmin.Err.Error()}) return diff --git a/pkg/api/core/support/ticket/v0/ticket.go b/pkg/api/core/support/ticket/v0/ticket.go index 8bed3907..bf0bf795 100644 --- a/pkg/api/core/support/ticket/v0/ticket.go +++ b/pkg/api/core/support/ticket/v0/ticket.go @@ -53,7 +53,7 @@ func Create(c *gin.Context) { // isn't group if !input.IsGroup { - result := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -64,7 +64,7 @@ func Create(c *gin.Context) { } else { //is group // Group authentication - result := auth.GroupAuthentication(1, core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.GroupAuthorization(1, core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -118,7 +118,7 @@ func Request(c *gin.Context) { } // Group authentication - result := auth.GroupAuthentication(1, core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.GroupAuthorization(1, core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -201,7 +201,7 @@ func Update(c *gin.Context) { // isn't group if ticketResult.Tickets[0].GroupID == nil { - result := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -209,7 +209,7 @@ func Update(c *gin.Context) { } else { //is group // Group authentication - result := auth.GroupAuthentication(1, core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.GroupAuthorization(1, core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: result.Err.Error()}) return @@ -252,7 +252,7 @@ func GetWebSocket(c *gin.Context) { defer conn.Close() - result := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + result := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if result.Err != nil { log.Println("ws:// support error:Auth error") conn.WriteMessage(websocket.TextMessage, []byte("error: auth error")) @@ -314,7 +314,7 @@ func GetWebSocket(c *gin.Context) { break } // 入力されたデータをTokenにて認証 - resultAuth := auth.UserAuthentication(core.Token{ + resultAuth := auth.UserAuthorization(core.Token{ UserToken: msg.UserToken, AccessToken: msg.AccessToken, }) diff --git a/pkg/api/core/template/connection/v0/admin.go b/pkg/api/core/template/connection/v0/admin.go index 0cca1833..c3c3678c 100644 --- a/pkg/api/core/template/connection/v0/admin.go +++ b/pkg/api/core/template/connection/v0/admin.go @@ -17,7 +17,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.ConnectionTemplate - 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 @@ -42,7 +42,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 @@ -64,7 +64,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.ConnectionTemplate - 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 @@ -86,7 +86,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 @@ -106,7 +106,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 diff --git a/pkg/api/core/template/ipv4/v0/admin.go b/pkg/api/core/template/ipv4/v0/admin.go index 8deda80a..02749ce2 100644 --- a/pkg/api/core/template/ipv4/v0/admin.go +++ b/pkg/api/core/template/ipv4/v0/admin.go @@ -17,7 +17,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.IPv4Template - 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 @@ -42,7 +42,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 @@ -64,7 +64,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.IPv4Template - 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 @@ -86,7 +86,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 @@ -106,7 +106,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 diff --git a/pkg/api/core/template/ipv6/v0/admin.go b/pkg/api/core/template/ipv6/v0/admin.go index ac2c3da6..17a1d751 100644 --- a/pkg/api/core/template/ipv6/v0/admin.go +++ b/pkg/api/core/template/ipv6/v0/admin.go @@ -17,7 +17,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.IPv6Template - 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 @@ -42,7 +42,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 @@ -64,7 +64,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.IPv6Template - 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 @@ -86,7 +86,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 @@ -106,7 +106,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 diff --git a/pkg/api/core/template/ntt/v0/admin.go b/pkg/api/core/template/ntt/v0/admin.go index fcd68efc..1f4ddd33 100644 --- a/pkg/api/core/template/ntt/v0/admin.go +++ b/pkg/api/core/template/ntt/v0/admin.go @@ -17,7 +17,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.NTTTemplate - 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 @@ -42,7 +42,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 @@ -64,7 +64,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.NTTTemplate - 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 @@ -86,7 +86,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 @@ -106,7 +106,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 diff --git a/pkg/api/core/template/service/v0/admin.go b/pkg/api/core/template/service/v0/admin.go index 4faf64d4..14eaa0b1 100644 --- a/pkg/api/core/template/service/v0/admin.go +++ b/pkg/api/core/template/service/v0/admin.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.ServiceTemplate - 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 @@ -41,7 +41,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 @@ -63,7 +63,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.ServiceTemplate - 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 @@ -85,7 +85,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 @@ -105,7 +105,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 diff --git a/pkg/api/core/template/v0/admin.go b/pkg/api/core/template/v0/admin.go index 80a132fc..7bb148aa 100644 --- a/pkg/api/core/template/v0/admin.go +++ b/pkg/api/core/template/v0/admin.go @@ -25,7 +25,7 @@ import ( ) 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 diff --git a/pkg/api/core/template/v0/template.go b/pkg/api/core/template/v0/template.go index b5c8266c..28bfa49d 100644 --- a/pkg/api/core/template/v0/template.go +++ b/pkg/api/core/template/v0/template.go @@ -24,7 +24,7 @@ func Get(c *gin.Context) { userToken := c.Request.Header.Get("USER_TOKEN") accessToken := c.Request.Header.Get("ACCESS_TOKEN") - userResult := auth.UserAuthentication(core.Token{UserToken: userToken, AccessToken: accessToken}) + userResult := auth.UserAuthorization(core.Token{UserToken: userToken, AccessToken: accessToken}) if userResult.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: userResult.Err.Error()}) return diff --git a/pkg/api/core/token/v0/admin.go b/pkg/api/core/token/v0/admin.go index 5622da62..a11833a4 100644 --- a/pkg/api/core/token/v0/admin.go +++ b/pkg/api/core/token/v0/admin.go @@ -17,7 +17,7 @@ import ( ) func GenerateByAdmin(c *gin.Context) { - resultAuth := auth.AdminRadiusAuthentication(authInterface.AdminStruct{ + resultAuth := auth.AdminRadiusAuthorization(authInterface.AdminStruct{ User: c.Request.Header.Get("USER"), Pass: c.Request.Header.Get("PASS")}) if resultAuth.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: resultAuth.Err.Error()}) @@ -41,7 +41,7 @@ func GenerateByAdmin(c *gin.Context) { func AddByAdmin(c *gin.Context) { var input core.Token - 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 @@ -68,7 +68,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 @@ -88,7 +88,7 @@ func DeleteByAdmin(c *gin.Context) { } func DeleteAllByAdmin(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 @@ -105,7 +105,7 @@ func DeleteAllByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.Token - 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 @@ -126,7 +126,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 @@ -146,7 +146,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 diff --git a/pkg/api/core/user/v0/admin.go b/pkg/api/core/user/v0/admin.go index eccf1c4e..5c7a5e5a 100644 --- a/pkg/api/core/user/v0/admin.go +++ b/pkg/api/core/user/v0/admin.go @@ -16,7 +16,7 @@ import ( func AddByAdmin(c *gin.Context) { var input core.User - 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 @@ -48,7 +48,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 @@ -70,7 +70,7 @@ func DeleteByAdmin(c *gin.Context) { func UpdateByAdmin(c *gin.Context) { var input core.User - 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 @@ -103,7 +103,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 @@ -123,7 +123,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 diff --git a/pkg/api/core/user/v0/user.go b/pkg/api/core/user/v0/user.go index 1c9e47a5..3a67405c 100644 --- a/pkg/api/core/user/v0/user.go +++ b/pkg/api/core/user/v0/user.go @@ -138,7 +138,7 @@ func AddGroup(c *gin.Context) { pass := "" // グループ所属ユーザの登録 - resultAuth := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken}) + resultAuth := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken}) if resultAuth.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: resultAuth.Err.Error()}) return @@ -310,7 +310,7 @@ func Delete(c *gin.Context) { userToken := c.Request.Header.Get("USER_TOKEN") accessToken := c.Request.Header.Get("ACCESS_TOKEN") - authResult := auth.GroupAuthentication(0, core.Token{UserToken: userToken, AccessToken: accessToken}) + authResult := auth.GroupAuthorization(0, core.Token{UserToken: userToken, AccessToken: accessToken}) if authResult.Err != nil { c.JSON(http.StatusUnauthorized, common.Error{Error: authResult.Err.Error()}) return @@ -372,7 +372,7 @@ func Update(c *gin.Context) { return } - 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