Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Gracefully handle lack of permissions on webhook and permission

Browse source
This commit is contained in:
Eli Ribble 2026-02-10 18:54:47 +00:00
parent b3ab8f6cef
commit a92cb52eb5
No known key found for this signature in database
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
background/arcgis.go
View file

@ -153,7 +153,7 @@ func refreshFieldseekerData(ctx context.Context, newOauthCh <-chan struct{}) {
err := maintainOAuth(workerCtx, oauth) err := maintainOAuth(workerCtx, oauth)
if err != nil { if err != nil {
markTokenFailed(ctx, oauth) markTokenFailed(ctx, oauth)
if errors.Is(err, arcgis.InvalidatedRefreshTokenError) { if errors.Is(err, arcgis.ErrorInvalidatedRefreshToken) {
log.Info().Int("oauth_token.id", int(oauth.ID)).Msg("Marked invalid by the server") log.Info().Int("oauth_token.id", int(oauth.ID)).Msg("Marked invalid by the server")
} else { } else {
debug.LogErrorTypeInfo(err) debug.LogErrorTypeInfo(err)
@ -421,7 +421,12 @@ func updatePortalData(ctx context.Context, client *arcgis.ArcGIS, user_id int32)
func maybeCreateWebhook(ctx context.Context, client *fieldseeker.FieldSeeker) { func maybeCreateWebhook(ctx context.Context, client *fieldseeker.FieldSeeker) {
webhooks, err := client.WebhookList() webhooks, err := client.WebhookList()
if err != nil { if err != nil {
if errors.Is(err, arcgis.ErrorNotPermitted) {
log.Info().Msg("This oauth token is not allowed to get webhooks")
return
}
log.Error().Err(err).Msg("Failed to get webhooks") log.Error().Err(err).Msg("Failed to get webhooks")
return
} }
for _, hook := range webhooks { for _, hook := range webhooks {
if hook.Name == "Nidus Sync" { if hook.Name == "Nidus Sync" {
@ -439,6 +444,7 @@ func periodicallyExportFieldseeker(ctx context.Context, org *models.Organization
case <-ctx.Done(): case <-ctx.Done():
return nil return nil
case <-pollTicker.C: case <-pollTicker.C:
pollTicker = time.NewTicker(15 * time.Minute)
oauth, err := GetOAuthForOrg(ctx, org) oauth, err := GetOAuthForOrg(ctx, org)
if err != nil { if err != nil {
return fmt.Errorf("Failed to get oauth for org: %w", err) return fmt.Errorf("Failed to get oauth for org: %w", err)
@ -450,7 +456,6 @@ func periodicallyExportFieldseeker(ctx context.Context, org *models.Organization
return fmt.Errorf("Failed to export Fieldseeker data: %w", err) return fmt.Errorf("Failed to export Fieldseeker data: %w", err)
} }
log.Info().Msg("Completed exporting data, waiting 15 minutes to go agoin.") log.Info().Msg("Completed exporting data, waiting 15 minutes to go agoin.")
pollTicker = time.NewTicker(15 * time.Minute)
} }
} }
} }
@ -539,6 +544,10 @@ func logPermissions(ctx context.Context, org *models.Organization, oauth *models
} }
_, err = fssync.AdminInfo() _, err = fssync.AdminInfo()
if err != nil { if err != nil {
if errors.Is(err, arcgis.ErrorNotPermitted) {
log.Info().Msg("This oauth token is not allowed to query for admin info")
return
}
log.Error().Err(err).Msg("Failed to get admin info log permissions") log.Error().Err(err).Msg("Failed to get admin info log permissions")
return return
} }