diff --git a/domain/mock_event/pusher.go b/domain/mock_event/pusher.go index d87e2cab..0e9a9ecd 100644 --- a/domain/mock_event/pusher.go +++ b/domain/mock_event/pusher.go @@ -5,41 +5,42 @@ package mock_event import ( + reflect "reflect" + event "github.com/camphor-/relaym-server/domain/event" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockPusher is a mock of Pusher interface +// MockPusher is a mock of Pusher interface. type MockPusher struct { ctrl *gomock.Controller recorder *MockPusherMockRecorder } -// MockPusherMockRecorder is the mock recorder for MockPusher +// MockPusherMockRecorder is the mock recorder for MockPusher. type MockPusherMockRecorder struct { mock *MockPusher } -// NewMockPusher creates a new mock instance +// NewMockPusher creates a new mock instance. func NewMockPusher(ctrl *gomock.Controller) *MockPusher { mock := &MockPusher{ctrl: ctrl} mock.recorder = &MockPusherMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockPusher) EXPECT() *MockPusherMockRecorder { return m.recorder } -// Push mocks base method +// Push mocks base method. func (m *MockPusher) Push(pushMsg *event.PushMessage) { m.ctrl.T.Helper() m.ctrl.Call(m, "Push", pushMsg) } -// Push indicates an expected call of Push +// Push indicates an expected call of Push. func (mr *MockPusherMockRecorder) Push(pushMsg interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Push", reflect.TypeOf((*MockPusher)(nil).Push), pushMsg) diff --git a/domain/mock_repository/auth.go b/domain/mock_repository/auth.go index c5bc5037..23ba0459 100644 --- a/domain/mock_repository/auth.go +++ b/domain/mock_repository/auth.go @@ -5,79 +5,81 @@ package mock_repository import ( + reflect "reflect" + entity "github.com/camphor-/relaym-server/domain/entity" gomock "github.com/golang/mock/gomock" oauth2 "golang.org/x/oauth2" - reflect "reflect" ) -// MockAuth is a mock of Auth interface +// MockAuth is a mock of Auth interface. type MockAuth struct { ctrl *gomock.Controller recorder *MockAuthMockRecorder } -// MockAuthMockRecorder is the mock recorder for MockAuth +// MockAuthMockRecorder is the mock recorder for MockAuth. type MockAuthMockRecorder struct { mock *MockAuth } -// NewMockAuth creates a new mock instance +// NewMockAuth creates a new mock instance. func NewMockAuth(ctrl *gomock.Controller) *MockAuth { mock := &MockAuth{ctrl: ctrl} mock.recorder = &MockAuthMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockAuth) EXPECT() *MockAuthMockRecorder { return m.recorder } -// StoreORUpdateToken mocks base method -func (m *MockAuth) StoreORUpdateToken(userID string, token *oauth2.Token) error { +// DeleteState mocks base method. +func (m *MockAuth) DeleteState(state string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoreORUpdateToken", userID, token) + ret := m.ctrl.Call(m, "DeleteState", state) ret0, _ := ret[0].(error) return ret0 } -// StoreORUpdateToken indicates an expected call of StoreORUpdateToken -func (mr *MockAuthMockRecorder) StoreORUpdateToken(userID, token interface{}) *gomock.Call { +// DeleteState indicates an expected call of DeleteState. +func (mr *MockAuthMockRecorder) DeleteState(state interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreORUpdateToken", reflect.TypeOf((*MockAuth)(nil).StoreORUpdateToken), userID, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteState", reflect.TypeOf((*MockAuth)(nil).DeleteState), state) } -// GetTokenByUserID mocks base method -func (m *MockAuth) GetTokenByUserID(userID string) (*oauth2.Token, error) { +// FindStateByState mocks base method. +func (m *MockAuth) FindStateByState(state string) (*entity.AuthState, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetTokenByUserID", userID) - ret0, _ := ret[0].(*oauth2.Token) + ret := m.ctrl.Call(m, "FindStateByState", state) + ret0, _ := ret[0].(*entity.AuthState) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetTokenByUserID indicates an expected call of GetTokenByUserID -func (mr *MockAuthMockRecorder) GetTokenByUserID(userID interface{}) *gomock.Call { +// FindStateByState indicates an expected call of FindStateByState. +func (mr *MockAuthMockRecorder) FindStateByState(state interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTokenByUserID", reflect.TypeOf((*MockAuth)(nil).GetTokenByUserID), userID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindStateByState", reflect.TypeOf((*MockAuth)(nil).FindStateByState), state) } -// StoreSession mocks base method -func (m *MockAuth) StoreSession(sessionID, userID string) error { +// GetTokenByUserID mocks base method. +func (m *MockAuth) GetTokenByUserID(userID string) (*oauth2.Token, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoreSession", sessionID, userID) - ret0, _ := ret[0].(error) - return ret0 + ret := m.ctrl.Call(m, "GetTokenByUserID", userID) + ret0, _ := ret[0].(*oauth2.Token) + ret1, _ := ret[1].(error) + return ret0, ret1 } -// StoreSession indicates an expected call of StoreSession -func (mr *MockAuthMockRecorder) StoreSession(sessionID, userID interface{}) *gomock.Call { +// GetTokenByUserID indicates an expected call of GetTokenByUserID. +func (mr *MockAuthMockRecorder) GetTokenByUserID(userID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreSession", reflect.TypeOf((*MockAuth)(nil).StoreSession), sessionID, userID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTokenByUserID", reflect.TypeOf((*MockAuth)(nil).GetTokenByUserID), userID) } -// GetUserIDFromSession mocks base method +// GetUserIDFromSession mocks base method. func (m *MockAuth) GetUserIDFromSession(sessionID string) (string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUserIDFromSession", sessionID) @@ -86,51 +88,50 @@ func (m *MockAuth) GetUserIDFromSession(sessionID string) (string, error) { return ret0, ret1 } -// GetUserIDFromSession indicates an expected call of GetUserIDFromSession +// GetUserIDFromSession indicates an expected call of GetUserIDFromSession. func (mr *MockAuthMockRecorder) GetUserIDFromSession(sessionID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserIDFromSession", reflect.TypeOf((*MockAuth)(nil).GetUserIDFromSession), sessionID) } -// StoreState mocks base method -func (m *MockAuth) StoreState(authState *entity.AuthState) error { +// StoreORUpdateToken mocks base method. +func (m *MockAuth) StoreORUpdateToken(userID string, token *oauth2.Token) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoreState", authState) + ret := m.ctrl.Call(m, "StoreORUpdateToken", userID, token) ret0, _ := ret[0].(error) return ret0 } -// StoreState indicates an expected call of StoreState -func (mr *MockAuthMockRecorder) StoreState(authState interface{}) *gomock.Call { +// StoreORUpdateToken indicates an expected call of StoreORUpdateToken. +func (mr *MockAuthMockRecorder) StoreORUpdateToken(userID, token interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreState", reflect.TypeOf((*MockAuth)(nil).StoreState), authState) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreORUpdateToken", reflect.TypeOf((*MockAuth)(nil).StoreORUpdateToken), userID, token) } -// FindStateByState mocks base method -func (m *MockAuth) FindStateByState(state string) (*entity.AuthState, error) { +// StoreSession mocks base method. +func (m *MockAuth) StoreSession(sessionID, userID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FindStateByState", state) - ret0, _ := ret[0].(*entity.AuthState) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret := m.ctrl.Call(m, "StoreSession", sessionID, userID) + ret0, _ := ret[0].(error) + return ret0 } -// FindStateByState indicates an expected call of FindStateByState -func (mr *MockAuthMockRecorder) FindStateByState(state interface{}) *gomock.Call { +// StoreSession indicates an expected call of StoreSession. +func (mr *MockAuthMockRecorder) StoreSession(sessionID, userID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindStateByState", reflect.TypeOf((*MockAuth)(nil).FindStateByState), state) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreSession", reflect.TypeOf((*MockAuth)(nil).StoreSession), sessionID, userID) } -// DeleteState mocks base method -func (m *MockAuth) DeleteState(state string) error { +// StoreState mocks base method. +func (m *MockAuth) StoreState(authState *entity.AuthState) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteState", state) + ret := m.ctrl.Call(m, "StoreState", authState) ret0, _ := ret[0].(error) return ret0 } -// DeleteState indicates an expected call of DeleteState -func (mr *MockAuthMockRecorder) DeleteState(state interface{}) *gomock.Call { +// StoreState indicates an expected call of StoreState. +func (mr *MockAuthMockRecorder) StoreState(authState interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteState", reflect.TypeOf((*MockAuth)(nil).DeleteState), state) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreState", reflect.TypeOf((*MockAuth)(nil).StoreState), authState) } diff --git a/domain/mock_repository/session.go b/domain/mock_repository/session.go index ac26d2ea..5540112c 100644 --- a/domain/mock_repository/session.go +++ b/domain/mock_repository/session.go @@ -6,36 +6,66 @@ package mock_repository import ( context "context" + reflect "reflect" + entity "github.com/camphor-/relaym-server/domain/entity" gomock "github.com/golang/mock/gomock" oauth2 "golang.org/x/oauth2" - reflect "reflect" ) -// MockSession is a mock of Session interface +// MockSession is a mock of Session interface. type MockSession struct { ctrl *gomock.Controller recorder *MockSessionMockRecorder } -// MockSessionMockRecorder is the mock recorder for MockSession +// MockSessionMockRecorder is the mock recorder for MockSession. type MockSessionMockRecorder struct { mock *MockSession } -// NewMockSession creates a new mock instance +// NewMockSession creates a new mock instance. func NewMockSession(ctrl *gomock.Controller) *MockSession { mock := &MockSession{ctrl: ctrl} mock.recorder = &MockSessionMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockSession) EXPECT() *MockSessionMockRecorder { return m.recorder } -// FindByID mocks base method +// ArchiveSessionsForBatch mocks base method. +func (m *MockSession) ArchiveSessionsForBatch() error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ArchiveSessionsForBatch") + ret0, _ := ret[0].(error) + return ret0 +} + +// ArchiveSessionsForBatch indicates an expected call of ArchiveSessionsForBatch. +func (mr *MockSessionMockRecorder) ArchiveSessionsForBatch() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ArchiveSessionsForBatch", reflect.TypeOf((*MockSession)(nil).ArchiveSessionsForBatch)) +} + +// DoInTx mocks base method. +func (m *MockSession) DoInTx(ctx context.Context, f func(context.Context) (interface{}, error)) (interface{}, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DoInTx", ctx, f) + ret0, _ := ret[0].(interface{}) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// DoInTx indicates an expected call of DoInTx. +func (mr *MockSessionMockRecorder) DoInTx(ctx, f interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DoInTx", reflect.TypeOf((*MockSession)(nil).DoInTx), ctx, f) +} + +// FindByID mocks base method. func (m *MockSession) FindByID(ctx context.Context, id string) (*entity.Session, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "FindByID", ctx, id) @@ -44,13 +74,13 @@ func (m *MockSession) FindByID(ctx context.Context, id string) (*entity.Session, return ret0, ret1 } -// FindByID indicates an expected call of FindByID +// FindByID indicates an expected call of FindByID. func (mr *MockSessionMockRecorder) FindByID(ctx, id interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockSession)(nil).FindByID), ctx, id) } -// FindByIDForUpdate mocks base method +// FindByIDForUpdate mocks base method. func (m *MockSession) FindByIDForUpdate(ctx context.Context, id string) (*entity.Session, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "FindByIDForUpdate", ctx, id) @@ -59,41 +89,29 @@ func (m *MockSession) FindByIDForUpdate(ctx context.Context, id string) (*entity return ret0, ret1 } -// FindByIDForUpdate indicates an expected call of FindByIDForUpdate +// FindByIDForUpdate indicates an expected call of FindByIDForUpdate. func (mr *MockSessionMockRecorder) FindByIDForUpdate(ctx, id interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByIDForUpdate", reflect.TypeOf((*MockSession)(nil).FindByIDForUpdate), ctx, id) } -// StoreSession mocks base method -func (m *MockSession) StoreSession(arg0 context.Context, arg1 *entity.Session) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "StoreSession", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 -} - -// StoreSession indicates an expected call of StoreSession -func (mr *MockSessionMockRecorder) StoreSession(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreSession", reflect.TypeOf((*MockSession)(nil).StoreSession), arg0, arg1) -} - -// Update mocks base method -func (m *MockSession) Update(arg0 context.Context, arg1 *entity.Session) error { +// FindCreatorTokenBySessionID mocks base method. +func (m *MockSession) FindCreatorTokenBySessionID(arg0 context.Context, arg1 string) (*oauth2.Token, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Update", arg0, arg1) - ret0, _ := ret[0].(error) - return ret0 + ret := m.ctrl.Call(m, "FindCreatorTokenBySessionID", arg0, arg1) + ret0, _ := ret[0].(*oauth2.Token) + ret1, _ := ret[1].(string) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 } -// Update indicates an expected call of Update -func (mr *MockSessionMockRecorder) Update(arg0, arg1 interface{}) *gomock.Call { +// FindCreatorTokenBySessionID indicates an expected call of FindCreatorTokenBySessionID. +func (mr *MockSessionMockRecorder) FindCreatorTokenBySessionID(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockSession)(nil).Update), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindCreatorTokenBySessionID", reflect.TypeOf((*MockSession)(nil).FindCreatorTokenBySessionID), arg0, arg1) } -// StoreQueueTrack mocks base method +// StoreQueueTrack mocks base method. func (m *MockSession) StoreQueueTrack(arg0 context.Context, arg1 *entity.QueueTrackToStore) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "StoreQueueTrack", arg0, arg1) @@ -101,53 +119,36 @@ func (m *MockSession) StoreQueueTrack(arg0 context.Context, arg1 *entity.QueueTr return ret0 } -// StoreQueueTrack indicates an expected call of StoreQueueTrack +// StoreQueueTrack indicates an expected call of StoreQueueTrack. func (mr *MockSessionMockRecorder) StoreQueueTrack(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreQueueTrack", reflect.TypeOf((*MockSession)(nil).StoreQueueTrack), arg0, arg1) } -// FindCreatorTokenBySessionID mocks base method -func (m *MockSession) FindCreatorTokenBySessionID(arg0 context.Context, arg1 string) (*oauth2.Token, string, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "FindCreatorTokenBySessionID", arg0, arg1) - ret0, _ := ret[0].(*oauth2.Token) - ret1, _ := ret[1].(string) - ret2, _ := ret[2].(error) - return ret0, ret1, ret2 -} - -// FindCreatorTokenBySessionID indicates an expected call of FindCreatorTokenBySessionID -func (mr *MockSessionMockRecorder) FindCreatorTokenBySessionID(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindCreatorTokenBySessionID", reflect.TypeOf((*MockSession)(nil).FindCreatorTokenBySessionID), arg0, arg1) -} - -// ArchiveSessionsForBatch mocks base method -func (m *MockSession) ArchiveSessionsForBatch() error { +// StoreSession mocks base method. +func (m *MockSession) StoreSession(arg0 context.Context, arg1 *entity.Session) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ArchiveSessionsForBatch") + ret := m.ctrl.Call(m, "StoreSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } -// ArchiveSessionsForBatch indicates an expected call of ArchiveSessionsForBatch -func (mr *MockSessionMockRecorder) ArchiveSessionsForBatch() *gomock.Call { +// StoreSession indicates an expected call of StoreSession. +func (mr *MockSessionMockRecorder) StoreSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ArchiveSessionsForBatch", reflect.TypeOf((*MockSession)(nil).ArchiveSessionsForBatch)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StoreSession", reflect.TypeOf((*MockSession)(nil).StoreSession), arg0, arg1) } -// DoInTx mocks base method -func (m *MockSession) DoInTx(ctx context.Context, f func(context.Context) (interface{}, error)) (interface{}, error) { +// Update mocks base method. +func (m *MockSession) Update(arg0 context.Context, arg1 *entity.Session) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DoInTx", ctx, f) - ret0, _ := ret[0].(interface{}) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret := m.ctrl.Call(m, "Update", arg0, arg1) + ret0, _ := ret[0].(error) + return ret0 } -// DoInTx indicates an expected call of DoInTx -func (mr *MockSessionMockRecorder) DoInTx(ctx, f interface{}) *gomock.Call { +// Update indicates an expected call of Update. +func (mr *MockSessionMockRecorder) Update(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DoInTx", reflect.TypeOf((*MockSession)(nil).DoInTx), ctx, f) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockSession)(nil).Update), arg0, arg1) } diff --git a/domain/mock_repository/user.go b/domain/mock_repository/user.go index fbcf6a0b..5efe08aa 100644 --- a/domain/mock_repository/user.go +++ b/domain/mock_repository/user.go @@ -5,35 +5,36 @@ package mock_repository import ( + reflect "reflect" + entity "github.com/camphor-/relaym-server/domain/entity" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockUser is a mock of User interface +// MockUser is a mock of User interface. type MockUser struct { ctrl *gomock.Controller recorder *MockUserMockRecorder } -// MockUserMockRecorder is the mock recorder for MockUser +// MockUserMockRecorder is the mock recorder for MockUser. type MockUserMockRecorder struct { mock *MockUser } -// NewMockUser creates a new mock instance +// NewMockUser creates a new mock instance. func NewMockUser(ctrl *gomock.Controller) *MockUser { mock := &MockUser{ctrl: ctrl} mock.recorder = &MockUserMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockUser) EXPECT() *MockUserMockRecorder { return m.recorder } -// FindByID mocks base method +// FindByID mocks base method. func (m *MockUser) FindByID(id string) (*entity.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "FindByID", id) @@ -42,13 +43,13 @@ func (m *MockUser) FindByID(id string) (*entity.User, error) { return ret0, ret1 } -// FindByID indicates an expected call of FindByID +// FindByID indicates an expected call of FindByID. func (mr *MockUserMockRecorder) FindByID(id interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindByID", reflect.TypeOf((*MockUser)(nil).FindByID), id) } -// FindBySpotifyUserID mocks base method +// FindBySpotifyUserID mocks base method. func (m *MockUser) FindBySpotifyUserID(spotifyUserID string) (*entity.User, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "FindBySpotifyUserID", spotifyUserID) @@ -57,13 +58,13 @@ func (m *MockUser) FindBySpotifyUserID(spotifyUserID string) (*entity.User, erro return ret0, ret1 } -// FindBySpotifyUserID indicates an expected call of FindBySpotifyUserID +// FindBySpotifyUserID indicates an expected call of FindBySpotifyUserID. func (mr *MockUserMockRecorder) FindBySpotifyUserID(spotifyUserID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FindBySpotifyUserID", reflect.TypeOf((*MockUser)(nil).FindBySpotifyUserID), spotifyUserID) } -// Store mocks base method +// Store mocks base method. func (m *MockUser) Store(user *entity.User) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Store", user) @@ -71,13 +72,13 @@ func (m *MockUser) Store(user *entity.User) error { return ret0 } -// Store indicates an expected call of Store +// Store indicates an expected call of Store. func (mr *MockUserMockRecorder) Store(user interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Store", reflect.TypeOf((*MockUser)(nil).Store), user) } -// Update mocks base method +// Update mocks base method. func (m *MockUser) Update(user *entity.User) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Update", user) @@ -85,7 +86,7 @@ func (m *MockUser) Update(user *entity.User) error { return ret0 } -// Update indicates an expected call of Update +// Update indicates an expected call of Update. func (mr *MockUserMockRecorder) Update(user interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUser)(nil).Update), user) diff --git a/domain/mock_spotify/auth.go b/domain/mock_spotify/auth.go index e338ce13..24f975ce 100644 --- a/domain/mock_spotify/auth.go +++ b/domain/mock_spotify/auth.go @@ -5,74 +5,76 @@ package mock_spotify import ( + context "context" + reflect "reflect" + gomock "github.com/golang/mock/gomock" oauth2 "golang.org/x/oauth2" - reflect "reflect" ) -// MockAuth is a mock of Auth interface +// MockAuth is a mock of Auth interface. type MockAuth struct { ctrl *gomock.Controller recorder *MockAuthMockRecorder } -// MockAuthMockRecorder is the mock recorder for MockAuth +// MockAuthMockRecorder is the mock recorder for MockAuth. type MockAuthMockRecorder struct { mock *MockAuth } -// NewMockAuth creates a new mock instance +// NewMockAuth creates a new mock instance. func NewMockAuth(ctrl *gomock.Controller) *MockAuth { mock := &MockAuth{ctrl: ctrl} mock.recorder = &MockAuthMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockAuth) EXPECT() *MockAuthMockRecorder { return m.recorder } -// GetAuthURL mocks base method -func (m *MockAuth) GetAuthURL(state string) string { +// Exchange mocks base method. +func (m *MockAuth) Exchange(ctx context.Context, code string) (*oauth2.Token, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAuthURL", state) - ret0, _ := ret[0].(string) - return ret0 + ret := m.ctrl.Call(m, "Exchange", ctx, code) + ret0, _ := ret[0].(*oauth2.Token) + ret1, _ := ret[1].(error) + return ret0, ret1 } -// GetAuthURL indicates an expected call of GetAuthURL -func (mr *MockAuthMockRecorder) GetAuthURL(state interface{}) *gomock.Call { +// Exchange indicates an expected call of Exchange. +func (mr *MockAuthMockRecorder) Exchange(ctx, code interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthURL", reflect.TypeOf((*MockAuth)(nil).GetAuthURL), state) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exchange", reflect.TypeOf((*MockAuth)(nil).Exchange), ctx, code) } -// Exchange mocks base method -func (m *MockAuth) Exchange(code string) (*oauth2.Token, error) { +// GetAuthURL mocks base method. +func (m *MockAuth) GetAuthURL(state string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Exchange", code) - ret0, _ := ret[0].(*oauth2.Token) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret := m.ctrl.Call(m, "GetAuthURL", state) + ret0, _ := ret[0].(string) + return ret0 } -// Exchange indicates an expected call of Exchange -func (mr *MockAuthMockRecorder) Exchange(code interface{}) *gomock.Call { +// GetAuthURL indicates an expected call of GetAuthURL. +func (mr *MockAuthMockRecorder) GetAuthURL(state interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exchange", reflect.TypeOf((*MockAuth)(nil).Exchange), code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthURL", reflect.TypeOf((*MockAuth)(nil).GetAuthURL), state) } -// Refresh mocks base method -func (m *MockAuth) Refresh(token *oauth2.Token) (*oauth2.Token, error) { +// Refresh mocks base method. +func (m *MockAuth) Refresh(ctx context.Context, token *oauth2.Token) (*oauth2.Token, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Refresh", token) + ret := m.ctrl.Call(m, "Refresh", ctx, token) ret0, _ := ret[0].(*oauth2.Token) ret1, _ := ret[1].(error) return ret0, ret1 } -// Refresh indicates an expected call of Refresh -func (mr *MockAuthMockRecorder) Refresh(token interface{}) *gomock.Call { +// Refresh indicates an expected call of Refresh. +func (mr *MockAuthMockRecorder) Refresh(ctx, token interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Refresh", reflect.TypeOf((*MockAuth)(nil).Refresh), token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Refresh", reflect.TypeOf((*MockAuth)(nil).Refresh), ctx, token) } diff --git a/domain/mock_spotify/player.go b/domain/mock_spotify/player.go index ab13cb2b..fd10c768 100644 --- a/domain/mock_spotify/player.go +++ b/domain/mock_spotify/player.go @@ -6,36 +6,37 @@ package mock_spotify import ( context "context" - entity "github.com/camphor-/relaym-server/domain/entity" - gomock "github.com/golang/mock/gomock" reflect "reflect" time "time" + + entity "github.com/camphor-/relaym-server/domain/entity" + gomock "github.com/golang/mock/gomock" ) -// MockPlayer is a mock of Player interface +// MockPlayer is a mock of Player interface. type MockPlayer struct { ctrl *gomock.Controller recorder *MockPlayerMockRecorder } -// MockPlayerMockRecorder is the mock recorder for MockPlayer +// MockPlayerMockRecorder is the mock recorder for MockPlayer. type MockPlayerMockRecorder struct { mock *MockPlayer } -// NewMockPlayer creates a new mock instance +// NewMockPlayer creates a new mock instance. func NewMockPlayer(ctrl *gomock.Controller) *MockPlayer { mock := &MockPlayer{ctrl: ctrl} mock.recorder = &MockPlayerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockPlayer) EXPECT() *MockPlayerMockRecorder { return m.recorder } -// CurrentlyPlaying mocks base method +// CurrentlyPlaying mocks base method. func (m *MockPlayer) CurrentlyPlaying(ctx context.Context) (*entity.CurrentPlayingInfo, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CurrentlyPlaying", ctx) @@ -44,106 +45,106 @@ func (m *MockPlayer) CurrentlyPlaying(ctx context.Context) (*entity.CurrentPlayi return ret0, ret1 } -// CurrentlyPlaying indicates an expected call of CurrentlyPlaying +// CurrentlyPlaying indicates an expected call of CurrentlyPlaying. func (mr *MockPlayerMockRecorder) CurrentlyPlaying(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CurrentlyPlaying", reflect.TypeOf((*MockPlayer)(nil).CurrentlyPlaying), ctx) } -// PlayWithTracksAndPosition mocks base method -func (m *MockPlayer) PlayWithTracksAndPosition(ctx context.Context, deviceID string, trackURIs []string, position time.Duration) error { +// DeleteAllTracksInQueue mocks base method. +func (m *MockPlayer) DeleteAllTracksInQueue(ctx context.Context, deviceID, trackURI string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PlayWithTracksAndPosition", ctx, deviceID, trackURIs, position) + ret := m.ctrl.Call(m, "DeleteAllTracksInQueue", ctx, deviceID, trackURI) ret0, _ := ret[0].(error) return ret0 } -// PlayWithTracksAndPosition indicates an expected call of PlayWithTracksAndPosition -func (mr *MockPlayerMockRecorder) PlayWithTracksAndPosition(ctx, deviceID, trackURIs, position interface{}) *gomock.Call { +// DeleteAllTracksInQueue indicates an expected call of DeleteAllTracksInQueue. +func (mr *MockPlayerMockRecorder) DeleteAllTracksInQueue(ctx, deviceID, trackURI interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PlayWithTracksAndPosition", reflect.TypeOf((*MockPlayer)(nil).PlayWithTracksAndPosition), ctx, deviceID, trackURIs, position) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAllTracksInQueue", reflect.TypeOf((*MockPlayer)(nil).DeleteAllTracksInQueue), ctx, deviceID, trackURI) } -// Pause mocks base method -func (m *MockPlayer) Pause(ctx context.Context, deviceID string) error { +// Enqueue mocks base method. +func (m *MockPlayer) Enqueue(ctx context.Context, trackURI, deviceID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Pause", ctx, deviceID) + ret := m.ctrl.Call(m, "Enqueue", ctx, trackURI, deviceID) ret0, _ := ret[0].(error) return ret0 } -// Pause indicates an expected call of Pause -func (mr *MockPlayerMockRecorder) Pause(ctx, deviceID interface{}) *gomock.Call { +// Enqueue indicates an expected call of Enqueue. +func (mr *MockPlayerMockRecorder) Enqueue(ctx, trackURI, deviceID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Pause", reflect.TypeOf((*MockPlayer)(nil).Pause), ctx, deviceID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Enqueue", reflect.TypeOf((*MockPlayer)(nil).Enqueue), ctx, trackURI, deviceID) } -// Enqueue mocks base method -func (m *MockPlayer) Enqueue(ctx context.Context, trackURI, deviceID string) error { +// GoNextTrack mocks base method. +func (m *MockPlayer) GoNextTrack(ctx context.Context, deviceID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Enqueue", ctx, trackURI, deviceID) + ret := m.ctrl.Call(m, "GoNextTrack", ctx, deviceID) ret0, _ := ret[0].(error) return ret0 } -// Enqueue indicates an expected call of Enqueue -func (mr *MockPlayerMockRecorder) Enqueue(ctx, trackURI, deviceID interface{}) *gomock.Call { +// GoNextTrack indicates an expected call of GoNextTrack. +func (mr *MockPlayerMockRecorder) GoNextTrack(ctx, deviceID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Enqueue", reflect.TypeOf((*MockPlayer)(nil).Enqueue), ctx, trackURI, deviceID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GoNextTrack", reflect.TypeOf((*MockPlayer)(nil).GoNextTrack), ctx, deviceID) } -// SetRepeatMode mocks base method -func (m *MockPlayer) SetRepeatMode(ctx context.Context, on bool, deviceID string) error { +// Pause mocks base method. +func (m *MockPlayer) Pause(ctx context.Context, deviceID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetRepeatMode", ctx, on, deviceID) + ret := m.ctrl.Call(m, "Pause", ctx, deviceID) ret0, _ := ret[0].(error) return ret0 } -// SetRepeatMode indicates an expected call of SetRepeatMode -func (mr *MockPlayerMockRecorder) SetRepeatMode(ctx, on, deviceID interface{}) *gomock.Call { +// Pause indicates an expected call of Pause. +func (mr *MockPlayerMockRecorder) Pause(ctx, deviceID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRepeatMode", reflect.TypeOf((*MockPlayer)(nil).SetRepeatMode), ctx, on, deviceID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Pause", reflect.TypeOf((*MockPlayer)(nil).Pause), ctx, deviceID) } -// SetShuffleMode mocks base method -func (m *MockPlayer) SetShuffleMode(ctx context.Context, on bool, deviceID string) error { +// PlayWithTracksAndPosition mocks base method. +func (m *MockPlayer) PlayWithTracksAndPosition(ctx context.Context, deviceID string, trackURIs []string, position time.Duration) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetShuffleMode", ctx, on, deviceID) + ret := m.ctrl.Call(m, "PlayWithTracksAndPosition", ctx, deviceID, trackURIs, position) ret0, _ := ret[0].(error) return ret0 } -// SetShuffleMode indicates an expected call of SetShuffleMode -func (mr *MockPlayerMockRecorder) SetShuffleMode(ctx, on, deviceID interface{}) *gomock.Call { +// PlayWithTracksAndPosition indicates an expected call of PlayWithTracksAndPosition. +func (mr *MockPlayerMockRecorder) PlayWithTracksAndPosition(ctx, deviceID, trackURIs, position interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetShuffleMode", reflect.TypeOf((*MockPlayer)(nil).SetShuffleMode), ctx, on, deviceID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PlayWithTracksAndPosition", reflect.TypeOf((*MockPlayer)(nil).PlayWithTracksAndPosition), ctx, deviceID, trackURIs, position) } -// DeleteAllTracksInQueue mocks base method -func (m *MockPlayer) DeleteAllTracksInQueue(ctx context.Context, deviceID, trackURI string) error { +// SetRepeatMode mocks base method. +func (m *MockPlayer) SetRepeatMode(ctx context.Context, on bool, deviceID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAllTracksInQueue", ctx, deviceID, trackURI) + ret := m.ctrl.Call(m, "SetRepeatMode", ctx, on, deviceID) ret0, _ := ret[0].(error) return ret0 } -// DeleteAllTracksInQueue indicates an expected call of DeleteAllTracksInQueue -func (mr *MockPlayerMockRecorder) DeleteAllTracksInQueue(ctx, deviceID, trackURI interface{}) *gomock.Call { +// SetRepeatMode indicates an expected call of SetRepeatMode. +func (mr *MockPlayerMockRecorder) SetRepeatMode(ctx, on, deviceID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAllTracksInQueue", reflect.TypeOf((*MockPlayer)(nil).DeleteAllTracksInQueue), ctx, deviceID, trackURI) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRepeatMode", reflect.TypeOf((*MockPlayer)(nil).SetRepeatMode), ctx, on, deviceID) } -// GoNextTrack mocks base method -func (m *MockPlayer) GoNextTrack(ctx context.Context, deviceID string) error { +// SetShuffleMode mocks base method. +func (m *MockPlayer) SetShuffleMode(ctx context.Context, on bool, deviceID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GoNextTrack", ctx, deviceID) + ret := m.ctrl.Call(m, "SetShuffleMode", ctx, on, deviceID) ret0, _ := ret[0].(error) return ret0 } -// GoNextTrack indicates an expected call of GoNextTrack -func (mr *MockPlayerMockRecorder) GoNextTrack(ctx, deviceID interface{}) *gomock.Call { +// SetShuffleMode indicates an expected call of SetShuffleMode. +func (mr *MockPlayerMockRecorder) SetShuffleMode(ctx, on, deviceID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GoNextTrack", reflect.TypeOf((*MockPlayer)(nil).GoNextTrack), ctx, deviceID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetShuffleMode", reflect.TypeOf((*MockPlayer)(nil).SetShuffleMode), ctx, on, deviceID) } diff --git a/domain/mock_spotify/track.go b/domain/mock_spotify/track.go index 66088133..cb0a240f 100644 --- a/domain/mock_spotify/track.go +++ b/domain/mock_spotify/track.go @@ -6,60 +6,61 @@ package mock_spotify import ( context "context" + reflect "reflect" + entity "github.com/camphor-/relaym-server/domain/entity" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockTrackClient is a mock of TrackClient interface +// MockTrackClient is a mock of TrackClient interface. type MockTrackClient struct { ctrl *gomock.Controller recorder *MockTrackClientMockRecorder } -// MockTrackClientMockRecorder is the mock recorder for MockTrackClient +// MockTrackClientMockRecorder is the mock recorder for MockTrackClient. type MockTrackClientMockRecorder struct { mock *MockTrackClient } -// NewMockTrackClient creates a new mock instance +// NewMockTrackClient creates a new mock instance. func NewMockTrackClient(ctrl *gomock.Controller) *MockTrackClient { mock := &MockTrackClient{ctrl: ctrl} mock.recorder = &MockTrackClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockTrackClient) EXPECT() *MockTrackClientMockRecorder { return m.recorder } -// Search mocks base method -func (m *MockTrackClient) Search(ctx context.Context, q string) ([]*entity.Track, error) { +// GetTracksFromURI mocks base method. +func (m *MockTrackClient) GetTracksFromURI(ctx context.Context, trackURIs []string) ([]*entity.Track, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Search", ctx, q) + ret := m.ctrl.Call(m, "GetTracksFromURI", ctx, trackURIs) ret0, _ := ret[0].([]*entity.Track) ret1, _ := ret[1].(error) return ret0, ret1 } -// Search indicates an expected call of Search -func (mr *MockTrackClientMockRecorder) Search(ctx, q interface{}) *gomock.Call { +// GetTracksFromURI indicates an expected call of GetTracksFromURI. +func (mr *MockTrackClientMockRecorder) GetTracksFromURI(ctx, trackURIs interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockTrackClient)(nil).Search), ctx, q) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTracksFromURI", reflect.TypeOf((*MockTrackClient)(nil).GetTracksFromURI), ctx, trackURIs) } -// GetTracksFromURI mocks base method -func (m *MockTrackClient) GetTracksFromURI(ctx context.Context, trackURIs []string) ([]*entity.Track, error) { +// Search mocks base method. +func (m *MockTrackClient) Search(ctx context.Context, q string) ([]*entity.Track, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetTracksFromURI", ctx, trackURIs) + ret := m.ctrl.Call(m, "Search", ctx, q) ret0, _ := ret[0].([]*entity.Track) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetTracksFromURI indicates an expected call of GetTracksFromURI -func (mr *MockTrackClientMockRecorder) GetTracksFromURI(ctx, trackURIs interface{}) *gomock.Call { +// Search indicates an expected call of Search. +func (mr *MockTrackClientMockRecorder) Search(ctx, q interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTracksFromURI", reflect.TypeOf((*MockTrackClient)(nil).GetTracksFromURI), ctx, trackURIs) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Search", reflect.TypeOf((*MockTrackClient)(nil).Search), ctx, q) } diff --git a/domain/mock_spotify/user.go b/domain/mock_spotify/user.go index 68b737d1..2732f756 100644 --- a/domain/mock_spotify/user.go +++ b/domain/mock_spotify/user.go @@ -6,60 +6,61 @@ package mock_spotify import ( context "context" + reflect "reflect" + entity "github.com/camphor-/relaym-server/domain/entity" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockUser is a mock of User interface +// MockUser is a mock of User interface. type MockUser struct { ctrl *gomock.Controller recorder *MockUserMockRecorder } -// MockUserMockRecorder is the mock recorder for MockUser +// MockUserMockRecorder is the mock recorder for MockUser. type MockUserMockRecorder struct { mock *MockUser } -// NewMockUser creates a new mock instance +// NewMockUser creates a new mock instance. func NewMockUser(ctrl *gomock.Controller) *MockUser { mock := &MockUser{ctrl: ctrl} mock.recorder = &MockUserMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockUser) EXPECT() *MockUserMockRecorder { return m.recorder } -// GetMe mocks base method -func (m *MockUser) GetMe(ctx context.Context) (*entity.SpotifyUser, error) { +// GetActiveDevices mocks base method. +func (m *MockUser) GetActiveDevices(ctx context.Context) ([]*entity.Device, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetMe", ctx) - ret0, _ := ret[0].(*entity.SpotifyUser) + ret := m.ctrl.Call(m, "GetActiveDevices", ctx) + ret0, _ := ret[0].([]*entity.Device) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetMe indicates an expected call of GetMe -func (mr *MockUserMockRecorder) GetMe(ctx interface{}) *gomock.Call { +// GetActiveDevices indicates an expected call of GetActiveDevices. +func (mr *MockUserMockRecorder) GetActiveDevices(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMe", reflect.TypeOf((*MockUser)(nil).GetMe), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetActiveDevices", reflect.TypeOf((*MockUser)(nil).GetActiveDevices), ctx) } -// GetActiveDevices mocks base method -func (m *MockUser) GetActiveDevices(ctx context.Context) ([]*entity.Device, error) { +// GetMe mocks base method. +func (m *MockUser) GetMe(ctx context.Context) (*entity.SpotifyUser, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetActiveDevices", ctx) - ret0, _ := ret[0].([]*entity.Device) + ret := m.ctrl.Call(m, "GetMe", ctx) + ret0, _ := ret[0].(*entity.SpotifyUser) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetActiveDevices indicates an expected call of GetActiveDevices -func (mr *MockUserMockRecorder) GetActiveDevices(ctx interface{}) *gomock.Call { +// GetMe indicates an expected call of GetMe. +func (mr *MockUserMockRecorder) GetMe(ctx interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetActiveDevices", reflect.TypeOf((*MockUser)(nil).GetActiveDevices), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetMe", reflect.TypeOf((*MockUser)(nil).GetMe), ctx) } diff --git a/domain/service/auth.go b/domain/service/auth.go index 0ead986b..3bfa3271 100644 --- a/domain/service/auth.go +++ b/domain/service/auth.go @@ -56,3 +56,23 @@ func GetTokenFromContext(ctx context.Context) (*oauth2.Token, bool) { token, ok := v.(*oauth2.Token) return token, ok } + +// NewContextFromContext は既存のContextに含まれるトークンなどをコピーした上で、新しいContextを生成します。 +// これは、goroutine内のループなど、HTTPリクエスト終了後も生き残って欲しいContextを作るのに使われます。 +func NewBackgroundContextFromContext(prevCtx context.Context) context.Context { + ctx := context.Background() + userId, ok := GetUserIDFromContext(prevCtx) + if ok { + ctx = SetUserIDToContext(ctx, userId) + } + creatorId, ok := GetCreatorIDFromContext(prevCtx) + if ok { + ctx = SetCreatorIDToContext(ctx, creatorId) + } + token, ok := GetTokenFromContext(prevCtx) + if ok { + ctx = SetTokenToContext(ctx, token) + } + return ctx + +} diff --git a/domain/spotify/auth.go b/domain/spotify/auth.go index ad117284..0eb5003b 100644 --- a/domain/spotify/auth.go +++ b/domain/spotify/auth.go @@ -3,12 +3,14 @@ package spotify import ( + "context" + "golang.org/x/oauth2" ) // Auth はSpotify OAuthに関連したAPIを呼び出すためのインターフェイスです。 type Auth interface { GetAuthURL(state string) string - Exchange(code string) (*oauth2.Token, error) - Refresh(token *oauth2.Token) (*oauth2.Token, error) + Exchange(ctx context.Context, code string) (*oauth2.Token, error) + Refresh(ctx context.Context, token *oauth2.Token) (*oauth2.Token, error) } diff --git a/go.mod b/go.mod index f0689c51..958805ee 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,12 @@ require ( github.com/go-gorp/gorp/v3 v3.0.2 github.com/go-sql-driver/mysql v1.6.0 github.com/golang/mock v1.6.0 - github.com/golang/protobuf v1.4.2 // indirect github.com/google/go-cmp v0.5.6 github.com/google/uuid v1.3.0 github.com/gorilla/websocket v1.4.2 github.com/labstack/echo/v4 v4.6.2 github.com/labstack/gommon v0.3.1 github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/zmb3/spotify v0.0.0-20200811134041-2f6880838f9c - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d - google.golang.org/appengine v1.6.6 // indirect - google.golang.org/protobuf v1.25.0 // indirect + github.com/zmb3/spotify/v2 v2.0.1 + golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 ) diff --git a/go.sum b/go.sum index e2125152..7228351a 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,54 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gorp/gorp/v3 v3.0.2 h1:ULqJXIekoqMx29FI5ekXXFoH1dT2Vc8UhnRzBg+Emz4= github.com/go-gorp/gorp/v3 v3.0.2/go.mod h1:BJ3q1ejpV8cVALtcXvXaXyTOlMmJhWDxTmncaR6rwBY= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -16,31 +57,73 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labstack/echo/v4 v4.6.2 h1:lGl58LRvItiofInOQGHHLuH2TyGU3BAEgmEv55N65nM= github.com/labstack/echo/v4 v4.6.2/go.mod h1:Hk5OiHj0kDqmFq7aHe7eDqI7CUhuCrfpupQtLGGLm7A= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= @@ -60,6 +143,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= @@ -68,19 +152,56 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -github.com/zmb3/spotify v0.0.0-20200811134041-2f6880838f9c h1:5KktBIUw/fDFG2QHyAOWM93DgY2QSqIsXQiMoncMWl4= -github.com/zmb3/spotify v0.0.0-20200811134041-2f6880838f9c/go.mod h1:CYu0Uo+YYMlUX39zUTsCU9j3SpK3l1eB8oLykXF7R7w= +github.com/zmb3/spotify/v2 v2.0.1 h1:VD+g2Xde8S0qOEOaufXofDxdoSjkYn/nJxtsm2fEoqk= +github.com/zmb3/spotify/v2 v2.0.1/go.mod h1:+LVh9CafHu7SedyqYmEf12Rd01dIVlEL845yNhksW0E= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -88,23 +209,72 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210913180222-943fd674d43e h1:+b/22bPvDYt4NPDcy4xAGCmON713ONAWFeY3Z7I3tR8= golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5 h1:Ati8dO7+U7mxpkPSxBZQEvzHVUYB/MqCklCN8ig5w/o= +golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -115,37 +285,130 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4= golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -154,14 +417,28 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/spotify/client.go b/spotify/client.go index 96e1ea07..9ced7145 100644 --- a/spotify/client.go +++ b/spotify/client.go @@ -1,26 +1,31 @@ package spotify import ( + "context" "fmt" "time" "github.com/camphor-/relaym-server/config" + "github.com/zmb3/spotify/v2" + spotifyauth "github.com/zmb3/spotify/v2/auth" "github.com/patrickmn/go-cache" - "github.com/zmb3/spotify" "golang.org/x/oauth2" ) // Client はSpotifyのWeb APIをコールするクライアントです。 type Client struct { - auth spotify.Authenticator + auth *spotifyauth.Authenticator cache *cache.Cache } // NewClient はClientのポインタを生成する関数です。 func NewClient(cfg *config.Spotify) *Client { - auth := spotify.NewAuthenticator(cfg.RedirectURL(), spotify.ScopeUserReadPrivate, spotify.ScopeUserReadPlaybackState, spotify.ScopeUserModifyPlaybackState) - auth.SetAuthInfo(cfg.ClientID(), cfg.ClientSecret()) + auth := spotifyauth.New( + spotifyauth.WithRedirectURL(cfg.RedirectURL()), + spotifyauth.WithScopes(spotifyauth.ScopeUserReadPrivate, spotifyauth.ScopeUserReadPlaybackState, spotifyauth.ScopeUserModifyPlaybackState), + spotifyauth.WithClientID(cfg.ClientID()), + spotifyauth.WithClientSecret(cfg.ClientSecret())) return &Client{auth: auth, cache: cache.New(10*time.Minute, 20*time.Minute)} } @@ -31,8 +36,8 @@ func (c *Client) GetAuthURL(state string) string { // Exchange は Authorization codeを使ってOAuthのアクセストークンを取得します。 // ref : https://developer.spotify.com/documentation/general/guides/authorization-guide/ -func (c *Client) Exchange(code string) (*oauth2.Token, error) { - token, err := c.auth.Exchange(code) +func (c *Client) Exchange(ctx context.Context, code string) (*oauth2.Token, error) { + token, err := c.auth.Exchange(ctx, code) if err != nil { return nil, fmt.Errorf("excahnge code: %w", err) } @@ -40,8 +45,8 @@ func (c *Client) Exchange(code string) (*oauth2.Token, error) { } // Refresh はリフレッシュトークンを使用して新しいアクセストークンを取得します。 -func (c *Client) Refresh(token *oauth2.Token) (*oauth2.Token, error) { - cli := c.auth.NewClient(token) +func (c *Client) Refresh(ctx context.Context, token *oauth2.Token) (*oauth2.Token, error) { + cli := spotify.New(c.auth.Client(ctx, token)) newToken, err := cli.Token() if err != nil { return nil, fmt.Errorf("token refresh: %w", err) diff --git a/spotify/player.go b/spotify/player.go index af6a630a..8d95609a 100644 --- a/spotify/player.go +++ b/spotify/player.go @@ -13,7 +13,7 @@ import ( "github.com/camphor-/relaym-server/domain/entity" "github.com/camphor-/relaym-server/domain/service" - "github.com/zmb3/spotify" + "github.com/zmb3/spotify/v2" ) // CurrentlyPlaying は現在の再生状況を取得するAPIです。 @@ -22,8 +22,8 @@ func (c *Client) CurrentlyPlaying(ctx context.Context) (*entity.CurrentPlayingIn if !ok { return nil, errors.New("token not found") } - cli := c.auth.NewClient(token) - ps, err := cli.PlayerState() + cli := spotify.New(c.auth.Client(ctx, token)) + ps, err := cli.PlayerState(ctx) if convErr := c.convertPlayerError(err); convErr != nil { return nil, fmt.Errorf("spotify api: currently playing: %w", convErr) } @@ -51,7 +51,7 @@ func (c *Client) GoNextTrack(ctx context.Context, deviceID string) error { if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil} if deviceID != "" { @@ -59,7 +59,7 @@ func (c *Client) GoNextTrack(ctx context.Context, deviceID string) error { opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - err := cli.NextOpt(opt) + err := cli.NextOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: next: %w", convErr) } @@ -74,7 +74,7 @@ func (c *Client) DeleteAllTracksInQueue(ctx context.Context, deviceID string, tr if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) // PlayWithTracksで「再生待ち」を0曲にする if err := c.PlayWithTracks(ctx, deviceID, []string{trackURI}); err != nil { @@ -90,7 +90,7 @@ func (c *Client) DeleteAllTracksInQueue(ctx context.Context, deviceID string, tr skipOnceTime := 3 sleepTime := 300 * time.Millisecond for i := 1; ; i++ { - err := cli.NextOpt(opt) + err := cli.NextOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: next: %w", convErr) } @@ -120,7 +120,7 @@ func (c *Client) Play(ctx context.Context, deviceID string) error { if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil} if deviceID != "" { @@ -128,7 +128,7 @@ func (c *Client) Play(ctx context.Context, deviceID string) error { opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - err := cli.PlayOpt(opt) + err := cli.PlayOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: play or resume: %w", convErr) } @@ -144,7 +144,7 @@ func (c *Client) PlayWithTracks(ctx context.Context, deviceID string, trackURIs if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil, URIs: c.toURIs(trackURIs)} if deviceID != "" { @@ -152,7 +152,7 @@ func (c *Client) PlayWithTracks(ctx context.Context, deviceID string, trackURIs opt = &spotify.PlayOptions{DeviceID: &spotifyID, URIs: c.toURIs(trackURIs)} } - err := cli.PlayOpt(opt) + err := cli.PlayOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: play or resume: %w", convErr) } @@ -168,7 +168,7 @@ func (c *Client) PlayWithTracksAndPosition(ctx context.Context, deviceID string, if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil, URIs: c.toURIs(trackURIs), PositionMs: int(position.Milliseconds())} if deviceID != "" { @@ -176,7 +176,7 @@ func (c *Client) PlayWithTracksAndPosition(ctx context.Context, deviceID string, opt = &spotify.PlayOptions{DeviceID: &spotifyID, URIs: c.toURIs(trackURIs)} } - err := cli.PlayOpt(opt) + err := cli.PlayOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: play or resume: %w", convErr) } @@ -192,14 +192,14 @@ func (c *Client) Pause(ctx context.Context, deviceID string) error { if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil} if deviceID != "" { spotifyID := spotify.ID(deviceID) opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - err := cli.PauseOpt(opt) + err := cli.PauseOpt(ctx, opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: pause: %w", convErr) } @@ -217,14 +217,14 @@ func (c *Client) Enqueue(ctx context.Context, trackURI string, deviceID string) if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil} if deviceID != "" { spotifyID := spotify.ID(deviceID) opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - err := cli.QueueSongOpt(spotify.ID(trackID), opt) + err := cli.QueueSongOpt(ctx, spotify.ID(trackID), opt) if convErr := c.convertPlayerError(err); convErr != nil { return fmt.Errorf("spotify api: add queue: %w", convErr) } @@ -240,7 +240,7 @@ func (c *Client) SetRepeatMode(ctx context.Context, on bool, deviceID string) er if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) state := "off" if on { @@ -253,7 +253,7 @@ func (c *Client) SetRepeatMode(ctx context.Context, on bool, deviceID string) er opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - if err := cli.RepeatOpt(state, opt); c.convertPlayerError(err) != nil { + if err := cli.RepeatOpt(ctx, state, opt); c.convertPlayerError(err) != nil { return fmt.Errorf("spotify api: set repeat mode: %w", c.convertPlayerError(err)) } return nil @@ -268,14 +268,14 @@ func (c *Client) SetShuffleMode(ctx context.Context, on bool, deviceID string) e if !ok { return errors.New("token not found") } - cli := c.auth.NewClient(token) + cli := spotify.New(c.auth.Client(ctx, token)) opt := &spotify.PlayOptions{DeviceID: nil} if deviceID != "" { spotifyID := spotify.ID(deviceID) opt = &spotify.PlayOptions{DeviceID: &spotifyID} } - if err := cli.ShuffleOpt(on, opt); c.convertPlayerError(err) != nil { + if err := cli.ShuffleOpt(ctx, on, opt); c.convertPlayerError(err) != nil { return fmt.Errorf("spotify api: set repeat mode: %w", c.convertPlayerError(err)) } return nil diff --git a/spotify/player_test.go b/spotify/player_test.go index 3353b04e..4cdef6e4 100644 --- a/spotify/player_test.go +++ b/spotify/player_test.go @@ -35,7 +35,7 @@ func TestClient_CurrentlyPlaying(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } @@ -73,7 +73,7 @@ func TestClient_Play(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } @@ -106,7 +106,7 @@ func TestClient_Pause(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } @@ -141,7 +141,7 @@ func TestClient_Enqueue(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } @@ -181,7 +181,7 @@ func TestClient_SetRepeatMode(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } @@ -214,7 +214,7 @@ func TestClient_DeleteAllTracksInQueueTracks(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } diff --git a/spotify/track.go b/spotify/track.go index dc6b40d6..663a8daf 100644 --- a/spotify/track.go +++ b/spotify/track.go @@ -10,7 +10,7 @@ import ( "github.com/camphor-/relaym-server/domain/entity" "github.com/camphor-/relaym-server/domain/service" - "github.com/zmb3/spotify" + "github.com/zmb3/spotify/v2" ) // Search はSpotify APIを通して、与えられたクエリを用い音楽を検索します。 @@ -27,9 +27,8 @@ func (c *Client) Search(ctx context.Context, q string) ([]*entity.Track, error) return c.toTracks(result.Tracks.Tracks), nil } - cli := c.auth.NewClient(token) - cli.AcceptLanguage = "ja,en;q=0.9" - result, err := cli.Search(q, spotify.SearchTypeTrack) + cli := spotify.New(c.auth.Client(ctx, token), spotify.WithAcceptLanguage("ja,en;q=0.9")) + result, err := cli.Search(ctx, q, spotify.SearchTypeTrack) if err != nil { return nil, fmt.Errorf("search q=%s: %w", q, err) } @@ -49,8 +48,7 @@ func (c *Client) GetTracksFromURI(ctx context.Context, trackURIs []string) ([]*e if !ok { return nil, fmt.Errorf("token not found") } - cli := c.auth.NewClient(token) - cli.AcceptLanguage = "ja,en;q=0.9" + cli := spotify.New(c.auth.Client(ctx, token), spotify.WithAcceptLanguage("ja,en;q=0.9")) ids := make([]spotify.ID, len(trackURIs)) for i, trackURI := range trackURIs { @@ -78,7 +76,7 @@ func (c *Client) GetTracksFromURI(ctx context.Context, trackURIs []string) ([]*e resultTracks = v } else { var err error - resultTracks, err = cli.GetTracks(idsForAPI...) + resultTracks, err = cli.GetTracks(ctx, idsForAPI) if err != nil { return nil, fmt.Errorf("get track uris=%s: %w", trackURIs, err) } diff --git a/spotify/track_test.go b/spotify/track_test.go index 95fb94e8..3252cecd 100644 --- a/spotify/track_test.go +++ b/spotify/track_test.go @@ -43,7 +43,7 @@ func TestClient_GetTracksFromURI(t *testing.T) { RefreshToken: os.Getenv("SPOTIFY_REFRESH_TOKEN_FOR_TEST"), Expiry: time.Now(), } - token, err := c.Refresh(token) + token, err := c.Refresh(context.Background(), token) if err != nil { t.Fatal(err) } diff --git a/spotify/user.go b/spotify/user.go index f229e004..c905e75d 100644 --- a/spotify/user.go +++ b/spotify/user.go @@ -6,7 +6,7 @@ import ( "github.com/camphor-/relaym-server/domain/entity" "github.com/camphor-/relaym-server/domain/service" - "github.com/zmb3/spotify" + "github.com/zmb3/spotify/v2" ) // GetMe は自分の情報をSpotify APIから取得します。 @@ -15,8 +15,8 @@ func (c *Client) GetMe(ctx context.Context) (*entity.SpotifyUser, error) { if !ok { return nil, fmt.Errorf("token not found") } - cli := c.auth.NewClient(token) - user, err := cli.CurrentUser() + cli := spotify.New(c.auth.Client(ctx, token)) + user, err := cli.CurrentUser(ctx) if err != nil { return nil, fmt.Errorf("get private user through spotiry api: %w", err) } @@ -33,8 +33,8 @@ func (c *Client) GetActiveDevices(ctx context.Context) ([]*entity.Device, error) if !ok { return nil, fmt.Errorf("token not found") } - cli := c.auth.NewClient(token) - devices, err := cli.PlayerDevices() + cli := spotify.New(c.auth.Client(ctx, token)) + devices, err := cli.PlayerDevices(ctx) if err != nil { return nil, fmt.Errorf("playerDevices information about available devices for the current user: %w", err) } diff --git a/usecase/auth.go b/usecase/auth.go index c85a8cb8..e9c0fe10 100644 --- a/usecase/auth.go +++ b/usecase/auth.go @@ -52,12 +52,13 @@ func (u *AuthUseCase) Authorization(state, code string) (string, string, error) return "", "", fmt.Errorf("find temp state state=%s: %w", state, err) } - token, err := u.authCli.Exchange(code) + ctx := context.Background() + token, err := u.authCli.Exchange(ctx, code) if err != nil { return storedState.RedirectURL, "", fmt.Errorf("exchange and get oauth2 token: %w", err) } - ctx := service.SetTokenToContext(context.Background(), token) + ctx = service.SetTokenToContext(ctx, token) userID, err := u.createUserIfNotExists(ctx) if err != nil { return storedState.RedirectURL, "", fmt.Errorf("get or create user: %w", err) @@ -129,7 +130,8 @@ func (u *AuthUseCase) RefreshAccessToken(userID string, token *oauth2.Token) (*o if token.Valid() { return token, nil } - newToken, err := u.authCli.Refresh(token) + ctx := context.Background() + newToken, err := u.authCli.Refresh(ctx, token) if err != nil { return nil, fmt.Errorf("refresh access token through spotify client: %w", err) } diff --git a/usecase/session_timer.go b/usecase/session_timer.go index 1e27da07..3a97d385 100644 --- a/usecase/session_timer.go +++ b/usecase/session_timer.go @@ -9,6 +9,7 @@ import ( "github.com/camphor-/relaym-server/domain/entity" "github.com/camphor-/relaym-server/domain/event" "github.com/camphor-/relaym-server/domain/repository" + "github.com/camphor-/relaym-server/domain/service" "github.com/camphor-/relaym-server/domain/spotify" "github.com/camphor-/relaym-server/log" ) @@ -28,7 +29,8 @@ func NewSessionTimerUseCase(sessionRepo repository.Session, playerCli spotify.Pl } // startTrackEndTrigger は曲の終了やストップを検知してそれぞれの処理を実行します。 goroutineで実行されることを想定しています。 -func (s *SessionTimerUseCase) startTrackEndTrigger(ctx context.Context, sessionID string) { +func (s *SessionTimerUseCase) startTrackEndTrigger(prevCtx context.Context, sessionID string) { + ctx := service.NewBackgroundContextFromContext(prevCtx) logger := log.New() logger.Debugj(map[string]interface{}{"message": "start track end trigger", "sessionID": sessionID}) diff --git a/web/auth_middleware_test.go b/web/auth_middleware_test.go index 2ee33845..cde2c31c 100644 --- a/web/auth_middleware_test.go +++ b/web/auth_middleware_test.go @@ -186,7 +186,7 @@ func TestAuthMiddleware_Authenticate(t *testing.T) { }).Return(nil) }, prepareAuthCli: func(c *mock_spotify.MockAuth) { - c.EXPECT().Refresh(&oauth2.Token{ + c.EXPECT().Refresh(gomock.Any(), &oauth2.Token{ AccessToken: "access_token", TokenType: "Bearer", RefreshToken: "refresh_token", diff --git a/web/handler/auth_test.go b/web/handler/auth_test.go index 19f202fa..d5872983 100644 --- a/web/handler/auth_test.go +++ b/web/handler/auth_test.go @@ -216,7 +216,7 @@ func TestAuthHandler_Callback(t *testing.T) { mock.EXPECT().Store(gomock.Any()).Return(nil) }, prepareMockAuthSpoFn: func(mock *mock_spotify.MockAuth) { - mock.EXPECT().Exchange("code").Return(&oauth2.Token{ + mock.EXPECT().Exchange(gomock.Any(), "code").Return(&oauth2.Token{ AccessToken: "access_token", TokenType: "Bearer", RefreshToken: "refresh_token", @@ -261,7 +261,7 @@ func TestAuthHandler_Callback(t *testing.T) { mock.EXPECT().Store(gomock.Any()).Return(nil) }, prepareMockAuthSpoFn: func(mock *mock_spotify.MockAuth) { - mock.EXPECT().Exchange("code").Return(&oauth2.Token{ + mock.EXPECT().Exchange(gomock.Any(), "code").Return(&oauth2.Token{ AccessToken: "access_token", TokenType: "Bearer", RefreshToken: "refresh_token", diff --git a/web/sessionToken_middleware.go b/web/sessionToken_middleware.go index d42bf396..af2cdd49 100644 --- a/web/sessionToken_middleware.go +++ b/web/sessionToken_middleware.go @@ -14,7 +14,7 @@ import ( "github.com/labstack/echo/v4" ) -// CreatorTokenMiddlewareはSessionのCreatorがもつAccessTokenの管理を担当するミドルウェアを管理する構造体です。 +// CreatorTokenMiddleware はSessionのCreatorがもつAccessTokenの管理を担当するミドルウェアを管理する構造体です。 type CreatorTokenMiddleware struct { uc *usecase.AuthUseCase } diff --git a/web/sessionToken_middleware_test.go b/web/sessionToken_middleware_test.go index cfb22487..c92ebc35 100644 --- a/web/sessionToken_middleware_test.go +++ b/web/sessionToken_middleware_test.go @@ -113,7 +113,7 @@ func TestSessionTokenMiddleware_SetTokenToContext(t *testing.T) { }).Return(nil) }, prepareAuthCli: func(c *mock_spotify.MockAuth) { - c.EXPECT().Refresh(&oauth2.Token{ + c.EXPECT().Refresh(gomock.Any(), &oauth2.Token{ AccessToken: "access_token", TokenType: "Bearer", RefreshToken: "refresh_token",