Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions api/auth_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,19 @@ func (app *ApiServer) authMiddleware(c *fiber.Ctx) error {
} else {
wallet = app.recoverAuthorityFromSignatureHeaders(c)
myId = app.getMyId(c)
// OAuth JWT fallback: when Bearer token is not api_access_key, try as OAuth JWT (Plans app)
if wallet == "" && myId != 0 {
if authHeader := c.Get("Authorization"); authHeader != "" && strings.HasPrefix(authHeader, "Bearer ") {
token := strings.TrimSpace(strings.TrimPrefix(authHeader, "Bearer "))
if token != "" {
if oauthWallet, jwtUserId, err := app.validateOAuthJWTTokenToWalletAndUserId(c.Context(), token); err == nil {
if int32(jwtUserId) == myId {
wallet = oauthWallet
}
}
}
}
}
}

c.Locals("authedWallet", wallet)
Expand Down
65 changes: 0 additions & 65 deletions api/frontend_auth.go

This file was deleted.

24 changes: 14 additions & 10 deletions api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,11 @@ func NewApiServer(config config.Config) *ApiServer {
g.Get("/users/:userId/balance/history", app.v1UsersBalanceHistory)
g.Get("/users/:userId/managers", app.v1UsersManagers)
g.Get("/users/:userId/managed_users", app.v1UsersManagedUsers)
g.Post("/users/:userId/grants", app.requireAuthMiddleware, app.postV1UsersGrant)
g.Delete("/users/:userId/grants/:address", app.requireAuthMiddleware, app.deleteV1UsersGrant)
g.Post("/users/:userId/managers", app.requireAuthMiddleware, app.postV1UsersManager)
g.Delete("/users/:userId/managers/:managerUserId", app.requireAuthMiddleware, app.deleteV1UsersManager)
g.Post("/users/:userId/grants/approve", app.requireAuthMiddleware, app.postV1UsersApproveGrant)
g.Get("/users/:userId/mutuals", app.v1UsersMutuals)
g.Get("/users/:userId/reposts", app.v1UsersReposts)
g.Get("/users/:userId/related", app.v1UsersRelated)
Expand Down Expand Up @@ -433,12 +438,6 @@ func NewApiServer(config config.Config) *ApiServer {
g.Get("/users/:userId/authorized-apps", app.v1UsersAuthorizedApps)
g.Get("/users/:userId/developer_apps", app.v1UsersDeveloperApps)
g.Get("/users/:userId/developer-apps", app.v1UsersDeveloperApps)
frontendAuth := app.requireFrontendAppAuth(config.AudiusApiSecret, "Plans app")
g.Post("/users/:userId/developer_apps", frontendAuth, app.postV1UsersDeveloperAppCreate)
g.Post("/users/:userId/developer-apps", frontendAuth, app.postV1UsersDeveloperAppCreate)
g.Delete("/users/:userId/developer-apps/:address", frontendAuth, app.deleteV1UsersDeveloperApp)
g.Post("/users/:userId/developer-apps/:address/access-keys/deactivate", frontendAuth, app.postV1UsersDeveloperAppAccessKeyDeactivate)
g.Post("/users/:userId/developer-apps/:address/access-keys", frontendAuth, app.postV1UsersDeveloperAppAccessKeyCreate)
g.Get("/users/:userId/withdrawals/download", app.requireAuthForUserId, app.v1UsersWithdrawalsDownloadCsv)
g.Get("/users/:userId/withdrawals/download/json", app.requireAuthForUserId, app.v1UsersWithdrawalsDownloadJson)
g.Post("/users/:userId/follow", app.requireAuthMiddleware, app.postV1UserFollow)
Expand Down Expand Up @@ -527,12 +526,17 @@ func NewApiServer(config config.Config) *ApiServer {
g.Get("/search/full", app.v1SearchFull)
g.Get("/search/tags", app.v1SearchFull)

// Developer Apps
// Developer Apps (Plans API - user_id query; indexer validates grants)
g.Get("/developer_apps/:address", app.v1DeveloperApps)
g.Get("/developer-apps/:address", app.v1DeveloperApps)
g.Post("/developer-apps", app.requireAuthMiddleware, app.postV1DeveloperApp)
g.Put("/developer-apps/:address", app.requireAuthMiddleware, app.putV1DeveloperApp)
g.Delete("/developer-apps/:address", app.requireAuthMiddleware, app.deleteV1DeveloperApp)
g.Post("/developer_apps", app.postV1UsersDeveloperApp)
g.Post("/developer-apps", app.postV1UsersDeveloperApp)
g.Delete("/developer_apps/:address", app.deleteV1UsersDeveloperApp)
g.Delete("/developer-apps/:address", app.deleteV1UsersDeveloperApp)
g.Post("/developer_apps/:address/access-keys/deactivate", app.postV1UsersDeveloperAppAccessKeyDeactivate)
g.Post("/developer-apps/:address/access-keys/deactivate", app.postV1UsersDeveloperAppAccessKeyDeactivate)
g.Post("/developer_apps/:address/access-keys", app.postV1UsersDeveloperAppAccessKey)
g.Post("/developer-apps/:address/access-keys", app.postV1UsersDeveloperAppAccessKey)

// Rewards
g.Post("/rewards/claim", app.v1ClaimRewards)
Expand Down
Loading