Backend for Vue Deck

backend/src/auth/jwt.go

@@ -16,6 +16,7 @@ type Claims struct {
 	ID      primitive.ObjectID `json:"id"`
 	SINFOID string             `json:"sinfoid"`
 	Role    models.TeamRole    `json:"role"`
+	Team    string             `json:"team"`
 	jwt.StandardClaims
 }
 
@@ -35,6 +36,7 @@ func SignJWT(credentials models.AuthorizationCredentials) (*string, error) {
 		ID:      credentials.ID,
 		SINFOID: credentials.SINFOID,
 		Role:    credentials.Role,
+		Team:    credentials.Team,
 		StandardClaims: jwt.StandardClaims{
 			ExpiresAt: expirationTime.Unix(),
 		},
@@ -75,6 +77,7 @@ func ParseJWT(tokenString string) (*models.AuthorizationCredentials, error) {
 		ID:      claims.ID,
 		SINFOID: claims.SINFOID,
 		Role:    claims.Role,
+		Team:    claims.Team,
 	}
 
 	return &result, nil

backend/src/config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/joho/godotenv"
 	"github.com/spf13/viper"
 )
 
@@ -33,6 +34,7 @@ var (
 
 	// Max size of the images to be uploaded by deck2 (Companies public and private images,
 	// speakers public and private images, etc)
+	// Also don't forget to update the frontend if this changes
 	// 10 MB
 	ImageMaxSize  int64 = 10 << 20
 	MinuteMaxSize int64 = 500 << 10
@@ -49,6 +51,7 @@ const (
 	keyPort string = "PORT"
 
 	keyDatabaseURI  string = "DB_URL"
+	deckDbURL string = "DECK_DB_URL"
 	keyDatabaseName string = "DB_NAME"
 	keyCallbackURL  string = "CALLBACK_URL"
 
@@ -77,7 +80,6 @@ func set(variable *string, key string, mandatory bool) {
 }
 
 func InitializeConfig(filename *string) {
-
 	var file = true
 	if filename == nil {
 		file = false
@@ -86,17 +88,14 @@ func InitializeConfig(filename *string) {
 	}
 
 	if file {
-		viper.SetConfigName(*filename)
-		viper.AddConfigPath(".")
-		if err := viper.ReadInConfig(); err != nil {
-			file = false
-		}
-
-	} else {
-		viper.SetEnvPrefix(keyPrefix)
-		viper.AutomaticEnv()
+		if err := godotenv.Load(*filename); err != nil {
+            fmt.Printf("Error loading .env file: %v\n", err)
+        }
 	}
 
+	viper.SetEnvPrefix(keyPrefix)
+	viper.AutomaticEnv()
+
 	set(&Host, keyHost, false)
 	set(&Port, keyPort, false)
 

backend/src/google/api.go

@@ -8,6 +8,9 @@ import (
 	"net/http"
 
 	"github.com/sinfo/deck2/src/auth"
+	"github.com/sinfo/deck2/src/config"
+
+	"google.golang.org/api/idtoken"
 )
 
 const oauthGoogleURLAPI = "https://www.googleapis.com/oauth2/v2/userinfo?access_token="
@@ -73,3 +76,19 @@ func GetUserDataWithToken(token string) (*UserData, error) {
 
 	return &result, nil
 }
+
+
+func GetUserDataFromGoogleJWT(token string) (*UserData, error) {
+	payload, err := idtoken.Validate(context.Background(), token, config.GoogleOAuthClientID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to validate ID token: %s", err.Error())
+	}
+
+	return &UserData{
+		ID:       payload.Subject,
+		Email:    payload.Claims["email"].(string),
+		Verified: payload.Claims["email_verified"].(bool),
+		Picture:  payload.Claims["picture"].(string),
+		HD:       payload.Claims["hd"].(string),
+	}, nil
+}

backend/src/main.go

@@ -18,9 +18,13 @@ import (
 func main() {
 
 	prod := flag.Bool("production", false, "Switch between production mode and dev mode")
-	file := flag.String("config", "", "Config filename. If ommited, configuration is obtained via env vars")
+	file := flag.String("config", ".env", "Config filename. If ommited, configuration is obtained via env vars")
 	flag.Parse()
 
+	print("Deck2 Backend\n")
+
+	// Initialize configuration
+	print("Initializing configuration...\n")
 	config.InitializeConfig(file)
 
 	if *prod {
@@ -29,13 +33,21 @@ func main() {
 		config.Production = true
 	}
 
+	print("Initializing OAuth2\n")
 	if err := auth.InitializeOAuth2(); err != nil {
 		log.Fatal(err.Error())
 	}
 
+	print("Initializing JWT\n")
 	auth.InitializeJWT()
+
+	print("Initializing MongoDB\n")
 	mongodb.InitializeDatabase()
+
+	print("Initializing Spaces\n")
 	spaces.InitializeSpaces()
+
+	print("Initializing Router\n")
 	router.InitializeRouter()
 
 	log.Printf("Serving at %s:%s\n", config.Host, config.Port)

backend/src/models/company.go

@@ -31,7 +31,7 @@ type CompanyParticipation struct {
 	// Participation's billing is a billing _id (see models.Billing).
 	Billing *primitive.ObjectID `json:"billing" bson:"billing"`
 
-	Confirmed time.Time `json:"confirmed" bson:"confirmed"`
+	Confirmed *time.Time `json:"confirmed,omitempty" bson:"confirmed,omitempty"`
 
 	// Is this company participating as a partner.
 	Partner bool `json:"partner" bson:"partner"`

backend/src/models/companyRep.go

@@ -12,3 +12,12 @@ type CompanyRep struct {
 	// Contact is a Contact _id (see models.Contact).
 	Contact primitive.ObjectID `json:"contact" bson:"contact"`
 }
+
+type CompanyRepWithContact struct {
+	// CompanyRep's ID (_id of mongodb).
+	ID   primitive.ObjectID `json:"id" bson:"_id"`
+	Name string             `json:"name" bson:"name"`
+
+	// Contact is the contact information of the representative.
+	Contact *Contact `json:"contact" bson:"contact"`
+}

backend/src/models/contact.go

@@ -25,12 +25,27 @@ type ContactMail struct {
 	Valid    bool   `json:"valid" bson:"valid"`
 }
 
+type Gender string
+const (
+	GenMale   Gender = "MALE"
+	GenFemale Gender = "FEMALE"
+	GenOther  Gender = "OTHER"
+)
+
+type Language string
+const (
+	LangEnglish Language = "ENGLISH"
+	LangPortuguese Language = "PORTUGUESE"
+)
+
 // Contact stores contacts' information. It doesn't hold a name, because it's used on models.CompanyRep,
 // models.Member and models.Speaker. All of them already hold a name.
 type Contact struct {
 	// Contact's ID (_id of mongodb).
 	ID primitive.ObjectID `json:"id" bson:"_id"`
 
+	Gender Gender `json:"gender" bson:"gender"`
+	Language Language `json:"language" bson:"language"`
 	Phones  []ContactPhone `json:"phones" bson:"phones"`
 	Socials ContactSocials `json:"socials" bson:"socials"`
 	Mails   []ContactMail  `json:"mails" bson:"mails"`

backend/src/models/member.go

@@ -25,6 +25,7 @@ type Member struct {
 
 	// Contact is an _id of Contact (see models.Contact).
 	Contact primitive.ObjectID `json:"contact" bson:"contact"`
+	ContactObject *Contact `json:"contactObject,omitempty" bson:"-"`
 }
 
 // MemberPublic is the public information about a member
@@ -47,6 +48,8 @@ type AuthorizationCredentials struct {
 
 	// Role on SINFO
 	Role TeamRole
+
+	Team string
 }
 
 type MemberEventTeam struct {

backend/src/models/post.go

@@ -18,5 +18,5 @@ type Post struct {
 	Text string `json:"text" bson:"text"`
 
 	Posted  time.Time `json:"posted" bson:"posted"`
-	Updated time.Time `json:"updated" bson:"updated"`
+	Updated *time.Time `json:"updated,omitempty" bson:"updated,omitempty"`
 }

backend/src/models/speaker.go

@@ -65,15 +65,16 @@ type Speaker struct {
 
 	// Contact is an _id of Contact (see models.Contact).
 	Contact *primitive.ObjectID `json:"contact,omitempty" bson:"contact"`
+	ContactObject *Contact `json:"contactObject,omitempty" bson:"contactObject"`
 
 	// Title of the speaker (CEO @ HugeCorportation, for example).
 	Title string `json:"title" bson:"title"`
 
 	// Bio of the speaker. Careful, this will be visible on our website!
 	Bio string `json:"bio" bson:"bio"`
 
-  // Company name
-  CompanyName string `json:"companyName" bson:"companyName"`
+  	// Company name
+  	CompanyName string `json:"companyName" bson:"companyName"`
 
 	// This is only visible by the team. Praise and trash talk at will.
 	Notes          string                 `json:"notes" bson:"notes"`

backend/src/models/thread.go

@@ -67,3 +67,30 @@ type Thread struct {
 	// PENDING => thread is posted and is waiting for the coordination's approval/review.
 	Status ThreadStatus `json:"status" bson:"status"`
 }
+
+type ThreadWithEntry struct {
+	// Thread's ID (_id of mongodb).
+	ID primitive.ObjectID `json:"id" bson:"_id"`
+
+	// Time posted
+	Posted  time.Time `json:"posted" bson:"posted"`
+
+	// Entry is an _id of Post (see models.Post).
+	Entry *Post `json:"entry" bson:"entry"`
+
+	// Meeting is an _id of Meeting (see models.Meeting).
+	Meeting *primitive.ObjectID `json:"meeting,omitempty" bson:"meeting,omitempty"`
+
+	// Comments is an array of _id of Post (see models.Post).
+	Comments []primitive.ObjectID `json:"comments" bson:"comments"`
+
+	// Kind of thread can be "TO", "FROM", "PHONE_CALL", "MEETING".
+	// This represents the type of communication made with a certain Company/Speaker.
+	Kind ThreadKind `json:"kind" bson:"kind"`
+
+	// Status of this thread can be "APPROVED", "REVIEWED", "PENDING".
+	// APPROVED => thread is posted and approved by the coordination.
+	// REVIEWED => thread is posted, but some changed must be made before it's ready to be approved.
+	// PENDING => thread is posted and is waiting for the coordination's approval/review.
+	Status ThreadStatus `json:"status" bson:"status"`
+}

backend/src/mongodb/company.go

@@ -704,7 +704,8 @@ func (ucpd *UpdateCompanyParticipationData) ParseBody(body io.Reader) error {
 	}
 
 	if ucpd.Confirmed == nil {
-		return errors.New("invalid confirmation date")
+		// Confirmed may be null
+		// return errors.New("invalid confirmation date")
 	}
 
 	if ucpd.Notes == nil {
@@ -735,11 +736,14 @@ func (c *CompaniesType) UpdateCompanyParticipation(companyID primitive.ObjectID,
 		"$set": bson.M{
 			"participations.$.member":    *data.Member,
 			"participations.$.partner":   *data.Partner,
-			"participations.$.confirmed": data.Confirmed.UTC(),
 			"participations.$.notes":     *data.Notes,
 		},
 	}
 
+	if data.Confirmed != nil {
+		updateQuery["participations.$.confirmed"] = data.Confirmed.UTC()
+	}
+
 	var filterQuery = bson.M{"_id": companyID, "participations.event": currentEvent.ID}
 
 	var optionsQuery = options.FindOneAndUpdate()
@@ -1029,6 +1033,55 @@ func (c *CompaniesType) RemoveEmployer(companyID primitive.ObjectID, companyRep
 	return &updatedCompany, nil
 }
 
+// UpdateEmployersOrderData is the structure used to update a company's employers order
+type UpdateEmployersOrderData struct {
+	Employers *[]primitive.ObjectID `json:"employers"`
+}
+
+// ParseBody fills the UpdateEmployersOrderData from a body
+func (ueod *UpdateEmployersOrderData) ParseBody(body io.Reader) error {
+	if err := json.NewDecoder(body).Decode(ueod); err != nil {
+		return err
+	}
+
+	if ueod.Employers == nil {
+		return errors.New("invalid employers")
+	}
+
+	// Validate that all employer IDs exist
+	for _, employerID := range *ueod.Employers {
+		if _, err := CompanyReps.GetCompanyRep(employerID); err != nil {
+			return errors.New("invalid employer ID: " + employerID.Hex())
+		}
+	}
+
+	return nil
+}
+
+// UpdateEmployersOrder updates the order of employers for a company
+func (c *CompaniesType) UpdateEmployersOrder(companyID primitive.ObjectID, data UpdateEmployersOrderData) (*models.Company, error) {
+	ctx := context.Background()
+	var updatedCompany models.Company
+
+	var updateQuery = bson.M{
+		"$set": bson.M{
+			"employers": data.Employers,
+		},
+	}
+
+	var filterQuery = bson.M{"_id": companyID}
+
+	var optionsQuery = options.FindOneAndUpdate()
+	optionsQuery.SetReturnDocument(options.After)
+
+	if err := c.Collection.FindOneAndUpdate(ctx, filterQuery, updateQuery, optionsQuery).Decode(&updatedCompany); err != nil {
+		log.Println("Error updating employers order:", err)
+		return nil, err
+	}
+
+	return &updatedCompany, nil
+}
+
 // AddThread adds a models.Thread to a company's participation's list of communications (related to the current event).
 func (c *CompaniesType) AddThread(companyID primitive.ObjectID, threadID primitive.ObjectID) (*models.Company, error) {
 

backend/src/mongodb/contact.go

@@ -29,6 +29,8 @@ type GetContactsOptions struct {
 
 // CreateContactData contains data needed to create a contact
 type CreateContactData struct {
+	Gender models.Gender `json:"gender" bson:"gender"`
+	Language models.Language `json:"language" bson:"language"`
 	Phones  []models.ContactPhone `json:"phones" bson:"phones"`
 	Socials models.ContactSocials `json:"socials" bson:"socials"`
 	Mails   []models.ContactMail  `json:"mails" bson:"mails"`
@@ -127,6 +129,8 @@ func (c *ContactsType) CreateContact(data CreateContactData) (*models.Contact, e
 	insertData["phones"] = data.Phones
 	insertData["socials"] = data.Socials
 	insertData["mails"] = data.Mails
+	insertData["gender"] = data.Gender
+	insertData["language"] = data.Language
 
 	insertResult, err := c.Collection.InsertOne(ctx, insertData)
 	if err != nil {
@@ -149,6 +153,8 @@ func (c *ContactsType) UpdateContact(contactID primitive.ObjectID, data CreateCo
 			"phones":  data.Phones,
 			"socials": data.Socials,
 			"mails":   data.Mails,
+			"gender":  data.Gender,
+			"language": data.Language,
 		},
 	}