Support custom domain verification #9
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarkRunWu
commented
Dec 12, 2023
MarkRunWu
force-pushed
the
domain-verification
branch
from
be0af3b to
9500515
Compare
MarkRunWu
force-pushed
the
domain-verification
branch
from
9500515 to
2954682
Compare
kiootic
reviewed
Dec 12, 2023
internal/handler/site/handler.go
Outdated
Comment on lines
139
to
143
| entry := middleware.GetLogEntry(r) | ||
| if entry != nil { | ||
| e := entry.(*httputil.LogEntry) | ||
| e.Logger = e.Logger.With(zap.String("site", handler.ID())) | ||
| } |
There was a problem hiding this comment.
I don't think we should check for nil here; we assume it is always provided in context throughout the request lifecycle. We can instead provide a placeholder logger for testing purpose.
MarkRunWu
force-pushed
the
domain-verification
branch
from
05051e7 to
c8685fb
Compare
MarkRunWu
force-pushed
the
domain-verification
branch
from
c8685fb to
6370bb7
Compare
|
@kiootic Updated, 🙇 Here tui changes:
|
MarkRunWu
force-pushed
the
domain-verification
branch
from
0b5429d to
dde0c4d
Compare
kiootic
reviewed
Dec 15, 2023
| } | ||
| config, ok := app.Config.ResolveDomain(domainName) | ||
| if ok { | ||
| c.CreateDomain(ctx, models.NewDomain( |
Comment on lines
98
to
99
| c.DeleteDomain(ctx, domain.ID, now) | ||
| c.CreateDomain(ctx, models.NewDomain( |
| } | ||
| } else { | ||
| if domain != nil && domain.AppID == domainVerification.AppID { | ||
| c.DeleteDomain(ctx, domain.ID, now) |
|
|
||
| func (q query[T]) ScheduleDomainVerificationAt(ctx context.Context, id string, time time.Time) error { | ||
| _, err := q.ext.ExecContext(ctx, ` | ||
| UPDATE domain_verification SET |
| entry := middleware.GetLogEntry(r).(*httputil.LogEntry) | ||
| entry.Logger = entry.Logger.With(zap.String("user", authn.Subject)) | ||
| entry := middleware.GetLogEntry(r) | ||
| if entry != nil { |
Comment on lines
97
to
102
| if c.Config.DomainVerificationEnabled { | ||
| c.handleDomainVerification(w, r) | ||
| } else { | ||
| c.handleDomainCreate(w, r) | ||
| } | ||
| }) |
There was a problem hiding this comment.
Can we merge the two functions together?
Comment on lines
25
to
32
| num1, err := rand.Int(rand.Reader, big.NewInt(999999)) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| num2, err := rand.Int(rand.Reader, big.NewInt(999999)) | ||
| if err != nil { | ||
| panic(err) | ||
| } |
There was a problem hiding this comment.
You can reference RandomID function instead to use random bytes directly.
|
@kiootic updated 🙇 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#7