Allow teams to change their name

backend/submission.go

@@ -11,6 +11,7 @@ import (
 	"math/rand"
 	"os"
 	"path"
+	"regexp"
 	"strconv"
 
 	"srs.epita.fr/fic-server/libfic"
@@ -33,9 +34,15 @@ func treatSubmission(pathname string, team_id string, exercice_id string) {
 	} else if err := json.Unmarshal(cnt_raw, &keys); err != nil {
 		log.Println(id, "[ERR]", err)
 	} else if exercice_id == "name" {
-		team.Name = keys["newName"]
-		if _, err := team.Update(); err != nil {
-			log.Println(id, "[WRN] Unable to change team name:", err)
+		if match, err := regexp.MatchString("^[A-Za-z0-9 àéèêëîïôùûü_-]{1,32}$", keys["newName"]); err == nil && match {
+			team.Name = keys["newName"]
+			if _, err := team.Update(); err != nil {
+				log.Println(id, "[WRN] Unable to change team name:", err)
+			}
+			genTeamMyFile(team)
+		}
+		if err := os.Remove(pathname); err != nil {
+			log.Println(id, "[ERR]", err)
 		}
 	} else if eid, err := strconv.Atoi(exercice_id); err != nil {
 		log.Println(id, "[ERR]", err)

frontend/static/index.html

@@ -70,8 +70,8 @@
 	<div class="col-sm-3">
 	  <div class="panel panel-default" ng-show="(my.team_id)">
 	    <div class="panel-body">
-	      <strong class="teamname" style="background-color: {{ teams[my.team_id].color }}; color: {{ teams[my.team_id].color }};"><span>{{ teams[my.team_id].name }}</span></strong>
-	      <a style="float: right;" class="btn btn-default btn-xs" href="/edit" ng-show="false">edit</a><br><br>
+	      <strong class="teamname" style="background-color: {{ teams[my.team_id].color }}; color: {{ teams[my.team_id].color }};"><span>{{ my.name }}</span></strong>
+	      <a style="float: right;" class="btn btn-default btn-xs" href="/edit">edit</a><br><br>
 
 	      <span ng-show="teams[my.team_id].rank">{{ teams[my.team_id].rank }}<sup>e</sup> sur {{ teams_count }} &ndash;</span>
 	      {{ my.score }} points

frontend/static/js/app.js

@@ -195,10 +195,66 @@ angular.module("FICApp")
 	    $scope.my.exercices[$rootScope.current_exercice].submitted = true;
 	};
     })
-    .controller("MyTeamController", function($scope, $rootScope) {
+    .controller("MyTeamController", function($scope, $http, $rootScope, $timeout) {
 	$rootScope.current_theme = 0;
 	$rootScope.current_exercice = 0;
-	$rootScope.title = "Edit team";
+	if ($scope.my) {
+	    $rootScope.title = $scope.my.name;
+	    $rootScope.authors = $scope.my.members.map(function (cur) {
+		return cur.firstname.capitalize() + " " + cur.lastname.capitalize();
+	    }).join(", ");
+	}
+	$scope.newName = "";
+	$rootScope.message = "";
+	$rootScope.sberr = "";
+
+	$scope.tsubmit = function() {
+	    $rootScope.sberr = "";
+	    if ($scope.newName.length < 1) {
+		$rootScope.messageClass = {"text-danger": true};
+		$rootScope.sberr = "Nom d'équipe invalide: pas d'entrée.";
+		return false;
+	    }
+	    else if ($scope.newName.length > 32) {
+		$rootScope.messageClass = {"text-danger": true};
+		$rootScope.sberr = "Nom d'équipe invalide: pas plus de 32 caractères.";
+		return false;
+	    }
+	    else if (!$scope.newName.match(/^[A-Za-z0-9 àéèêëîïôùûü_-]+$/)) {
+		$rootScope.messageClass = {"text-danger": true};
+		$rootScope.sberr = "Nom d'équipe invalide: seuls les caractères alpha-numériques sont autorisés.";
+		return false;
+	    }
+
+	    $http({
+		url: "/submit/name",
+		method: "POST",
+		data: {newName: $scope.newName}
+	    }).success(function(data, status, header, config) {
+		$rootScope.messageClass = {"text-success": true};
+		$rootScope.message = data.errmsg;
+
+		var checkDiff = function() {
+		    $http.get("/my.json").success(function(my) {
+			console.log(my.name);
+			if ($scope.my.name != my.name) {
+			    $scope.newName = "";
+			    $rootScope.message = "";
+			    $rootScope.refresh();
+			} else {
+			    $timeout(checkDiff, 750);
+			}
+		    });
+		};
+		checkDiff();
+	    }).error(function(data, status, header, config) {
+		$rootScope.messageClass = {"text-danger": true};
+		$rootScope.message = data.errmsg;
+		if (status != 402) {
+		    $rootScope.sberr = "Une erreur est survenue lors de l'envoi. Veuillez réessayer dans quelques instants.";
+		}
+	    });
+	};
     })
     .controller("RankController", function($scope, $rootScope) {
 	$rootScope.current_theme = 0;

frontend/static/views/home.html

@@ -1,5 +1,15 @@
 <div class="well well-lg">
-  <h3>Bienvenue !</h3>
+  <h3>Bienvenue <span ng-repeat="member in my.members"><span ng-show="$last && !$first"> et </span><span ng-show="$middle">, </span>{{ member.firstname | capitalize }} {{ member.lastname | capitalize }}</span> !</h3>
+  <p ng-show="(my.team_id)">
+    Félicitations ! vous êtes actuellement connecté à l'espace de votre
+    équipe <em>{{ teams[my.team_id].name }}</em>. Vous pouvez changer ce nom
+    dès maintenant en vous rendant sur la page de <a href="/edit">votre
+    équipe</a>.
+  </p>
+  <p class="text-warning" ng-show="(my.team_id && !my.members.length)">
+    Les membres de votre équipes ne sont pas encore enregistrés.
+    Passez voir l'équipe serveur pour corriger cela.
+  </p>
   <p>
     Compromissions, défauts de configuration, utilisations malveillantes,
     contournements des règles de sécurité, &hellip; tous les jours nous mettons

frontend/static/views/team-edit.html

@@ -0,0 +1,37 @@
+<div class="panel panel-default">
+  <div class="panel-heading">Votre équipe est composée de :</div>
+  <div class="panel-body" ng-show="!my.members.length">
+    Passez voir l'équipe serveur pour compléter ces informations.
+  </div>
+  <ul class="list-group" ng-show="my.members.length">
+    <li class="list-group-item" ng-repeat="member in my.members">
+      {{ member.firstname | capitalize }}
+      <span style="font-style: italic" ng-show="{{ member.nickname }}">{{ member.nickname }}</span>
+      <span style="font-variant: small-caps;">{{ member.lastname | capitalize }}</span>
+      <span ng-show="member.company">- {{ member.company}}</span>
+    </li>
+  </ul>
+</div>
+
+<div class="panel panel-info">
+  <div class="panel-heading">Changer de nom d'équipe</div>
+  <div class="panel-body">
+    <p ng-class="messageClass" ng-show="message || sberr"><strong ng-show="!sberr">Votre demande a bien été envoyée !</strong><strong ng-show="sberr">{{ sberr }}</strong> {{ message }}</p>
+    <form class="form-horizontal" ng-submit="tsubmit()">
+
+      <div class="form-group">
+	<label for="newName" class="col-sm-2 control-label">Nouveau nom</label>
+	<div class="col-sm-10">
+	  <input type="text" class="form-control" id="newName" ng-model="newName" placeholder="{{ my.name }}">
+	</div>
+      </div>
+
+      <div class="row form-group">
+	<div class="col-sm-offset-3">
+	  <button class="btn btn-info">Valider</button>
+	</div>
+      </div>
+
+    </form>
+  </div>
+</div>

frontend/submit.go

@@ -32,7 +32,7 @@ func (s SubmissionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Extract URL arguments
 	var sURL = strings.Split(r.URL.Path, "/")
 
-	if len(sURL) != 3 && len(sURL) != 4 {
+	if len(sURL) != 3 {
 		http.Error(w, "{\"errmsg\":\"Requête invalide.\"}", http.StatusBadRequest)
 		return
 	}
@@ -46,10 +46,11 @@ func (s SubmissionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if team, err := strconv.Atoi(sURL[1]); err != nil {
 		http.Error(w, "{\"errmsg\":\"Requête invalide.\"}", http.StatusBadRequest)
 		return
-	} else if exercice, err := strconv.Atoi(sURL[2]); err != nil {
+	} else if _, err := strconv.Atoi(sURL[2]); sURL[2] != "name" && err != nil {
 		http.Error(w, "{\"errmsg\":\"Requête invalide.\"}", http.StatusBadRequest)
 		return
 	} else {
+		exercice := sURL[2]
 		if _, err := os.Stat(path.Join(SubmissionDir, fmt.Sprintf("%d", team))); os.IsNotExist(err) {
 			log.Println("Creating submission directory for", team)
 			if err := os.MkdirAll(path.Join(SubmissionDir, fmt.Sprintf("%d", team)), 0777); err != nil {
@@ -60,8 +61,8 @@ func (s SubmissionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// Previous submission not treated
-		if _, err := os.Stat(path.Join(SubmissionDir, fmt.Sprintf("%d", team), fmt.Sprintf("%d", exercice))); !os.IsNotExist(err) {
-			http.Error(w, "{\"errmsg\":\"Du calme ! une tentative est déjà en cours de traitement.\"}", http.StatusPaymentRequired)
+		if _, err := os.Stat(path.Join(SubmissionDir, fmt.Sprintf("%d", team), exercice)); !os.IsNotExist(err) {
+			http.Error(w, "{\"errmsg\":\"Du calme ! une requête est déjà en cours de traitement.\"}", http.StatusPaymentRequired)
 			return
 		}
 
@@ -81,7 +82,7 @@ func (s SubmissionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// Store content in file
-		if file, err := os.Create(path.Join(SubmissionDir, fmt.Sprintf("%d", team), fmt.Sprintf("%d", exercice))); err != nil {
+		if file, err := os.Create(path.Join(SubmissionDir, fmt.Sprintf("%d", team), exercice)); err != nil {
 			log.Println("Unable to open exercice file:", err)
 			http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError)
 			return

libfic/team_my.go

@@ -25,6 +25,7 @@ type myTeamExercice struct {
 }
 type myTeam struct {
 	Id        int64                     `json:"team_id"`
+	Name      string                    `json:"name"`
 	Points    int64                     `json:"score"`
 	Members   []Member                  `json:"members"`
 	Exercices map[string]myTeamExercice `json:"exercices"`
@@ -35,6 +36,7 @@ func MyJSONTeam(t *Team, started bool) (interface{}, error) {
 	if t == nil {
 		ret.Id = 0
 	} else {
+		ret.Name = t.Name
 		ret.Id = t.Id
 		ret.Points, _ = t.GetPoints()
 		if members, err := t.GetMembers(); err == nil {