You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by he...@apache.org on 2023/05/12 01:47:36 UTC
[incubator-devlake] branch main updated: fix: typo and unused struct (#5165)
This is an automated email from the ASF dual-hosted git repository.
hez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 86085b3cd fix: typo and unused struct (#5165)
86085b3cd is described below
commit 86085b3cd7d88ad11abbb7d37b1c6b749aea1699
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Fri May 12 09:47:32 2023 +0800
fix: typo and unused struct (#5165)
---
backend/server/services/auth/auth.go | 3 ---
backend/server/services/auth/cognito.go | 14 +++++++-------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/backend/server/services/auth/auth.go b/backend/server/services/auth/auth.go
index 1c1e78614..742560dc6 100644
--- a/backend/server/services/auth/auth.go
+++ b/backend/server/services/auth/auth.go
@@ -49,9 +49,6 @@ type AuthenticationResult struct {
TokenType *string `json:"tokenType" type:"string"`
}
-type ChallengeParameters struct {
-}
-
type NewPasswordRequest struct {
Username string `json:"username"`
NewPassword string `json:"newPassword"`
diff --git a/backend/server/services/auth/cognito.go b/backend/server/services/auth/cognito.go
index 92a3748a4..ac9f24d7e 100644
--- a/backend/server/services/auth/cognito.go
+++ b/backend/server/services/auth/cognito.go
@@ -37,7 +37,7 @@ import (
"github.com/dgrijalva/jwt-go"
)
-type AwsCognitorProvider struct {
+type AwsCognitoProvider struct {
jwks Jwks
logger log.Logger
client *cognitoidentityprovider.CognitoIdentityProvider
@@ -45,7 +45,7 @@ type AwsCognitorProvider struct {
expectClaims jwt.MapClaims
}
-func NewCognitoProvider(basicRes context.BasicRes) *AwsCognitorProvider {
+func NewCognitoProvider(basicRes context.BasicRes) *AwsCognitoProvider {
// Get configuration
v := config.GetConfig()
// TODO: verify the configuration
@@ -55,7 +55,7 @@ func NewCognitoProvider(basicRes context.BasicRes) *AwsCognitorProvider {
}))
// Create a Cognito Identity Provider client
client := cognitoidentityprovider.New(sess)
- cgt := &AwsCognitorProvider{
+ cgt := &AwsCognitoProvider{
client: client,
clientId: aws.String(v.GetString("AWS_AUTH_USER_POOL_WEB_CLIENT_ID")),
logger: basicRes.GetLogger().Nested("cognito"),
@@ -81,7 +81,7 @@ func NewCognitoProvider(basicRes context.BasicRes) *AwsCognitorProvider {
return cgt
}
-func (cgt *AwsCognitorProvider) fetchJWKS(jwksURL string) errors.Error {
+func (cgt *AwsCognitoProvider) fetchJWKS(jwksURL string) errors.Error {
// Get the JWKS from the URL
resp, err := http.Get(jwksURL)
if err != nil {
@@ -101,7 +101,7 @@ func (cgt *AwsCognitorProvider) fetchJWKS(jwksURL string) errors.Error {
return nil
}
-func (cgt *AwsCognitorProvider) SignIn(loginReq *LoginRequest) (*LoginResponse, errors.Error) {
+func (cgt *AwsCognitoProvider) SignIn(loginReq *LoginRequest) (*LoginResponse, errors.Error) {
// Create the input for InitiateAuth
input := &cognitoidentityprovider.InitiateAuthInput{
AuthFlow: aws.String("USER_PASSWORD_AUTH"),
@@ -136,7 +136,7 @@ func (cgt *AwsCognitorProvider) SignIn(loginReq *LoginRequest) (*LoginResponse,
return loginRes, nil
}
-func (cgt *AwsCognitorProvider) CheckAuth(tokenString string) (*jwt.Token, errors.Error) {
+func (cgt *AwsCognitoProvider) CheckAuth(tokenString string) (*jwt.Token, errors.Error) {
// Parse the JWT token
token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
// Check the signing method
@@ -204,7 +204,7 @@ type Jwks struct {
} `json:"keys"`
}
-func (cgt *AwsCognitorProvider) NewPassword(newPasswordReq *NewPasswordRequest) (*LoginResponse, errors.Error) {
+func (cgt *AwsCognitoProvider) NewPassword(newPasswordReq *NewPasswordRequest) (*LoginResponse, errors.Error) {
input := &cognitoidentityprovider.RespondToAuthChallengeInput{
ChallengeName: aws.String("NEW_PASSWORD_REQUIRED"),
ChallengeResponses: map[string]*string{