auth+cli
This commit is contained in:
parent
314cbd37c7
commit
07522043b4
16 changed files with 870 additions and 38 deletions
|
|
@ -28,7 +28,11 @@ func (a *App) listProjects(ctx context.Context, userID string) ([]Project, error
|
|||
t := deployedAt.Time.UTC()
|
||||
p.LastDeployedAt = &t
|
||||
}
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken)
|
||||
tok, err := a.ensureUserWebhookToken(ctx, p.UserID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken, tok.Token)
|
||||
p.AppURL = a.appURL(p.RouteHost)
|
||||
out = append(out, p)
|
||||
}
|
||||
|
|
@ -80,7 +84,11 @@ func (a *App) createProject(ctx context.Context, user User, workspaceID int64, n
|
|||
|
||||
p.Workspace = workspace.Name
|
||||
p.UnixUser = workspace.UnixUser
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken)
|
||||
tok, err := a.ensureUserWebhookToken(ctx, p.UserID)
|
||||
if err != nil {
|
||||
return Project{}, err
|
||||
}
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken, tok.Token)
|
||||
p.AppURL = a.appURL(p.RouteHost)
|
||||
return p, a.provisionProject(ctx, &p)
|
||||
}
|
||||
|
|
@ -168,7 +176,11 @@ func (a *App) getProject(ctx context.Context, userID string, projectID int64) (P
|
|||
t := deployedAt.Time.UTC()
|
||||
p.LastDeployedAt = &t
|
||||
}
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken)
|
||||
tok, err := a.ensureUserWebhookToken(ctx, p.UserID)
|
||||
if err != nil {
|
||||
return Project{}, err
|
||||
}
|
||||
p.WebhookURL = a.deployWebhookURL(p.ID, p.DeployToken, tok.Token)
|
||||
p.AppURL = a.appURL(p.RouteHost)
|
||||
return p, nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue