feat: complete registration invitation and auth redesign

server/db/mysql/tenant_adapter.go

@@ -152,7 +152,7 @@ func (a *adapter) TenantUserGet(id t.TenantID, uid t.Uid) (*t.User, error) {
 		defer cancel()
 	}
 	var user t.User
-	err = a.db.GetContext(ctx, &user, `SELECT tenant_id,id,createdat,updatedat,state,stateat,access,lastseen,useragent,
+	err = a.db.GetContext(ctx, &user, `SELECT tenant_id,id,username,createdat,updatedat,state,stateat,access,lastseen,useragent,
 		COALESCE(phone,'') AS phone,public,trusted FROM im_users WHERE tenant_id=? AND id=? AND state!=?`,
 		id, decodeUID(uid), t.StateDeleted)
 	if err == sql.ErrNoRows {
@@ -165,6 +165,43 @@ func (a *adapter) TenantUserGet(id t.TenantID, uid t.Uid) (*t.User, error) {
 	return &user, nil
 }
 
+func (a *adapter) TenantUserGetByPhone(id t.TenantID, phone string) (t.Uid, error) {
+	tenantAdp, err := a.routedTenantAdapter(id)
+	if err != nil || phone == "" {
+		return t.ZeroUid, t.ErrMalformed
+	}
+	if tenantAdp != a || a.tenantScopedDB {
+		ctx, cancel := tenantAdp.getContext()
+		if cancel != nil {
+			defer cancel()
+		}
+		var decoded int64
+		err = tenantAdp.db.GetContext(ctx, &decoded,
+			"SELECT id FROM im_users WHERE phone=? AND state!=?", phone, t.StateDeleted)
+		if err == sql.ErrNoRows {
+			return t.ZeroUid, nil
+		}
+		if err != nil {
+			return t.ZeroUid, err
+		}
+		return store.EncodeUid(decoded), nil
+	}
+	ctx, cancel := a.getContext()
+	if cancel != nil {
+		defer cancel()
+	}
+	var decoded int64
+	err = a.db.GetContext(ctx, &decoded,
+		"SELECT id FROM im_users WHERE tenant_id=? AND phone=? AND state!=?", id, phone, t.StateDeleted)
+	if err == sql.ErrNoRows {
+		return t.ZeroUid, nil
+	}
+	if err != nil {
+		return t.ZeroUid, err
+	}
+	return store.EncodeUid(decoded), nil
+}
+
 func (a *adapter) TenantUserGetAll(id t.TenantID, uids ...t.Uid) ([]t.User, error) {
 	tenantAdp, err := a.routedTenantAdapter(id)
 	if err != nil {
@@ -201,10 +238,10 @@ func (a *adapter) tenantUserGetAllTx(ctx context.Context, tx *sqlx.Tx, id t.Tena
 	var q string
 	var params []any
 	if a.tenantScopedDB {
-		q, params, _ = sqlx.In(`SELECT id,createdat,updatedat,state,stateat,access,lastseen,useragent,
+		q, params, _ = sqlx.In(`SELECT id,username,createdat,updatedat,state,stateat,access,lastseen,useragent,
 			COALESCE(phone,'') AS phone,public,trusted FROM im_users WHERE id IN (?) AND state!=?`, args, t.StateDeleted)
 	} else {
-		q, params, _ = sqlx.In(`SELECT tenant_id,id,createdat,updatedat,state,stateat,access,lastseen,useragent,
+		q, params, _ = sqlx.In(`SELECT tenant_id,id,username,createdat,updatedat,state,stateat,access,lastseen,useragent,
 			COALESCE(phone,'') AS phone,public,trusted FROM im_users WHERE tenant_id=? AND id IN (?) AND state!=?`, id, args, t.StateDeleted)
 	}
 	query := a.db.Rebind(q)
@@ -7052,8 +7089,7 @@ func (a *adapter) TenantUserSearch(id t.TenantID, viewer t.Uid, queryText, searc
 		where = append(where, "(profile.nickname LIKE ? OR profile.public_account LIKE ? OR CAST(u.public AS CHAR) LIKE ? OR u.id=?)")
 		args = append(args, like, like, like, userIDNumericArg(queryText))
 	case "exact_account":
-		joins = append(joins, "LEFT JOIN im_auth AS account_auth ON account_auth.userid=u.id AND account_auth.scheme='basic'")
-		where = append(where, "(profile.public_account=? OR account_auth.uname=? OR u.id=?)")
+		where = append(where, "(profile.public_account=? OR u.username=? OR u.id=?)")
 		args = append(args, queryText, strings.TrimPrefix(queryText, "basic:"), userIDNumericArg(queryText))
 	case "phone":
 		addMethod = "phone"
@@ -7072,7 +7108,7 @@ func (a *adapter) TenantUserSearch(id t.TenantID, viewer t.Uid, queryText, searc
 	if cancel != nil {
 		defer cancel()
 	}
-	rows, err := a.db.QueryxContext(ctx, `SELECT DISTINCT u.id,u.createdat,u.updatedat,u.state,u.stateat,u.access,u.lastseen,u.useragent,
+	rows, err := a.db.QueryxContext(ctx, `SELECT DISTINCT u.id,u.username,u.createdat,u.updatedat,u.state,u.stateat,u.access,u.lastseen,u.useragent,
 		COALESCE(u.phone,'') AS phone,u.public,u.trusted FROM im_users AS u `+strings.Join(joins, " ")+`
 		WHERE `+strings.Join(where, " AND ")+` ORDER BY u.id ASC LIMIT ?`, args...)
 	if err != nil {