From 93f972c3ccbeac29d43b263a52ccd53f55a36ada Mon Sep 17 00:00:00 2001 From: Pratham Kumar Shrivastava Date: Mon, 19 Aug 2024 02:41:03 +0530 Subject: [PATCH] remove verified trait --- api/settings.go | 47 ++++--------------- pkg/wrapper/kratos/admin/admin.go | 1 - .../kratos/registration/registration.go | 1 - pkg/wrapper/kratos/settings/types.go | 1 - schema/identity.schema.json | 4 -- schema/users.json | 4 -- 6 files changed, 10 insertions(+), 48 deletions(-) diff --git a/api/settings.go b/api/settings.go index 2fecfe1..0aa3364 100644 --- a/api/settings.go +++ b/api/settings.go @@ -94,20 +94,16 @@ func HandleGetSettingsFlow(c *gin.Context) { identity := session.GetIdentity() traits := identity.GetTraits().(map[string]interface{}) - if identity.VerifiableAddresses[0].Verified && traits["verified"] == false { - traits["verified"] = true - - _, err = settings.SubmitSettingsFlowProfileMethod(flow_cookie, session_cookie, flowID, csrf_token, traits) - if err != nil { - log.ErrorLogger("Kratos post settings update profile flow failed", err) - - errCode, _ := strconv.Atoi((strings.Split(err.Error(), " "))[0]) - c.JSON(errCode, gin.H{ - "error": err.Error(), - "message": "Kratos post settings update profile flow failed", - }) - return - } + _, err = settings.SubmitSettingsFlowProfileMethod(flow_cookie, session_cookie, flowID, csrf_token, traits) + if err != nil { + log.ErrorLogger("Kratos post settings update profile flow failed", err) + + errCode, _ := strconv.Atoi((strings.Split(err.Error(), " "))[0]) + c.JSON(errCode, gin.H{ + "error": err.Error(), + "message": "Kratos post settings update profile flow failed", + }) + return } c.JSON(http.StatusOK, gin.H{ @@ -129,7 +125,6 @@ func HandleUpdateProfile(c *gin.Context) { "img_url": req_body.Traits.ImgURL, "phone_number": req_body.Traits.PhoneNumber, "invite_status": req_body.Traits.InviteStatus, - "verified": req_body.Traits.Verified, "role": req_body.Traits.Role, "created_at": req_body.Traits.Created_At, "totp_enabled": req_body.Traits.TOTP_Enabled, @@ -170,25 +165,6 @@ func HandleUpdateProfile(c *gin.Context) { return } - //Checking if email is changed then verified will be false - session, err := middleware.GetSession(c) - if err != nil { - log.ErrorLogger("Unable to get session", err) - errCode, _ := strconv.Atoi(strings.Split(err.Error(), " ")[0]) - c.JSON(errCode, gin.H{ - "error": err.Error(), - "message": "Unable to get session", - }) - return - } - identity := session.GetIdentity() - traits := identity.GetTraits() - profile := traits.(map[string]interface{}) - - if profile["email"] != traitsinterface["email"] { - traitsinterface["verified"] = false - } - msg, err := settings.SubmitSettingsFlowProfileMethod(flow_cookie, session_cookie, req_body.FlowID, req_body.CsrfToken, traitsinterface) if err != nil { @@ -278,9 +254,6 @@ func HandleChangePassword(c *gin.Context) { profile["password"] = req_body.Password if recovery_cookie != "" { - if profile["verified"] == false { - profile["verified"] = true - } if profile["invite_status"] == "pending" { profile["invite_status"] = "accepted" } diff --git a/pkg/wrapper/kratos/admin/admin.go b/pkg/wrapper/kratos/admin/admin.go index 8150855..00bfa1b 100644 --- a/pkg/wrapper/kratos/admin/admin.go +++ b/pkg/wrapper/kratos/admin/admin.go @@ -20,7 +20,6 @@ func CreateIdentityFlowWrapper(data Identity) (*client.Identity, *http.Response, "phone_number": data.PhoneNumber, "img_url": data.ImgURL, "invite_status": "pending", - "verified": false, "role": data.Role, "created_at": timeStamp, "totp_enabled": false, diff --git a/pkg/wrapper/kratos/registration/registration.go b/pkg/wrapper/kratos/registration/registration.go index 37e296e..ae14099 100644 --- a/pkg/wrapper/kratos/registration/registration.go +++ b/pkg/wrapper/kratos/registration/registration.go @@ -44,7 +44,6 @@ func SubmitRegistrationFlowWrapper(cookie string, flowID string, csrfToken strin "img_url": data.ImgURL, "phone_number": data.PhoneNumber, "invite_status": "self_created", - "verified": false, "role": "user", "created_at": timeStamp, "totp_enabled": false, diff --git a/pkg/wrapper/kratos/settings/types.go b/pkg/wrapper/kratos/settings/types.go index 387a107..026bfc7 100644 --- a/pkg/wrapper/kratos/settings/types.go +++ b/pkg/wrapper/kratos/settings/types.go @@ -45,7 +45,6 @@ type Traits struct { ImgURL string `json:"img_url,omitempty"` PhoneNumber string `json:"phone_number"` InviteStatus string `json:"invite_status"` - Verified bool `json:"verified"` Role string `json:"role"` Created_At string `json:"created_at"` TOTP_Enabled bool `json:"totp_enabled"` diff --git a/schema/identity.schema.json b/schema/identity.schema.json index 266e5e6..3ad6101 100644 --- a/schema/identity.schema.json +++ b/schema/identity.schema.json @@ -54,10 +54,6 @@ "type": "boolean", "title": "Active" }, - "verified": { - "type": "integer", - "title": "Verified" - }, "isAdmin":{ "type": "boolean", "title": "Role" diff --git a/schema/users.json b/schema/users.json index 90f95a4..b0b67f8 100644 --- a/schema/users.json +++ b/schema/users.json @@ -54,10 +54,6 @@ "type": "boolean", "title": "Active" }, - "verified": { - "type": "integer", - "title": "Verified" - }, "created_at": { "type": "string", "format": "date-time",