diff --git a/.github/workflows/firefox-release.yml b/.github/workflows/firefox-release.yml
index 19e9749..df31783 100644
--- a/.github/workflows/firefox-release.yml
+++ b/.github/workflows/firefox-release.yml
@@ -1,8 +1,8 @@
-name: Firefox extension release
+
+name: Firefox extension release
on:
- release:
- types: [published]
+ workflow_dispatch:
permissions:
contents: write
@@ -14,73 +14,183 @@ jobs:
env:
EXTENSION_DIR: src/
- RELEASE_TAG: ${{ gitea.event.release.tag_name }}
- RELEASE_ID: ${{ gitea.event.release.id }}
REPOSITORY: ${{ gitea.repository }}
GITEA_SERVER_URL: ${{ gitea.server_url }}
- GITEA_SHA: ${{ gitea.sha }}
steps:
- - name: Checkout release commit
+ # --------------------------------------------------
+ # 1. Checkout du dépôt
+ # --------------------------------------------------
+
+ - name: Checkout main branch
uses: actions/checkout@v4
with:
- ref: ${{ gitea.sha }}
+ ref: main
fetch-depth: 0
token: ${{ secrets.GITEA_TOKEN }}
- - name: Ensure the release tag exists
+ # --------------------------------------------------
+ # 2. Détermination de la prochaine version
+ # --------------------------------------------------
+
+ - name: Determine next version
+ id: version
shell: bash
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
run: |
set -euo pipefail
- if [[ -z "${RELEASE_TAG}" ]]; then
- echo "::error::The release event does not contain a tag name."
+ if [[ -z "${GITEA_TOKEN:-}" ]]; then
+ echo "::error::GITEA_TOKEN is missing."
exit 1
fi
- git fetch --force origin \
- "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}" \
- 2>/dev/null || true
+ git fetch --force --tags origin
- if git show-ref --verify --quiet "refs/tags/${RELEASE_TAG}"; then
- echo "Tag ${RELEASE_TAG} already exists."
- else
- if [[ -z "${GITEA_SHA}" ]]; then
- echo "::error::Cannot create the tag: the release commit SHA is missing."
- exit 1
- fi
+ CURRENT_VERSION="$(node -p \
+ "require('./${EXTENSION_DIR}/manifest.json').version")"
- git tag -a "${RELEASE_TAG}" "${GITEA_SHA}" \
- -m "Release ${RELEASE_TAG}"
-
- # Use an HTTP authorization header so the token is not embedded
- # in the remote URL or written to the Git configuration.
- AUTH="$(printf 'x-access-token:%s' "${GITEA_TOKEN}" | base64 -w 0)"
- git -c http.extraheader="AUTHORIZATION: basic ${AUTH}" \
- push origin "refs/tags/${RELEASE_TAG}"
+ if [[ ! "${CURRENT_VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+ echo "::error::Invalid manifest version: ${CURRENT_VERSION}"
+ exit 1
fi
- git checkout --detach "refs/tags/${RELEASE_TAG}"
- echo "Release tag points to $(git rev-parse HEAD)."
+ VERSION="${CURRENT_VERSION}"
- - name: Validate release version
+ echo "Version found in manifest: ${VERSION}"
+
+ # Increment patch version while the corresponding tag exists.
+ while git show-ref --verify --quiet "refs/tags/v${VERSION}"; do
+ echo "Tag v${VERSION} already exists."
+
+ IFS='.' read -r MAJOR MINOR PATCH <<< "${VERSION}"
+ PATCH=$((PATCH + 1))
+
+ VERSION="${MAJOR}.${MINOR}.${PATCH}"
+ done
+
+ RELEASE_TAG="v${VERSION}"
+
+ echo "Selected version: ${VERSION}"
+ echo "Selected tag: ${RELEASE_TAG}"
+
+ # Update manifest version.
+ node - "${EXTENSION_DIR}/manifest.json" "${VERSION}" <<'NODE'
+ const fs = require("node:fs");
+
+ const file = process.argv[2];
+ const version = process.argv[3];
+
+ const manifest = JSON.parse(fs.readFileSync(file, "utf8"));
+
+ manifest.version = version;
+
+ fs.writeFileSync(
+ file,
+ JSON.stringify(manifest, null, 2) + "\n"
+ );
+
+ console.log(`Manifest updated to ${version}`);
+ NODE
+
+ # Configure Git identity.
+ git config user.name "Gitea Actions"
+ git config user.email "actions@celjim.fr"
+
+ # Commit the manifest only if it has changed.
+ if ! git diff --quiet -- "${EXTENSION_DIR}/manifest.json"; then
+ git add "${EXTENSION_DIR}/manifest.json"
+ git commit -m "chore(release): ${RELEASE_TAG}"
+
+ AUTH="$(printf 'x-access-token:%s' "${GITEA_TOKEN}" | base64 -w 0)"
+
+ git -c http.extraheader="AUTHORIZATION: basic ${AUTH}" \
+ push origin HEAD:main
+ else
+ echo "Manifest version is unchanged."
+ fi
+
+ # Create and push the annotated tag.
+ git tag -a "${RELEASE_TAG}" HEAD \
+ -m "Release ${RELEASE_TAG}"
+
+ AUTH="$(printf 'x-access-token:%s' "${GITEA_TOKEN}" | base64 -w 0)"
+
+ git -c http.extraheader="AUTHORIZATION: basic ${AUTH}" \
+ push origin "refs/tags/${RELEASE_TAG}"
+
+ echo "VERSION=${VERSION}" >> "${GITEA_ENV:-$GITHUB_ENV}"
+ echo "RELEASE_TAG=${RELEASE_TAG}" >> "${GITEA_ENV:-$GITHUB_ENV}"
+ echo "GITEA_SHA=$(git rev-parse HEAD)" >> "${GITEA_ENV:-$GITHUB_ENV}"
+
+ # --------------------------------------------------
+ # 3. Création de la release Gitea
+ # --------------------------------------------------
+
+ - name: Create Gitea release
+ id: release
+ shell: bash
+ env:
+ GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+ run: |
+ set -euo pipefail
+
+ API_BASE="${GITEA_SERVER_URL%/}/api/v1"
+ OWNER="${REPOSITORY%%/*}"
+ REPO="${REPOSITORY#*/}"
+
+ echo "Creating release ${RELEASE_TAG}..."
+
+ jq -n \
+ --arg tag "${RELEASE_TAG}" \
+ --arg version "${VERSION}" \
+ '{
+ tag_name: $tag,
+ target_commitish: "main",
+ name: ("SKYNET SSO " + $tag),
+ body: ("Release automatique de SKYNET SSO version " + $version + "."),
+ draft: false,
+ prerelease: false
+ }' > release-payload.json
+
+ curl --fail --silent --show-error \
+ --request POST \
+ --header "Authorization: token ${GITEA_TOKEN}" \
+ --header "Content-Type: application/json" \
+ --data @release-payload.json \
+ "${API_BASE}/repos/${OWNER}/${REPO}/releases" \
+ --output release-response.json
+
+ RELEASE_ID="$(jq -r '.id // empty' release-response.json)"
+
+ if [[ -z "${RELEASE_ID}" ]]; then
+ echo "::error::Unable to retrieve the Gitea release ID."
+ cat release-response.json
+ exit 1
+ fi
+
+ echo "Release created: ${RELEASE_TAG} (ID: ${RELEASE_ID})"
+
+ echo "RELEASE_ID=${RELEASE_ID}" >> "${GITEA_ENV:-$GITHUB_ENV}"
+
+ # --------------------------------------------------
+ # 4. Checkout du commit associé au tag
+ # --------------------------------------------------
+
+ - name: Checkout release commit
shell: bash
run: |
set -euo pipefail
- TAG_VERSION="${RELEASE_TAG#v}"
- MANIFEST_VERSION="$(node -p \
- "require('./${EXTENSION_DIR}/manifest.json').version")"
+ git checkout --detach "refs/tags/${RELEASE_TAG}"
- if [[ "${TAG_VERSION}" != "${MANIFEST_VERSION}" ]]; then
- echo "::error::Release tag ${RELEASE_TAG} does not match manifest version ${MANIFEST_VERSION}."
- echo "Expected tag: v${MANIFEST_VERSION} (or ${MANIFEST_VERSION})."
- exit 1
- fi
+ echo "Building ${RELEASE_TAG}"
+ echo "Commit: $(git rev-parse HEAD)"
- echo "Release ${RELEASE_TAG} matches manifest version ${MANIFEST_VERSION}."
+ # --------------------------------------------------
+ # 5. Installation des outils de compilation
+ # --------------------------------------------------
- name: Install build tools
run: |
@@ -90,6 +200,10 @@ jobs:
html-minifier-terser@7.2.0 \
web-ext@8.9.0
+ # --------------------------------------------------
+ # 6. Préparation et minification
+ # --------------------------------------------------
+
- name: Prepare and safely minify extension
shell: bash
run: |
@@ -97,45 +211,55 @@ jobs:
rm -rf dist artifacts
mkdir -p dist artifacts
+
cp -a "${EXTENSION_DIR}/." dist/
rm -f dist/README.md
- # Minify JavaScript, CSS and HTML in the build copy only.
- # The tracked source files are never rewritten.
+ # JavaScript
while IFS= read -r -d '' file; do
tmp="${file}.min"
+
npx --no-install terser "${file}" \
--compress --mangle \
--output "${tmp}"
+
mv "${tmp}" "${file}"
done < <(find dist -type f -name '*.js' -print0)
+ # CSS
while IFS= read -r -d '' file; do
tmp="${file}.min"
+
npx --no-install cleancss \
--compatibility ie11 -O2 \
--output "${tmp}" "${file}"
+
mv "${tmp}" "${file}"
done < <(find dist -type f -name '*.css' -print0)
+ # HTML
while IFS= read -r -d '' file; do
- tmp="${file}.min"
- npx --no-install html-minifier-terser \
- --collapse-whitespace \
- --remove-comments \
- --minify-css \
- --keep-closing-slash \
- "${file}" --output "${tmp}"
- mv "${tmp}" "${file}"
+ tmp="${file}.min"
+
+ npx --no-install html-minifier-terser \
+ --collapse-whitespace \
+ --remove-comments \
+ --minify-css \
+ --keep-closing-slash \
+ "${file}" --output "${tmp}"
+
+ mv "${tmp}" "${file}"
done < <(find dist -type f -name '*.html' -print0)
- # Validate that the resulting manifest is still valid JSON and
- # that all referenced entry-point files are present.
+ # Validate manifest and referenced files.
node <<'NODE'
const fs = require("node:fs");
const path = require("node:path");
+
const root = path.resolve("dist");
- const manifest = JSON.parse(fs.readFileSync(path.join(root, "manifest.json"), "utf8"));
+ const manifest = JSON.parse(
+ fs.readFileSync(path.join(root, "manifest.json"), "utf8")
+ );
const required = [
...(manifest.background?.scripts || []),
@@ -146,29 +270,43 @@ jobs:
...(manifest.options_ui?.page ? [manifest.options_ui.page] : []),
...(manifest.action?.default_popup ? [manifest.action.default_popup] : []),
...Object.values(manifest.icons || {}),
- ...(manifest.web_accessible_resources || []).flatMap(r => r.resources || [])
+ ...(manifest.web_accessible_resources || []).flatMap(
+ r => r.resources || []
+ )
];
for (const entry of required) {
const target = path.resolve(root, entry);
- if (!target.startsWith(root + path.sep) || !fs.existsSync(target)) {
+
+ if (
+ !target.startsWith(root + path.sep) ||
+ !fs.existsSync(target)
+ ) {
throw new Error(`Manifest resource missing or invalid: ${entry}`);
}
}
- console.log(`Manifest OK; ${required.length} referenced resources verified.`);
+ console.log(
+ `Manifest OK; ${required.length} referenced resources verified.`
+ );
NODE
+ # Firefox extension validation.
npx --no-install web-ext lint --source-dir dist
+ # ZIP archive.
ZIP_NAME="SKYNET-SSO-${RELEASE_TAG}.zip"
+
(
cd dist
zip -qr "../artifacts/${ZIP_NAME}" .
)
echo "ZIP_NAME=${ZIP_NAME}" >> "${GITEA_ENV:-$GITHUB_ENV}"
- echo "ZIP_PATH=artifacts/${ZIP_NAME}" >> "${GITEA_ENV:-$GITHUB_ENV}"
+
+ # --------------------------------------------------
+ # 7. Signature et soumission AMO
+ # --------------------------------------------------
- name: Sign and submit to Firefox Add-ons (AMO)
id: amo
@@ -178,21 +316,10 @@ jobs:
AMO_JWT_SECRET: ${{ secrets.AMO_JWT_SECRET }}
run: |
set -euo pipefail
+
mkdir -p artifacts/amo
- test -n "${AMO_JWT_ISSUER:-}" || {
- echo "AMO_JWT_ISSUER absent"
- exit 1
- }
-
- test -n "${AMO_JWT_SECRET:-}" || {
- echo "AMO_JWT_SECRET absent"
- exit 1
- }
-
- echo "Identifiants AMO présents."
- echo "Longueur issuer : ${#AMO_JWT_ISSUER}"
- echo "Longueur secret : ${#AMO_JWT_SECRET}"
+ echo "AMO credentials available."
npx --no-install web-ext sign \
--source-dir dist \
@@ -200,43 +327,44 @@ jobs:
--channel unlisted \
--api-key "${AMO_JWT_ISSUER}" \
--api-secret "${AMO_JWT_SECRET}" \
- --amo-metadata artifacts/amo-metadata.json \
--no-input
XPI="$(find artifacts/amo -maxdepth 1 -type f -name '*.xpi' -print -quit)"
- if [[ -z "${XPI}" ]]; then
+
+ if [[ -z "${XPI}" ]]; then
echo "::error::AMO did not return a signed XPI."
exit 1
fi
cp "${XPI}" "artifacts/SKYNET-SSO-${RELEASE_TAG}.xpi"
- echo "AMO submission/signing completed."
+
+ echo "AMO signing completed."
+
+ # --------------------------------------------------
+ # 8. Envoi des fichiers vers la release Gitea
+ # --------------------------------------------------
- name: Upload release files to Gitea
shell: bash
env:
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
- AMO_JWT_ISSUER: ${{ secrets.AMO_JWT_ISSUER }}
- AMO_JWT_SECRET: ${{ secrets.AMO_JWT_SECRET }}
run: |
set -euo pipefail
- if [[ -z "${GITEA_TOKEN}" ]]; then
- echo "::error::Add the GITEA_TOKEN repository secret (write access required)."
- exit 1
- fi
-
API_BASE="${GITEA_SERVER_URL%/}/api/v1"
OWNER="${REPOSITORY%%/*}"
REPO="${REPOSITORY#*/}"
+
AUTH_HEADER="Authorization: token ${GITEA_TOKEN}"
upload_asset() {
local file="$1"
local name
+
name="$(basename "${file}")"
- echo "Uploading ${name} to release ${RELEASE_TAG}..."
+ echo "Uploading ${name}..."
+
curl --fail --silent --show-error \
--request POST \
--header "${AUTH_HEADER}" \
@@ -244,17 +372,23 @@ jobs:
"${API_BASE}/repos/${OWNER}/${REPO}/releases/${RELEASE_ID}/assets?name=${name}"
}
- upload_asset "artifacts/${ZIP_NAME}"
+ # ZIP is always uploaded.
+ upload_asset "artifacts/SKYNET-SSO-${RELEASE_TAG}.zip"
+ # XPI is uploaded only if AMO signing succeeded.
if [[ -f "artifacts/SKYNET-SSO-${RELEASE_TAG}.xpi" ]]; then
upload_asset "artifacts/SKYNET-SSO-${RELEASE_TAG}.xpi"
else
- echo "AMO credentials are not configured; ZIP is attached, AMO publication skipped."
+ echo "AMO credentials unavailable; XPI publication skipped."
fi
+ # --------------------------------------------------
+ # 9. Conservation des artefacts du workflow
+ # --------------------------------------------------
+
- name: Preserve build files in workflow artifacts
uses: actions/upload-artifact@v3
with:
- name: SKYNET-SSO-${{ gitea.event.release.tag_name }}
+ name: SKYNET-SSO-${{ gitea.run_number }}
path: artifacts/*
if-no-files-found: error
diff --git a/src/content.js b/src/content.js
index 20c094c..3da50e4 100644
--- a/src/content.js
+++ b/src/content.js
@@ -248,18 +248,31 @@
}
}, true);
- collapse.addEventListener("click", event => {
- event.preventDefault();
- event.stopPropagation();
- bar.dataset.collapsed = "true";
- });
-
function revealBar(event) {
event?.preventDefault();
event?.stopPropagation();
bar.dataset.collapsed = "false";
}
+ // Tout clic dans la barre annule le repli automatique.
+ // Le clic sur l'encoche reste une action d'ouverture.
+ bar.addEventListener("click", event => {
+ if (!tab.contains(event.target)) {
+ clearAutoCollapse();
+ }
+ }, true);
+
+ // Repli manuel
+ collapse.addEventListener("click", event => {
+ event.preventDefault();
+ event.stopPropagation();
+
+ clearAutoCollapse();
+ bar.dataset.collapsed = "true";
+ });
+
+ // Déploiement au survol ou au clic de l'encoche
+
tab.addEventListener("mouseenter", revealBar);
tab.addEventListener("click", revealBar);
diff --git a/src/manifest.json b/src/manifest.json
index d516518..ef3e3d3 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,12 +1,17 @@
{
"manifest_version": 3,
"name": "SKYNET SSO",
- "version": "0.0.1",
+ "version": "0.0.2",
"description": "Affiche l'état de la session SSO Zoraxy et permet une déconnexion.",
"browser_specific_settings": {
"gecko": {
"id": "skynet-sso@celjim.fr",
- "strict_min_version": "128.0"
+ "strict_min_version": "128.0",
+ "data_collection_permissions": {
+ "required": [
+ "none"
+ ]
+ }
}
},
"permissions": ["storage", "tabs"],
@@ -29,6 +34,6 @@
"action": {
"default_title": "SKYNET SSO",
"default_popup": "popup.html",
- "default_icon": { "128": "icons/logoSkynet.ico" }
+ "default_icon": { "128": "icons/logoSkynet.png" }
}
}
\ No newline at end of file
diff --git a/src/options.html b/src/options.html
index 9e98793..e617d5a 100644
--- a/src/options.html
+++ b/src/options.html
@@ -32,7 +32,7 @@
>