jaroslawhartman · skatsavos · Oct 10, 2022 · Oct 10, 2022 · May 10, 2023 · May 10, 2023
diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
@@ -16,68 +16,32 @@ A tool for synchronisation of the Withings API to:
 * Based on [withings-garmin](https://github.com/ikasamah/withings-garmin) by Masayuki Hamasaki, improved to support SSO authorization in Garmin Connect 2.
 * Based on [withings-garmin-v2](https://github.com/jaroslawhartman/withings-garmin-v2) by Jarek Hartman, improved Python 3 compatability, code-style and setuptools packaging, Kubernetes and Docker support.
 
-## Installation
-
-```bash
-$ pip install withings-sync
-```
 
 ## Usage
 
 ```
-usage: withings-sync [-h] [--garmin-username GARMIN_USERNAME] [--garmin-password GARMIN_PASSWORD] [--trainerroad-username TRAINERROAD_USERNAME] [--trainerroad-password TRAINERROAD_PASSWORD] [--fromdate DATE]
-                     [--todate DATE] [--to-fit] [--to-json] [--output BASENAME] [--no-upload] [--verbose]
+usage: withings-sync [-h] [--withings-userid WITHINGS_USERID] [--garmin-upload] [--trainerroad-upload] [--fromdate DATE]
+                     [--todate DATE] [--to-fit] [--to-json] [--output BASENAME] [--verbose]
 
 A tool for synchronisation of Withings (ex. Nokia Health Body) to Garmin Connect and Trainer Road or to provide a json string.
 
 optional arguments:
   -h, --help            show this help message and exit
-  --garmin-username GARMIN_USERNAME, --gu GARMIN_USERNAME
-                        username to log in to Garmin Connect.
-  --garmin-password GARMIN_PASSWORD, --gp GARMIN_PASSWORD
-                        password to log in to Garmin Connect.
-  --trainerroad-username TRAINERROAD_USERNAME, --tu TRAINERROAD_USERNAME
-                        username to log in to TrainerRoad.
-  --trainerroad-password TRAINERROAD_PASSWORD, --tp TRAINERROAD_PASSWORD
-                        password to log in to TrainerRoad.
+  --withings-userid WITHINGS_USERID, --wuid WITHINGS_USERID
+                        API userid to use for Withings.
+  --garmin-upload, --gu
+                        upload to Garmin Connect.
+  --trainerroad-upload, --tu
+                        upload to TrainerRoad.
   --fromdate DATE, -f DATE
   --todate DATE, -t DATE
   --to-fit, -F          Write output file in FIT format.
   --to-json, -J         Write output file in JSON format.
   --output BASENAME, -o BASENAME
                         Write downloaded measurements to file.
-  --no-upload           Won't upload to Garmin Connect or TrainerRoad.
   --verbose, -v         Run verbosely
 ```
 
-### Providing credentials via environment variables
-
-You can use the following environment variables for providing the Garmin and/or Trainerroad credentials:
-
-- `GARMIN_USERNAME`
-- `GARMIN_PASSWORD` 
-- `TRAINERROAD_USERNAME`
-- `TRAINERROAD_PASSWORD`
-
-### Providing credentials via secrets files
-
-You can also populate the following 'secrets' files to provide the Garmin and/or Trainerroad credentials:
-
-- `/run/secrets/garmin_username`
-- `/run/secrets/garmin_password`
-- `/run/secrets/trainerroad_username`
-- `/run/secrets/trainerroad_password`
-
-Secrets are useful in an orchestrated container context — see the [Docker Swarm](https://docs.docker.com/engine/swarm/secrets/) or [Rancher](https://rancher.com/docs/rancher/v1.6/en/cattle/secrets/) docs for more information on how to securely inject secrets into a container.
-
-### Order of priority for credentials
-
-In the case of credentials being available via multiple means (e.g. [environment variables](#providing-credentials-via-environment-variables) and [secrets files](#providing-credentials-via-secrets-files)), the order of resolution for determining which credentials to use is as follows, with later methods overriding credentials supplied by an earlier method:
-
-1. Read secrets file(s)
-2. Read environment variable(s)
-3. Use command invocation arugment(s)
-
 ### Obtaining Withings Authorization Code
 
 When running for a very first time, you need to obtain Withings authorization:
@@ -123,82 +87,3 @@ E.g. by running the script every 10 minutes.
 
 See also: https://github.com/jaroslawhartman/withings-sync/issues/31
 
-### Docker
-
-```
-$ docker pull ghcr.io/jaroslawhartman/withings-sync:master
-```
-
-First start to ensure the script can start successfully:
-
-
-Obtaining Withings authorisation:
-
-```
-$ docker run -v $HOME:/root --interactive --tty --name withings ghcr.io/jaroslawhartman/withings-sync:master --garmin-username=<username> --garmin-password=<password>
-
-Can't read config file config/withings_user.json
-User interaction needed to get Authentification Code from Withings!
-
-Open the following URL in your web browser and copy back the token. You will have *30 seconds* before the token expires. HURRY UP!
-(This is one-time activity)
-
-https://account.withings.com/oauth2_user/authorize2?response_type=code&client_id=183e03e1f363110b3551f96765c98c10e8f1aa647a37067a1cb64bbbaf491626&state=OK&scope=user.metrics&redirect_uri=https://wieloryb.uk.to/withings/withings.html&
-
-Token : <token>
-Withings: Get Access Token
-Withings: Refresh Access Token
-Withings: Get Measurements
-   Measurements received
-JaHa.WAW.PL
-Garmin Connect User Name: JaHa.WAW.PL
-Fit file uploaded to Garmin Connect
-```
-
-And for subsequent runs:
-
-```
-$ docker start -i withings
-Withings: Refresh Access Token
-Withings: Get Measurements
-   Measurements received
-JaHa.WAW.PL
-Garmin Connect User Name: JaHa.WAW.PL
-Fit file uploaded to Garmin Connect
-```
-
-### Run a periodic Kubernetes job
-
-Edit the credentials in `contrib/k8s-job.yaml` and run:
-
-```bash
-$ kubectl apply -f contrib/k8s-job.yaml
-```
-
-### For advanced users - registering own Withings application
-
-The script has been registered as a Withings application and got assigned `Client ID` and `Consumer Secret`. If you wish to create your own application - feel free! 
-
-
-* First you need a Withings account. [Sign up here](https://account.withings.com/connectionuser/account_create).
-* Then you need a a Withings developer app registered. [Create your app here](https://account.withings.com/partner/add_oauth2).
-
-Note, registering it is quite cumbersome, as you need to have a callback URL and an Icon. Anyway, when done, you should have the following identifiers:
-
-| Identfier       |  Example                                                           |
-|-----------------|--------------------------------------------------------------------|
-| Client ID       | `183e03.................765c98c10e8f1aa647a37067a1......baf491626` |
-| Consumer Secret | `a75d65.................4c16719ef7bd69fa7c5d3fd0ea......ed48f1765` |
-| Callback URI    | `https://jhartman.pl/withings/notify`                              |
-
-Configure them in `config/withings_app.json`, for example:
-
-```
-{
-    "callback_url": "https://wieloryb.uk.to/withings/withings.html",
-    "client_id": "183e0******0b3551f96765c98c1******b64bbbaf491626",
-    "consumer_secret": "a75d65******1df1514c16719ef7bd69fa7*****2e2b0ed48f1765"
-}
-```
-
-For the callback URL you will need to setup a webserver hosting `contrib/withings.html`.
diff --git a/withings_sync/config/withings_app.json → config/withings_app.json b/withings_sync/config/withings_app.json → config/withings_app.json
diff --git a/contrib/do_release.sh b/contrib/do_release.sh
diff --git a/contrib/icon.png b/contrib/icon.png