zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3257 from gravitl/master

Browse Source 
Master
This commit is contained in:
Abhishek K
2024-12-16 20:11:04 +04:00
committed by GitHub
parent fc8675bf9c 39d0c0ed55
commit 0e36d65f6f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/deletedroplets.yml vendored
View File

@@ -37,7 +37,7 @@ jobs:
- name: delete droplets - name: delete droplets
if: success() || failure() if: success() || failure()
run: | run: |
sleep 1m sleep 30m
response=$(curl -X DELETE \ response=$(curl -X DELETE \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \ -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \
@@ -109,7 +109,7 @@ jobs:
- name: delete droplets - name: delete droplets
if: success() || failure() if: success() || failure()
run: | run: |
sleep 1m sleep 30m
response=$(curl -X DELETE \ response=$(curl -X DELETE \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \ -H "Authorization: Bearer $DIGITALOCEAN_TOKEN" \

2
models/user_mgmt.go
View File

@@ -143,7 +143,7 @@ type UserGroup struct {
// User struct - struct for Users // User struct - struct for Users
type User struct { type User struct {
UserName string `json:"username" bson:"username" validate:"min=3,max=40,in_charset|email"` UserName string `json:"username" bson:"username" validate:"min=3,in_charset|email"`
ExternalIdentityProviderID string `json:"external_identity_provider_id"` ExternalIdentityProviderID string `json:"external_identity_provider_id"`
Password string `json:"password" bson:"password" validate:"required,min=5"` Password string `json:"password" bson:"password" validate:"required,min=5"`
IsAdmin bool `json:"isadmin" bson:"isadmin"` // deprecated IsAdmin bool `json:"isadmin" bson:"isadmin"` // deprecated