From 71a49e2b43218d34f97b2276c43bdeb2df4a53d2 Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 1 Apr 2021 20:46:45 +0200 Subject: Api/v1/accounts (#8) * start work on accounts module * plodding away on the accounts endpoint * groundwork for other account routes * add password validator * validation utils * require account approval flags * comments * comments * go fmt * comments * add distributor stub * rename api to federator * tidy a bit * validate new account requests * rename r router * comments * add domain blocks * add some more shortcuts * add some more shortcuts * check email + username availability * email block checking for signups * chunking away at it * tick off a few more things * some fiddling with tests * add mock package * relocate repo * move mocks around * set app id on new signups * initialize oauth server properly * rename oauth server * proper mocking tests * go fmt ./... * add required fields * change name of func * move validation to account.go * more tests! * add some file utility tools * add mediaconfig * new shortcut * add some more fields * add followrequest model * add notify * update mastotypes * mock out storage interface * start building media interface * start on update credentials * mess about with media a bit more * test image manipulation * media more or less working * account update nearly working * rearranging my package ;) ;) ;) * phew big stuff!!!! * fix type checking * *fiddles* * Add CreateTables func * account registration flow working * tidy * script to step through auth flow * add a lil helper for generating user uris * fiddling with federation a bit * update progress * Tidying and linting --- internal/storage/inmem.go | 31 ++++++++++++++++++++++++++ internal/storage/local.go | 21 ++++++++++++++++++ internal/storage/mock_Storage.go | 47 ++++++++++++++++++++++++++++++++++++++++ internal/storage/storage.go | 24 ++++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 internal/storage/inmem.go create mode 100644 internal/storage/local.go create mode 100644 internal/storage/mock_Storage.go create mode 100644 internal/storage/storage.go (limited to 'internal/storage') diff --git a/internal/storage/inmem.go b/internal/storage/inmem.go new file mode 100644 index 000000000..25432fbaa --- /dev/null +++ b/internal/storage/inmem.go @@ -0,0 +1,31 @@ +package storage + +import ( + "fmt" + + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/config" +) + +func NewInMem(c *config.Config, log *logrus.Logger) (Storage, error) { + return &inMemStorage{ + stored: make(map[string][]byte), + }, nil +} + +type inMemStorage struct { + stored map[string][]byte +} + +func (s *inMemStorage) StoreFileAt(path string, data []byte) error { + s.stored[path] = data + return nil +} + +func (s *inMemStorage) RetrieveFileFrom(path string) ([]byte, error) { + d, ok := s.stored[path] + if !ok { + return nil, fmt.Errorf("no data found at path %s", path) + } + return d, nil +} diff --git a/internal/storage/local.go b/internal/storage/local.go new file mode 100644 index 000000000..29461d5d4 --- /dev/null +++ b/internal/storage/local.go @@ -0,0 +1,21 @@ +package storage + +import ( + "github.com/sirupsen/logrus" + "github.com/superseriousbusiness/gotosocial/internal/config" +) + +func NewLocal(c *config.Config, log *logrus.Logger) (Storage, error) { + return &localStorage{}, nil +} + +type localStorage struct { +} + +func (s *localStorage) StoreFileAt(path string, data []byte) error { + return nil +} + +func (s *localStorage) RetrieveFileFrom(path string) ([]byte, error) { + return nil, nil +} diff --git a/internal/storage/mock_Storage.go b/internal/storage/mock_Storage.go new file mode 100644 index 000000000..865d52205 --- /dev/null +++ b/internal/storage/mock_Storage.go @@ -0,0 +1,47 @@ +// Code generated by mockery v2.7.4. DO NOT EDIT. + +package storage + +import mock "github.com/stretchr/testify/mock" + +// MockStorage is an autogenerated mock type for the Storage type +type MockStorage struct { + mock.Mock +} + +// RetrieveFileFrom provides a mock function with given fields: path +func (_m *MockStorage) RetrieveFileFrom(path string) ([]byte, error) { + ret := _m.Called(path) + + var r0 []byte + if rf, ok := ret.Get(0).(func(string) []byte); ok { + r0 = rf(path) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]byte) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(string) error); ok { + r1 = rf(path) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// StoreFileAt provides a mock function with given fields: path, data +func (_m *MockStorage) StoreFileAt(path string, data []byte) error { + ret := _m.Called(path, data) + + var r0 error + if rf, ok := ret.Get(0).(func(string, []byte) error); ok { + r0 = rf(path, data) + } else { + r0 = ret.Error(0) + } + + return r0 +} diff --git a/internal/storage/storage.go b/internal/storage/storage.go new file mode 100644 index 000000000..fa884ed07 --- /dev/null +++ b/internal/storage/storage.go @@ -0,0 +1,24 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +package storage + +type Storage interface { + StoreFileAt(path string, data []byte) error + RetrieveFileFrom(path string) ([]byte, error) +} -- cgit v1.2.3