Skip to content

Commit

Permalink
Beta (#243)
Browse files Browse the repository at this point in the history
* Update Jenkinsfile

* Rename Jenkinsfile to Jenkinsfile.old

* Create Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Staging (#232)

* audit logs bugfix

* allow numbers in prod/cons names

* jwt nd refresh jwt from env vars + save clients IP

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* remove port from the client ip address

* bugfix max msg size

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* sandbox auth

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* deleted unnecessary code

* broker connection bugfixes

* remove the TCP address from the tcp response

* Update README.md

* generic func CreateTokens + fixed comments

* add max msg delivery feature

* add sandbox logic

* return the most updated prod/cons

* Update README.md

* Update README.md

* add maintainers

* Update README.md

* added restrictions for sandbox - edit & delete

* added github login

* fixed bugs

* fixed bugs 2

* Update README.md

* add get sys logs to the no need auth endpoints

* fixed google login sandbox

* removed unneccessary code + added sandbox pic

* Update README.md

* change the default port of mongo

* Update docker-config.json

* Update README.md

* Update config.json

* Update docker-config.json

* Update Jenkinsfile

* Update Jenkinsfile

* bugfix consumergroup + poison messages initial commit

* fixed google login

* added sandbox logs

* Update README.md

* removed email display for sandbox

* poison message initial commit

* get msg journey

* poison msgs retention

* go mod tidy

* remove logs

* initial commit

* destroyed to deleted change

* added mailchimp subscriber for sandbox

* poison message changes

* added env and namespace for code examples

* bugfix

* bugfix

* bugfix

* add cg status

* resend poison message bugfixes

* update the product version

* increase to 1000 last messages in station overview

* change to audit of last 5 days

* deleted consumers bugfix

* bug fixes

* sort the prod/cg list

* Update Jenkinsfile

* sort issues

* Update Jenkinsfile

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>

* Staging (#233)

* audit logs bugfix

* allow numbers in prod/cons names

* jwt nd refresh jwt from env vars + save clients IP

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* remove port from the client ip address

* bugfix max msg size

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* sandbox auth

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* deleted unnecessary code

* broker connection bugfixes

* remove the TCP address from the tcp response

* Update README.md

* generic func CreateTokens + fixed comments

* add max msg delivery feature

* add sandbox logic

* return the most updated prod/cons

* Update README.md

* Update README.md

* add maintainers

* Update README.md

* added restrictions for sandbox - edit & delete

* added github login

* fixed bugs

* fixed bugs 2

* Update README.md

* add get sys logs to the no need auth endpoints

* fixed google login sandbox

* removed unneccessary code + added sandbox pic

* Update README.md

* change the default port of mongo

* Update docker-config.json

* Update README.md

* Update config.json

* Update docker-config.json

* Update Jenkinsfile

* Update Jenkinsfile

* bugfix consumergroup + poison messages initial commit

* fixed google login

* added sandbox logs

* Update README.md

* removed email display for sandbox

* poison message initial commit

* get msg journey

* poison msgs retention

* go mod tidy

* remove logs

* initial commit

* destroyed to deleted change

* added mailchimp subscriber for sandbox

* poison message changes

* added env and namespace for code examples

* bugfix

* bugfix

* bugfix

* add cg status

* resend poison message bugfixes

* update the product version

* increase to 1000 last messages in station overview

* change to audit of last 5 days

* deleted consumers bugfix

* bug fixes

* sort the prod/cg list

* Update Jenkinsfile

* sort issues

* Update Jenkinsfile

* error message fix

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>

* Staging (#235)

* audit logs bugfix

* allow numbers in prod/cons names

* jwt nd refresh jwt from env vars + save clients IP

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* remove port from the client ip address

* bugfix max msg size

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* sandbox auth

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* deleted unnecessary code

* broker connection bugfixes

* remove the TCP address from the tcp response

* Update README.md

* generic func CreateTokens + fixed comments

* add max msg delivery feature

* add sandbox logic

* return the most updated prod/cons

* Update README.md

* Update README.md

* add maintainers

* Update README.md

* added restrictions for sandbox - edit & delete

* added github login

* fixed bugs

* fixed bugs 2

* Update README.md

* add get sys logs to the no need auth endpoints

* fixed google login sandbox

* removed unneccessary code + added sandbox pic

* Update README.md

* change the default port of mongo

* Update docker-config.json

* Update README.md

* Update config.json

* Update docker-config.json

* Update Jenkinsfile

* Update Jenkinsfile

* bugfix consumergroup + poison messages initial commit

* fixed google login

* added sandbox logs

* Update README.md

* removed email display for sandbox

* poison message initial commit

* get msg journey

* poison msgs retention

* go mod tidy

* remove logs

* initial commit

* destroyed to deleted change

* added mailchimp subscriber for sandbox

* poison message changes

* added env and namespace for code examples

* bugfix

* bugfix

* bugfix

* add cg status

* resend poison message bugfixes

* update the product version

* increase to 1000 last messages in station overview

* change to audit of last 5 days

* deleted consumers bugfix

* bug fixes

* sort the prod/cg list

* Update Jenkinsfile

* sort issues

* Update Jenkinsfile

* error message fix

* decrease the preview of dls messages

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>

* Update Jenkinsfile (#236)

* Staging (#238)

* audit logs bugfix

* allow numbers in prod/cons names

* jwt nd refresh jwt from env vars + save clients IP

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* remove port from the client ip address

* bugfix max msg size

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* sandbox auth

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* deleted unnecessary code

* broker connection bugfixes

* remove the TCP address from the tcp response

* Update README.md

* generic func CreateTokens + fixed comments

* add max msg delivery feature

* add sandbox logic

* return the most updated prod/cons

* Update README.md

* Update README.md

* add maintainers

* Update README.md

* added restrictions for sandbox - edit & delete

* added github login

* fixed bugs

* fixed bugs 2

* Update README.md

* add get sys logs to the no need auth endpoints

* fixed google login sandbox

* removed unneccessary code + added sandbox pic

* Update README.md

* change the default port of mongo

* Update docker-config.json

* Update README.md

* Update config.json

* Update docker-config.json

* Update Jenkinsfile

* Update Jenkinsfile

* bugfix consumergroup + poison messages initial commit

* fixed google login

* added sandbox logs

* Update README.md

* removed email display for sandbox

* poison message initial commit

* get msg journey

* poison msgs retention

* go mod tidy

* remove logs

* initial commit

* destroyed to deleted change

* added mailchimp subscriber for sandbox

* poison message changes

* added env and namespace for code examples

* bugfix

* bugfix

* bugfix

* add cg status

* resend poison message bugfixes

* update the product version

* increase to 1000 last messages in station overview

* change to audit of last 5 days

* deleted consumers bugfix

* bug fixes

* sort the prod/cg list

* Update Jenkinsfile

* sort issues

* Update Jenkinsfile

* error message fix

* decrease the preview of dls messages

* Update Jenkinsfile

* add done next steps endpoint

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>

* Delete Jenkinsfile.old

* Staging (#240)

* audit logs bugfix

* allow numbers in prod/cons names

* jwt nd refresh jwt from env vars + save clients IP

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* remove port from the client ip address

* bugfix max msg size

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* sandbox auth

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* Update Jenkinsfile

* deleted unnecessary code

* broker connection bugfixes

* remove the TCP address from the tcp response

* Update README.md

* generic func CreateTokens + fixed comments

* add max msg delivery feature

* add sandbox logic

* return the most updated prod/cons

* Update README.md

* Update README.md

* add maintainers

* Update README.md

* added restrictions for sandbox - edit & delete

* added github login

* fixed bugs

* fixed bugs 2

* Update README.md

* add get sys logs to the no need auth endpoints

* fixed google login sandbox

* removed unneccessary code + added sandbox pic

* Update README.md

* change the default port of mongo

* Update docker-config.json

* Update README.md

* Update config.json

* Update docker-config.json

* Update Jenkinsfile

* Update Jenkinsfile

* bugfix consumergroup + poison messages initial commit

* fixed google login

* added sandbox logs

* Update README.md

* removed email display for sandbox

* poison message initial commit

* get msg journey

* poison msgs retention

* go mod tidy

* remove logs

* initial commit

* destroyed to deleted change

* added mailchimp subscriber for sandbox

* poison message changes

* added env and namespace for code examples

* bugfix

* bugfix

* bugfix

* add cg status

* resend poison message bugfixes

* update the product version

* increase to 1000 last messages in station overview

* change to audit of last 5 days

* deleted consumers bugfix

* bug fixes

* sort the prod/cg list

* Update Jenkinsfile

* sort issues

* Update Jenkinsfile

* error message fix

* decrease the preview of dls messages

* Update Jenkinsfile

* add done next steps endpoint

* sockets core issue

* analytics bugfix

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>

Co-authored-by: Valera Bronshtein <105710429+valeraBr@users.noreply.github.com>
Co-authored-by: Yaniv Ben Hemo <70286779+yanivbh1@users.noreply.github.com>
Co-authored-by: shay23b <shay.b@strech.io>
  • Loading branch information
4 people committed Jul 19, 2022
1 parent 4ca18a5 commit 9a39197
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 31 deletions.
10 changes: 9 additions & 1 deletion analytics/analytics.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,15 @@ func InitializeAnalytics() error {
}

func IncrementInstallationsCounter() {
installationsCounter.Add(context.TODO(), 1)
installationsCounter.Add(context.TODO(), 1, attribute.String("deployment_id", deploymentId))
}

func IncrementNextStepsCounter() {
nextStepsCounter.Add(context.TODO(), 1, attribute.String("deployment_id", deploymentId))
}

func IncrementNextStepsCounter() {
nextStepsCounter.Add(context.TODO(), 1)
}

func IncrementNextStepsCounter() {
Expand Down
29 changes: 0 additions & 29 deletions handlers/user_mgmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,37 +227,8 @@ func CreateRootUserOnFirstSystemLoad() error {
hashedPwdString := string(hashedPwd)

if !exist {
deploymentId := primitive.NewObjectID().Hex()
deploymentKey := models.SystemKey{
ID: primitive.NewObjectID(),
Key: "deployment_id",
Value: deploymentId,
}

_, err = systemKeysCollection.InsertOne(context.TODO(), deploymentKey)
if err != nil {
return err
}

var analyticsKey models.SystemKey
if configuration.ANALYTICS == "true" {
analyticsKey = models.SystemKey{
ID: primitive.NewObjectID(),
Key: "analytics",
Value: "true",
}
analytics.IncrementInstallationsCounter()
} else {
analyticsKey = models.SystemKey{
ID: primitive.NewObjectID(),
Key: "analytics",
Value: "false",
}
}

_, err = systemKeysCollection.InsertOne(context.TODO(), analyticsKey)
if err != nil {
return err
}

newUser := models.User{
Expand Down
2 changes: 1 addition & 1 deletion socketio/socketio.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ func InitializeSocketio(router *gin.Engine) *socketio.Server {

socketIoRouter := router.Group("/api/socket.io")
router.Use(cors.New(cors.Config{
AllowOrigins: []string{"http://localhost:9000", "https://sandbox.memphis.dev", "http://0.0.0.0", "https://0.0.0.0", "http://*", "https://*"},
AllowOrigins: []string{"*"},
}))
socketIoRouter.Use(ginMiddleware())
socketIoRouter.Use(middlewares.Authenticate)
Expand Down

0 comments on commit 9a39197

Please sign in to comment.