fix(api): authentication consumer migration (#5850)

fsamin · web-flow · commit 09c1cf034bb9 · 2021-06-16T18:17:57.000+02:00
Signed-off-by: francois  samin &lt;francois.samin@corp.ovh.com&gt;
diff --git a/engine/api/migrate/migrate_auth_consumer_token_expiration.go b/engine/api/migrate/migrate_auth_consumer_token_expiration.go
@@ -47,7 +47,7 @@ func AuthConsumerTokenExpiration(ctx context.Context, dbFunc func() *gorp.DbMap,
 
 func authConsumerTokenExpirationPerID(ctx context.Context, tx gorpmapper.SqlExecutorWithTx, id string, duration time.Duration) error {
 	// Lock the row
-	id, err := tx.SelectStr("select id from auth_consumer where id=$1 and validity_periods is null for update skip locked")
+	id, err := tx.SelectStr("select id from auth_consumer where id=$1 and validity_periods is null for update skip locked", id)
 	if err == sql.ErrNoRows {
 		return nil
 	}
@@ -70,7 +70,7 @@ func authConsumerTokenExpirationPerID(ctx context.Context, tx gorpmapper.SqlExec
 		return nil
 	}
 
-	consumer.ValidityPeriods = sdk.NewAuthConsumerValidityPeriod(time.Now(), duration)
+	consumer.ValidityPeriods = sdk.NewAuthConsumerValidityPeriod(consumer.DeprecatedIssuedAt, duration)
 	log.Info(ctx, "consumer %q IAT=%v Expiration=%v", consumer.ID, consumer.ValidityPeriods.Latest().IssuedAt, consumer.ValidityPeriods.Latest().IssuedAt.Add(consumer.ValidityPeriods.Latest().Duration))
 
 	return authentication.UpdateConsumer(ctx, tx, consumer)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func AuthConsumerTokenExpiration(ctx context.Context, dbFunc func() *gorp.DbMap,`
`47`	`47`
`48`	`48`	`func authConsumerTokenExpirationPerID(ctx context.Context, tx gorpmapper.SqlExecutorWithTx, id string, duration time.Duration) error {`
`49`	`49`	`// Lock the row`
`50`		`- id, err := tx.SelectStr("select id from auth_consumer where id=$1 and validity_periods is null for update skip locked")`
	`50`	`+ id, err := tx.SelectStr("select id from auth_consumer where id=$1 and validity_periods is null for update skip locked", id)`
`51`	`51`	`if err == sql.ErrNoRows {`
`52`	`52`	`return nil`
`53`	`53`	`}`
`@@ -70,7 +70,7 @@ func authConsumerTokenExpirationPerID(ctx context.Context, tx gorpmapper.SqlExec`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`	`72`
`73`		`- consumer.ValidityPeriods = sdk.NewAuthConsumerValidityPeriod(time.Now(), duration)`
	`73`	`+ consumer.ValidityPeriods = sdk.NewAuthConsumerValidityPeriod(consumer.DeprecatedIssuedAt, duration)`
`74`	`74`	`log.Info(ctx, "consumer %q IAT=%v Expiration=%v", consumer.ID, consumer.ValidityPeriods.Latest().IssuedAt, consumer.ValidityPeriods.Latest().IssuedAt.Add(consumer.ValidityPeriods.Latest().Duration))`
`75`	`75`
`76`	`76`	`return authentication.UpdateConsumer(ctx, tx, consumer)`