update readme/makefile

Author: Ian-Nara

Makefile

@@ -6,7 +6,7 @@ test:
 shell:
 	docker run -it -w $(PWD) -v $(PWD):$(PWD) -u `id -u`:`id -g` $(DOCKERIMAGE) /bin/bash
 
-examples: example_client example_auto_refresh example_sharing
+examples: example_client example_auto_refresh example_sharing example_publisher
 
 example_client:
 	docker run -w $(PWD) -v $(PWD):$(PWD) -u `id -u`:`id -g` -e PYTHONPATH=$(PWD) $(DOCKERIMAGE) python3 examples/sample_client.py "$(BASE_URL)" "$(AUTH_KEY)" "$(SECRET_KEY)" "$(AD_TOKEN)"
@@ -20,6 +20,8 @@ example_encryption:
 example_sharing:
 	docker run -w $(PWD) -v $(PWD):$(PWD) -u `id -u`:`id -g` -e PYTHONPATH=$(PWD) $(DOCKERIMAGE) python3 examples/sample_sharing.py "$(BASE_URL)" "$(AUTH_KEY)" "$(SECRET_KEY)" "$(RAW_UID)"
 
+example_publisher:
+	docker run -w $(PWD) -v $(PWD):$(PWD) -u `id -u`:`id -g` -e PYTHONPATH=$(PWD) $(DOCKERIMAGE) python3 examples/sample_token_generate_refresh.py "$(BASE_URL)" "$(AUTH_KEY)" "$(SECRET_KEY)"
 
 docker:
 	docker build -t $(DOCKERIMAGE) -f Dockerfile.dev .

README.md

@@ -7,6 +7,9 @@ This document includes:
 * [Requirements](#requirements)
 * [Install](#install)
 * [Usage for DSPs](#usage-for-dsps)
+* [Usage for Publishers](#usage-for-publishers)
+  * [Standard Integration](#standard-integration)
+  * [Server-Only Integration](#server-only-integration)
 * [Usage for UID2 Sharers](#usage-for-uid2-sharers)
 * [Development](#development)
   * [Example Usage](#example-usage)
@@ -41,34 +44,6 @@ decrypted_token = client.decrypt(advertising_token)
 print(decrypted_token.uid2)
 ```
 
-## Usage for Sharers
-
-A UID2 sharer is a participant that wants to share UID2s or EUIDs with another participant. Raw UID2s must be encrypted into UID2 tokens before sending them to another participant. 
-For examples of usage, see [sample_sharing.py](examples/sample_sharing.py) and [sample_auto_refresh.py](examples/sample_auto_refresh.py)
-
-```
-from uid2_client import Uid2ClientFactory
-
-# for UID2 (for EUID use EuidClientFactory)
-client = Uid2ClientFactory.create('https://prod.uidapi.com', 'my-auth-token', 'my-secret-key')
-client.refresh_keys()
-```
-Senders:
-
-1. Call the following:
-```
-encrypted = client.encrypt(raw_uid)
- ```
-2. If encryption was successful, send the token `encrypted.uid2` to the receiver.
-
-Receivers:
-
-1. Call the following:
-```
-decrypted = client.decrypt(uid_token)
-```
-2. If decryption was successful, use the token `decrypted.uid2`.
-
 ## Usage for Publishers
 
 1. Create an instance of Uid2PublisherClient
@@ -89,7 +64,7 @@ If you're using standard integration (client and server) (see [UID2 SDK for Java
 
 * Send this identity as a JSON string back to the client (to use in the [identity field](https://unifiedid.com/docs/sdks/client-side-identity#initopts-object-void)) using the following:
 
-    `token_generate_response.get_identity_json_string()` //Note: this method returns `None` if the user has opted out, so be sure to handle that case.
+   `token_generate_response.get_identity_json_string()` //Note: this method returns `None` if the user has opted out, so be sure to handle that case.
 
 ### Server-Only Integration
 
@@ -109,7 +84,7 @@ If you're using server-only integration (see [Publisher Integration Guide, Serve
       `identity = IdentityTokens.from_json_string(identityJsonString)`
    2. Determine if the identity can be refreshed (that is, the refresh token hasn't expired):
 
-      ` if not identity or not identity.is_refreshable(): # we must no longer use this identity (for example, remove this identity from the user's session) `
+      `if not identity or not identity.is_refreshable(): # we must no longer use this identity (for example, remove this identity from the user's session) `
    3. Determine if a refresh is needed:
 
       `if identity.is_due_for_refresh()):`
@@ -120,6 +95,35 @@ If you're using server-only integration (see [Publisher Integration Guide, Serve
 6. Store `token_refresh_response.get_identity_json_string()` in the user's session. If the user has opted out, this method returns `None`, indicating that the user's identity should be removed from the session. To confirm optout, you can use the `token_refresh_response.is_optout()` function.
 
 
+
+## Usage for Sharers
+
+A UID2 sharer is a participant that wants to share UID2s or EUIDs with another participant. Raw UID2s must be encrypted into UID2 tokens before sending them to another participant. 
+For examples of usage, see [sample_sharing.py](examples/sample_sharing.py) and [sample_auto_refresh.py](examples/sample_auto_refresh.py)
+
+```
+from uid2_client import Uid2ClientFactory
+
+# for UID2 (for EUID use EuidClientFactory)
+client = Uid2ClientFactory.create('https://prod.uidapi.com', 'my-auth-token', 'my-secret-key')
+client.refresh_keys()
+```
+Senders:
+
+1. Call the following:
+```
+encrypted = client.encrypt(raw_uid)
+ ```
+2. If encryption was successful, send the token `encrypted.uid2` to the receiver.
+
+Receivers:
+
+1. Call the following:
+```
+decrypted = client.decrypt(uid_token)
+```
+2. If decryption was successful, use the token `decrypted.uid2`.
+
 ## Development
 
 First, build the Docker image with Python 3.6 and all dev dependencies. This is required for all subsequent commands. Run the following:

examples/sample_token_generate_refresh.py

@@ -55,10 +55,4 @@ def _usage():
 json_string = tokens.get_json_string()
 
 print('Status =', status)
-print('Advertising Token =', advertising_token)
-print('Refresh Token =', refresh_token)
-print('Refresh Response Key =', refresh_response_key)
-print('Refresh From =', refresh_from)
-print('Refresh Expires =', refresh_expires)
-print('Identity Expires =', identity_expires)
-print('As Json String =', json_string)
+print('As Json String =', token_refresh_response.get_identity_json_string())