profile: show warning and option to reactivate when contact method is disabled

engine/verifymanager/db.go

@@ -22,7 +22,7 @@ func (db *DB) Name() string { return "Engine.VerificationManager" }
 func NewDB(ctx context.Context, db *sql.DB) (*DB, error) {
 	lock, err := processinglock.NewLock(ctx, db, processinglock.Config{
 		Type:    processinglock.TypeVerify,
-		Version: 1,
+		Version: 2,
 	})
 	if err != nil {
 		return nil, err
@@ -34,15 +34,16 @@ func NewDB(ctx context.Context, db *sql.DB) (*DB, error) {
 		insertMessages: p.P(`
 			with rows as (
 				insert into outgoing_messages (message_type, contact_method_id, user_id, user_verification_code_id)
-				select 'verification_message', send_to, user_id, code.id
+				select 'verification_message', contact_method_id, cm.user_id, code.id
 				from user_verification_codes code
-				where send_to notnull and now() < expires_at
+				join user_contact_methods cm on cm.id = contact_method_id
+				where not sent and now() < expires_at
 				limit 100
 				for update skip locked
 				returning user_verification_code_id id
 			)
 			update user_verification_codes code
-			set send_to = null
+			set sent = true
 			from rows
 			where code.id = rows.id
 		`),

graphql/contactmethod.go

@@ -170,77 +170,3 @@ func (h *Handler) sendContactMethodTest() *g.Field {
 		},
 	}
 }
-
-func (h *Handler) sendContactMethodVerification() *g.Field {
-	return &g.Field{
-		Type: g.NewObject(g.ObjectConfig{
-			Name:   "SendContactMethodVerification",
-			Fields: g.Fields{"id": &g.Field{Type: g.String}},
-		}),
-		Args: g.FieldConfigArgument{
-			"input": &g.ArgumentConfig{
-				Type: g.NewInputObject(g.InputObjectConfig{
-					Name: "SendContactMethodVerificationInput",
-					Fields: g.InputObjectConfigFieldMap{
-						"contact_method_id": &g.InputObjectFieldConfig{Type: g.NewNonNull(g.String)},
-						"resend":            &g.InputObjectFieldConfig{Type: g.Boolean},
-					},
-				}),
-			},
-		},
-		Resolve: func(p g.ResolveParams) (interface{}, error) {
-			m, ok := p.Args["input"].(map[string]interface{})
-			if !ok {
-				return nil, errors.New("invalid input type")
-			}
-
-			resend, _ := m["resend"].(bool)
-			var result struct {
-				CMID string `json:"id"`
-			}
-			result.CMID, _ = m["contact_method_id"].(string)
-
-			err := h.c.NotificationStore.SendContactMethodVerification(p.Context, result.CMID, resend)
-			return newScrubber(p.Context).scrub(result, err)
-		},
-	}
-}
-
-func (h *Handler) verifyContactMethod() *g.Field {
-	return &g.Field{
-		Type: g.NewObject(g.ObjectConfig{
-			Name: "VerifyContactMethodOutput",
-			Fields: g.Fields{
-				"contact_method_ids": &g.Field{Type: g.NewList(g.String), Description: "IDs of contact methods that have been enabled by this operation."}},
-		}),
-		Args: g.FieldConfigArgument{
-			"input": &g.ArgumentConfig{
-				Type: g.NewInputObject(g.InputObjectConfig{
-					Name: "VerifyContactMethodInput",
-					Fields: g.InputObjectConfigFieldMap{
-						"verification_code": &g.InputObjectFieldConfig{Type: g.NewNonNull(g.Int)},
-						"contact_method_id": &g.InputObjectFieldConfig{Type: g.NewNonNull(g.String)},
-					},
-				}),
-			},
-		},
-		Resolve: func(p g.ResolveParams) (interface{}, error) {
-			m, ok := p.Args["input"].(map[string]interface{})
-			if !ok {
-				return nil, errors.New("invalid input type")
-			}
-
-			id, _ := m["contact_method_id"].(string)
-			var code int
-			code, _ = m["verification_code"].(int)
-
-			changed, err := h.c.NotificationStore.VerifyContactMethod(p.Context, id, code)
-			var result struct {
-				IDs []string `json:"contact_method_ids"`
-			}
-			result.IDs = changed
-			return newScrubber(p.Context).scrub(result, err)
-
-		},
-	}
-}

graphql/schema.go

@@ -91,8 +91,6 @@ func (h *Handler) buildSchema() error {
 		"createAll":                          h.createAllField(),
 		"updateConfigLimit":                  h.updateConfigLimitField(),
 		"sendContactMethodTest":              h.sendContactMethodTest(),
-		"sendContactMethodVerification":      h.sendContactMethodVerification(),
-		"verifyContactMethod":                h.verifyContactMethod(),
 		"deleteHeartbeatMonitor":             h.deleteHeartbeatMonitorField(),
 		"updateUserOverride":                 h.updateUserOverrideField(),
 		"deleteAll":                          h.deleteAllField(),