A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat(plugin): external user login add access token
LinkinStar8575bbf8c849
diff --git a/docs/docs.go b/docs/docs.goindex 25caa935..4ed1a561 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -5723,6 +5723,9 @@ const docTemplate = `{"schema.ExternalLoginBindingUserSendEmailResp": {"type": "object","properties": {+ "access_token": {+ "type": "string"+ },"email_exist_and_must_be_confirmed": {"type": "boolean"}diff --git a/docs/swagger.json b/docs/swagger.jsonindex 64c85c12..9b71b688 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -5711,6 +5711,9 @@"schema.ExternalLoginBindingUserSendEmailResp": {"type": "object","properties": {+ "access_token": {+ "type": "string"+ },"email_exist_and_must_be_confirmed": {"type": "boolean"}diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex a9e1cf62..071d7ff2 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -312,6 +312,8 @@ definitions:type: objectschema.ExternalLoginBindingUserSendEmailResp:properties:+ access_token:+ type: stringemail_exist_and_must_be_confirmed:type: booleantype: objectdiff --git a/internal/controller/connector_controller.go b/internal/controller/connector_controller.goindex 3eeb8776..e53b82bb 100644--- a/internal/controller/connector_controller.go+++ b/internal/controller/connector_controller.go@@ -76,8 +76,8 @@ func (cc *ConnectorController) ConnectorRedirect(connector plugin.Connector) (fnProvider: connector.ConnectorSlugName(),ExternalID: userInfo.ExternalID,Name: userInfo.Name,- Email: userInfo.Email,- MetaInfo: userInfo.MetaInfo,+ //Email: userInfo.Email,+ MetaInfo: userInfo.MetaInfo,}resp, err := cc.userExternalService.ExternalLogin(ctx, u)if err != nil {diff --git a/internal/schema/user_external_login_schema.go b/internal/schema/user_external_login_schema.goindex aa02700a..82851a2a 100644--- a/internal/schema/user_external_login_schema.go+++ b/internal/schema/user_external_login_schema.go@@ -17,7 +17,8 @@ type ExternalLoginBindingUserSendEmailReq struct {// ExternalLoginBindingUserSendEmailResp external login binding user responsetype ExternalLoginBindingUserSendEmailResp struct {- EmailExistAndMustBeConfirmed bool `json:"email_exist_and_must_be_confirmed"`+ EmailExistAndMustBeConfirmed bool `json:"email_exist_and_must_be_confirmed"`+ AccessToken string `json:"access_token"`}// ExternalLoginBindingUserReq external login binding user requestdiff --git a/internal/service/user_external_login/user_external_login_service.go b/internal/service/user_external_login/user_external_login_service.goindex ce2bd11b..b8b1ecec 100644--- a/internal/service/user_external_login/user_external_login_service.go+++ b/internal/service/user_external_login/user_external_login_service.go@@ -180,6 +180,11 @@ func (us *UserExternalLoginService) ExternalLoginBindingUserSendEmail(if err != nil {return nil, err}+ resp.AccessToken, _, err = us.userCommonService.CacheLoginUserInfo(+ ctx, userInfo.ID, userInfo.MailStatus, userInfo.Status)+ if err != nil {+ log.Error(err)+ }}err = us.userExternalLoginRepo.SetCacheUserExternalLoginInfo(ctx, req.BindingKey, externalLoginInfo)if err != nil {