correction grmllll

2026-07-05 21:56:12 +02:00
parent f0b650e9ed
commit ffd284e2c8
1 changed files with 58 additions and 65 deletions
@@ -618,48 +618,40 @@ userPassword: {CRYPT}${pass}\n\n' | ldapmodify -c -H ldap://${LDAP_IP} -D \"cn=$
 	echo "${IDENT_KAZ} existe déjà sur mattermost" | tee -a "${LOG}"
    else
    
-	# on créé le compte mattermost
-	#echo "docker exec -i mattermostServ bin/mmctl user create --email ${EMAIL_SOUHAITE} --username ${IDENT_KAZ} --password ${PASSWORD}" | tee -a "${CMD_LOGIN}"
-#on remplace par l'api rest	
-# cat <<EOF | tee -a "${CMD_LOGIN}"
-	curl -s -X POST "https://${URL_AGORA}/api/v4/users" \
-		-H "Authorization: Bearer ${mattermost_token}" \
-		-H "Content-Type: application/json" \
-		-d '{"email":"${EMAIL_SOUHAITE}","username":"${IDENT_KAZ}","password":"${PASSWORD}"}'
-# EOF
+			# on créé le compte mattermost
+			#echo "docker exec -i mattermostServ bin/mmctl user create --email ${EMAIL_SOUHAITE} --username ${IDENT_KAZ} --password ${PASSWORD}" | tee -a "${CMD_LOGIN}"
+			#on remplace par l'api rest	

-	#quel user_id ?
-	USER_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/users/email/${EMAIL_SOUHAITE}" | jq -r '.id')
-	#KAZ a quelle team id ?
-	KAZ_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz" | jq -r '.id')
+			#KAZ a quelle team id ?
+			KAZ_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz" | jq -r '.id')
+			CHAN1_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz/channels/name/une-question--un-soucis" | jq -r '.id')
+			CHAN2_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz/channels/name/cafe-du-commerce--ouvert-2424h" | jq -r '.id')

-	# et enfin on ajoute toujours le user à l'équipe KAZ et aux 2 channels publiques
-	#echo "docker exec -i mattermostServ bin/mmctl team users add kaz ${EMAIL_SOUHAITE}" | tee -a "${CMD_LOGIN}"
-# cat <<EOF | tee -a "${CMD_LOGIN}"
-curl -s -X POST "https://${URL_AGORA}/api/v4/teams/${KAZ_ID}/members" \
-  -H "Authorization: Bearer ${mattermost_token}" \
-  -H "Content-Type: application/json" \
-  -d '{"team_id":"${KAZ_ID}","user_id":"${USER_ID}"}'
-# EOF
+			cat >> "${CMD_LOGIN}" <<EOF
+			resp=\$(curl -s -X POST "https://${URL_AGORA}/api/v4/users" \
+				-H "Authorization: Bearer ${mattermost_token}" \
+				-H "Content-Type: application/json" \
+				-d '{"email":"${EMAIL_SOUHAITE}","username":"${IDENT_KAZ}","password":"${PASSWORD}"}')

-	CHAN1_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz/channels/name/une-question--un-soucis" | jq -r '.id')
-	CHAN2_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/kaz/channels/name/cafe-du-commerce--ouvert-2424h" | jq -r '.id')
+			USER_ID=\$(echo "\$resp" | jq -r '.id')
+
+			# et enfin on ajoute toujours le user à l'équipe KAZ et aux 2 channels publiques
+
+			curl -s -X PUT "https://${URL_AGORA}/api/v4/teams/${KAZ_ID}/members/\${USER_ID}" \
+					-H "Authorization: Bearer ${mattermost_token}" \
+					-H "Content-Type: application/json"
+
+			curl -s -X PUT "https://${URL_AGORA}/api/v4/channels/${CHAN1_ID}/members/\${USER_ID}" \
+				-H "Authorization: Bearer ${mattermost_token}" \
+				-H "Content-Type: application/json"
+			curl -s -X PUT "https://${URL_AGORA}/api/v4/channels/${CHAN2_ID}/members/\${USER_ID}" \
+				-H "Authorization: Bearer ${mattermost_token}" \
+				-H "Content-Type: application/json"
+EOF

 #	echo "docker exec -i mattermostServ bin/mmctl channel users add kaz:une-question--un-soucis ${EMAIL_SOUHAITE}" | tee -a "${CMD_LOGIN}"
 #	echo "docker exec -i mattermostServ bin/mmctl channel users add kaz:cafe-du-commerce--ouvert-2424h ${EMAIL_SOUHAITE}" | tee -a "${CMD_LOGIN}"

-# cat <<EOF | tee -a "${CMD_LOGIN}"
-curl -s -X PUT "https://${URL_AGORA}/api/v4/channels/${CHAN1_ID}/members/${USER_ID}" \
-  -H "Authorization: Bearer ${mattermost_token}" \
-  -H "Content-Type: application/json"
-# EOF
-
-# cat <<EOF | tee -a "${CMD_LOGIN}"
-curl -s -X PUT "https://${URL_AGORA}/api/v4/channels/${CHAN2_ID}/members/${USER_ID}" \
-  -H "Authorization: Bearer ${mattermost_token}" \
-  -H "Content-Type: application/json"
-# EOF
-
 	NB_SERVICES_BASE=$((NB_SERVICES_BASE+1))
    fi

@@ -673,43 +665,44 @@ curl -s -X PUT "https://${URL_AGORA}/api/v4/channels/${CHAN2_ID}/members/${USER_
 			if [ "${nb}" == "0" ];then # non, on la créé en mettant le user en admin de l'équipe
 			
 				#echo "docker exec -i mattermostServ bin/mmctl team create --name ${EQUIPE_AGORA} --display-name ${EQUIPE_AGORA} --email ${EMAIL_SOUHAITE}" --private | tee -a "${CMD_INIT}"	
-				cat <<EOF | tee -a "${CMD_INIT}"
-				curl -s -X POST "https://${URL_AGORA}/api/v4/teams" \
-					-H "Authorization: Bearer ${mattermost_token}" \
-					-H "Content-Type: application/json" \
-					-d '{
-						"name": "'"${EQUIPE_AGORA}"'",
-						"display_name": "'"${EQUIPE_AGORA}"'",
-						"type": "I",
-						"email": "'"${EMAIL_SOUHAITE}"'"
-					}'
-EOF
 				
-			fi
+			#################################
+			cat >> "${CMD_LOGIN}" <<EOF
+			resp=\$(curl -s -X POST "https://${URL_AGORA}/api/v4/teams" \
+				-H "Authorization: Bearer ${mattermost_token}" \
+				-H "Content-Type: application/json" \
+				-d '{
+					"name":"${EQUIPE_AGORA}",
+					"display_name":"${EQUIPE_AGORA}",
+					"type":"I",
+					"email":"${EMAIL_SOUHAITE}"
+				}')
+
+			TEAM_ID=\$(echo "\$resp" | jq -r '.id')

 			# puis ajouter le user à l'équipe
 			#echo "docker exec -i mattermostServ bin/mmctl team users add ${EQUIPE_AGORA} ${EMAIL_SOUHAITE}" | tee -a "${CMD_INIT}"				
 			
-			#l'équipe a quelle team id ?
-			TEAM_ID=$(curl -s -H "Authorization: Bearer ${mattermost_token}" "https://${URL_AGORA}/api/v4/teams/name/${EQUIPE_AGORA}" | jq -r '.id')
-			cat <<EOF | tee -a "${CMD_INIT}"
-			curl -s -X POST "https://${URL_AGORA}/api/v4/teams/${TEAM_ID}/members" \
+			curl -s -X POST "https://${URL_AGORA}/api/v4/teams/\${TEAM_ID}/members" \
 				-H "Authorization: Bearer ${mattermost_token}" \
 				-H "Content-Type: application/json" \
 				-d '{
-					"team_id": "'"${TEAM_ID}"'",
-					"user_id": "'"${USER_ID}"'"
+					"team_id": "'"\${TEAM_ID}"'",
+					"user_id": "'"\${USER_ID}"'"
 				}'
-EOF
+				
 			#et on le rend admin de son équipe	
-			cat <<EOF | tee -a "${CMD_INIT}"
-			curl -s -X PUT "https://${URL_AGORA}/api/v4/teams/${TEAM_ID}/members/${USER_ID}/roles" \
+			curl -s -X PUT "https://${URL_AGORA}/api/v4/teams/\${TEAM_ID}/members/\${USER_ID}/roles" \
 				-H "Authorization: Bearer ${mattermost_token}" \
 				-H "Content-Type: application/json" \
 				-d '{"roles":"team_admin"}'				
 EOF


+			fi
+			
+
+
    fi

    if [ -n "${CREATE_ORGA_SERVICES}" ]; then