Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
53ce075
implemented ocm client
gmgigi96 Jan 12, 2023
c9d69f4
refactored ocm invite manager
gmgigi96 Jan 12, 2023
119969d
load invite repository at runtime
gmgigi96 Jan 13, 2023
9d593b2
add sciencemesh http provider to generate token (and send email), acc…
gmgigi96 Jan 16, 2023
676bc74
fix linter
gmgigi96 Jan 16, 2023
11f6e8c
moved ocm endpoint in sciencemesh http service
gmgigi96 Jan 16, 2023
ced02b7
return initiator's info when accepting invite
gmgigi96 Jan 16, 2023
adb30aa
return remote user info on ForwardInvite
gmgigi96 Jan 16, 2023
2614d5d
return user ingo on AcceptInvite
gmgigi96 Jan 16, 2023
58f2491
fix get user
gmgigi96 Jan 16, 2023
98169c8
complete invitation workflow storing the initiator
gmgigi96 Jan 17, 2023
8da841e
set a description when creating an invitation token
gmgigi96 Jan 17, 2023
8c59fa4
add errors according to apis
gmgigi96 Jan 18, 2023
e518a39
add ocm invitation workflow tests
gmgigi96 Jan 18, 2023
2733019
add config for two ocm servers
gmgigi96 Jan 19, 2023
6b0ed29
register sciencemesh service
gmgigi96 Jan 19, 2023
d74dd46
fix error ocm
gmgigi96 Jan 19, 2023
aca6dde
add errors when accepting an invite in science mesh service
gmgigi96 Jan 19, 2023
d30f4af
remoted unprotected endpoints in sciencemesh service
gmgigi96 Jan 19, 2023
098f928
allows files to be added when starting revad for tests
gmgigi96 Jan 19, 2023
5282d15
renamed toml files used for integration tests for ocm
gmgigi96 Jan 19, 2023
ae087ef
add more test for ocm and sciencemesh services
gmgigi96 Jan 19, 2023
7d50e0f
fix other tests
gmgigi96 Jan 19, 2023
2e04447
use fork for go cs3apis bindings
gmgigi96 Jan 19, 2023
d675bb2
fixes to linter
gmgigi96 Jan 19, 2023
5a369ab
fix linter
gmgigi96 Jan 20, 2023
2b55772
add changelog
gmgigi96 Jan 20, 2023
cf446c9
fixes
gmgigi96 Jan 20, 2023
ce11c22
update go-cs3apis
gmgigi96 Jan 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set a description when creating an invitation token
  • Loading branch information
gmgigi96 committed Jan 17, 2023
commit 8da841ebaacbc388e6dac56c1c1aab555f56886f
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *service) UnprotectedEndpoints() []string {

func (s *service) GenerateInviteToken(ctx context.Context, req *invitepb.GenerateInviteTokenRequest) (*invitepb.GenerateInviteTokenResponse, error) {
user := ctxpkg.ContextMustGetUser(ctx)
token := CreateToken(s.conf.tokenExpiration, user.GetId())
token := CreateToken(s.conf.tokenExpiration, user.GetId(), req.Description)

if err := s.repo.AddToken(ctx, token); err != nil {
return &invitepb.GenerateInviteTokenResponse{
Expand Down
3 changes: 2 additions & 1 deletion internal/grpc/services/ocminvitemanager/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

// CreateToken creates a InviteToken object for the userID indicated by userID.
func CreateToken(expiration time.Duration, userID *userpb.UserId) *invitepb.InviteToken {
func CreateToken(expiration time.Duration, userID *userpb.UserId, description string) *invitepb.InviteToken {
tokenID := uuid.New().String()
now := time.Now()
expirationTime := now.Add(expiration)
Expand All @@ -40,5 +40,6 @@ func CreateToken(expiration time.Duration, userID *userpb.UserId) *invitepb.Invi
Seconds: uint64(expirationTime.Unix()),
Nanos: 0,
},
Description: description,
}
}
4 changes: 2 additions & 2 deletions internal/grpc/services/ocminvitemanager/token_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestCreateToken(t *testing.T) {
Opaque: nil,
}

token := CreateToken(24*time.Hour, user.GetId())
token := CreateToken(24*time.Hour, user.GetId(), "")
if token == nil {
t.Errorf("CreateToken() got = %v", token)
}
Expand Down Expand Up @@ -71,7 +71,7 @@ func TestCreateTokenCollision(t *testing.T) {
}

for i := 0; i < 1000000; i++ {
token := CreateToken(24*time.Hour, user.GetId())
token := CreateToken(24*time.Hour, user.GetId(), "")

if token == nil {
t.Errorf("CreateToken() token = %v", token)
Expand Down
4 changes: 3 additions & 1 deletion internal/http/services/sciencemesh/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ func (h *TokenHandler) Init(c *config) error {
func (h *TokenHandler) Generate(w http.ResponseWriter, r *http.Request) {
ctx := r.Context()

token, err := h.gatewayClient.GenerateInviteToken(ctx, &invitepb.GenerateInviteTokenRequest{})
token, err := h.gatewayClient.GenerateInviteToken(ctx, &invitepb.GenerateInviteTokenRequest{
Description: r.URL.Query().Get("description"),
})
if err != nil {
reqres.WriteError(w, r, reqres.APIErrorServerError, "error generating token", err)
return
Expand Down