taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Merge branch 'master' of git.taler.net:/var/git/wallet-webex

Browse Source
This commit is contained in:
Jeff Burdges 2016-08-26 17:48:08 +02:00
commit 5e595863bd
7 changed files with 61 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
articles/ui/figs/paypal.pdf
View File

Binary file not shown.

2
articles/ui/figs/paypal.pml
View File

@ -1,7 +1,7 @@
# FROM: https://github.com/w3c/webpayments/tree/gh-pages/PaymentFlows # FROM: https://github.com/w3c/webpayments/tree/gh-pages/PaymentFlows
@startuml @startuml
!includeurl https://raw.githubusercontent.com/w3c/webpayments/gh-pages/PaymentFlows/skin.ipml autonumber
Participant "Payee (Merchant) Site" as Payee Participant "Payee (Merchant) Site" as Payee
Actor "Payer (Shopper) Browser" as Payer Actor "Payer (Shopper) Browser" as Payer

BIN
articles/ui/figs/taler-pay.pdf
View File

Binary file not shown.

1
articles/ui/figs/taler-pay.pml
View File

@ -1,4 +1,5 @@
@startuml @startuml
autonumber
Actor "Payer (Shopper) Browser" as Payer Actor "Payer (Shopper) Browser" as Payer
Participant "Payee (Merchant) Site" as Payee Participant "Payee (Merchant) Site" as Payee

BIN
articles/ui/figs/taler-withdraw.pdf
View File

Binary file not shown.

1
articles/ui/figs/taler-withdraw.pml
View File

@ -1,4 +1,5 @@
@startuml @startuml
autonumber
Actor "Customer Browser" as Customer Actor "Customer Browser" as Customer
Participant "Bank Site" as Bank Participant "Bank Site" as Bank

112
articles/ui/ui.tex
View File

@ -697,7 +697,7 @@ customers, and may help create a competitive market.
\subsection{Spending coins} \subsection{Spending coins}
% \tinyskip % \tinyskip
\begin{figure}[t!] \begin{figure}[p!]
\subfloat[Select article][Select article. \\ Generated by Web shop.]{ \subfloat[Select article][Select article. \\ Generated by Web shop.]{
\includegraphics[width=0.30\textwidth]{figs/cart.png} \includegraphics[width=0.30\textwidth]{figs/cart.png}
\label{subfig:cart}} \hfill \label{subfig:cart}} \hfill
@ -743,7 +743,7 @@ merchant, the customer may choose to cover them.
morestring=[b]" morestring=[b]"
} }
\begin{figure*}[t!] \begin{figure*}[p!]
\lstset{language=HTML5} \lstset{language=HTML5}
\lstinputlisting{figs/taler-presence-js.html} \lstinputlisting{figs/taler-presence-js.html}
\caption{Sample code to detect the Taler wallet. Allowing the \caption{Sample code to detect the Taler wallet. Allowing the
@ -754,10 +754,27 @@ merchant, the customer may choose to cover them.
\end{figure*} \end{figure*}
\begin{figure*}[t!] \begin{figure*}[p!]
\lstset{language={}}
\begin{lstlisting}
HTTP/1.1 402 Payment Required
Content-Type: text/html; charset=UTF-8
X-Taler-Contract-Url: https://shop/generate-contract/42
<!DOCTYPE html>
<html>
<!-- fallback for browsers without the Taler extension -->
You do not seem to have Taler installed, here are other payment options ...
</html>
\end{lstlisting}
\caption{Sample HTTP response to prompt the wallet to show an offer.}
\label{listing:http-contract}
\end{figure*}
\begin{figure*}[p!]
\lstset{language=HTML5} \lstset{language=HTML5}
\lstinputlisting{figs/taler-contract.html} \lstinputlisting{figs/taler-contract.html}
\caption{Sample code to pass a contract to the Taler wallet. \caption{Sample JavaScript code to prompt the wallet to show an offer.
Here, the contract is fetched on-demand from the server. Here, the contract is fetched on-demand from the server.
The {\tt taler\_pay()} function needs to be invoked The {\tt taler\_pay()} function needs to be invoked
when the user triggers the checkout.} when the user triggers the checkout.}
@ -787,7 +804,7 @@ a Taler wallet is installed (as it is in Figure~\ref{fig:shopping}).
"exchanges":[{"master_pub":"1T5FA8VQHMMKBHDMYPRZA2ZFK2S63AKF0YTHJZWFKF45K2JGC8H0", "exchanges":[{"master_pub":"1T5FA8VQHMMKBHDMYPRZA2ZFK2S63AKF0YTHJZWFKF45K2JGC8H0",
"url":"https://exchange/"}], "url":"https://exchange/"}],
"expiry":"/Date(1480119270)/", "expiry":"/Date(1480119270)/",
"fulfillment_url": "https://shop/essay/42", "fulfillment_url": "https://shop/article/42?tid=249960194066269&time=1471479270",
"max_fee":{"currency":"EUR","fraction":01,"value":0}, "max_fee":{"currency":"EUR","fraction":01,"value":0},
"merchant":{"address":"Mailbox 4242","jurisdiction":"Jersey","name":"Shop Inc."}, "merchant":{"address":"Mailbox 4242","jurisdiction":"Jersey","name":"Shop Inc."},
"merchant_pub":"Y1ZAR5346J3ZTEXJCHQY9NJN78EZ2HSKZK8M0MYTNRJG5N0HD520", "merchant_pub":"Y1ZAR5346J3ZTEXJCHQY9NJN78EZ2HSKZK8M0MYTNRJG5N0HD520",
@ -804,27 +821,6 @@ a Taler wallet is installed (as it is in Figure~\ref{fig:shopping}).
\label{listing:json-contract} \label{listing:json-contract}
\end{figure*} \end{figure*}
\begin{figure*}[t!]
\lstset{language={}}
\begin{lstlisting}
HTTP/1.1 402 Payment Required
Content-Type: text/html; charset=UTF-8
X-Taler-Contract-Url: https://shop/generate-contract/42
...
<!DOCTYPE html>
<html>
...
<!-- fallback for browsers without the Taler extension -->
You do not seem to have Taler installed, here are
other payment options:
...
</html>
\end{lstlisting}
\caption{Sample HTTP response for a Web resource that requires a payment.}
\label{listing:http-contract}
\end{figure*}
\subsubsection{Offer} \subsubsection{Offer}
The offer URL of the Web shop can then initiate payments by sending a The offer URL of the Web shop can then initiate payments by sending a
@ -859,6 +855,41 @@ the {\em fulfillment} URL provided by the merchant in the contract
\subsubsection{Fulfillment} \subsubsection{Fulfillment}
\begin{figure*}[t!]
\lstset{language=HTML5}
\begin{lstlisting}
taler.executePayment("2BAH2AT4GSG5JRM2W4YWTSYGY66EK4X8CX2V69D5VF7XV703AJMG",
"https://shop/pay", "https://shop/article/42",
(err) => { alert("Sending payment failed"); });
\end{lstlisting}
\caption{Sample JavaScript code to trigger transmission of a payment to the merchant.}
\label{listing:javascript-execute}
\end{figure*}
\begin{figure*}[t!]
\lstset{language={}}
\begin{lstlisting}
HTTP/1.1 402 Payment Required
Content-Type: text/html; charset=UTF-8
X-Taler-Contract-Hash: 2BAH2AT4GSG5JRM2W4YWTSYGY66EK4X8CX2V69D5VF7XV703AJMG...
X-Taler-Pay-Url: https://shop/pay
X-Taler-Offer-Url: https://shop/article/42
<!DOCTYPE html>
<html>
<!-- fallback for browsers without the Taler extension -->
You do not seem to have Taler installed, here are other payment options ...
</html>
\end{lstlisting}
\caption{Sample HTTP response when the user agent navigates to a fulfillment
URL without the session state that indicates they have paid for the resource.
Note that unlike in Listing~\ref{listing:http-contract}, the response
references a contract that typically is already known to the wallet via its
hash code.}
\label{listing:http-execute}
\end{figure*}
The fulfillment URL uniquely identifies a purchase by some customer, The fulfillment URL uniquely identifies a purchase by some customer,
while the offer URL identifies a generic offer that is not specific to while the offer URL identifies a generic offer that is not specific to
a customer. The purchase identified by a fulfillment URL may have a customer. The purchase identified by a fulfillment URL may have
@ -887,7 +918,7 @@ lost,\footnote{This can happen when when privacy conscious users
browser) do not support persistent (non-session) cookies.} the Web browser) do not support persistent (non-session) cookies.} the Web
store responds by (again) triggering a payment process (either via store responds by (again) triggering a payment process (either via
JavaScript or using {\tt 402 Payment Required}, see JavaScript or using {\tt 402 Payment Required}, see
Figure~\ref{listing:http-execute}). However, unlike the response from Figures~\ref{listing:javascript-execute} and~\ref{listing:http-execute}). However, unlike the response from
the offer URL, the 402 response from the fulfillment page includes the the offer URL, the 402 response from the fulfillment page includes the
headers {\tt X-Taler-Contract-Hash}, {\tt X-Taler-Pay-Url} and {\tt headers {\tt X-Taler-Contract-Hash}, {\tt X-Taler-Pay-Url} and {\tt
X-Taler-Offer-Url}. X-Taler-Offer-Url}.
@ -907,33 +938,6 @@ already approved, for example because the user obtained the link
from another user, the wallet navigates to the offer URL included from another user, the wallet navigates to the offer URL included
in the header. in the header.
\begin{figure*}[t!]
\lstset{language={}}
\begin{lstlisting}
HTTP/1.1 402 Payment Required
Content-Type: text/html; charset=UTF-8
X-Taler-Contract-Hash: 2BAH2AT4GSG5JRM2W4YWTSYGY66EK4X8CX2V69D5VF7XV703AJMG
X-Taler-Offer-Url: https://shop/article/42
X-Taler-Pay-Url: https://shop/pay
...
<!DOCTYPE html>
<html>
...
<!-- fallback for browsers without the Taler extension -->
You do not seem to have Taler installed, here are
other payment options:
...
</html>
\end{lstlisting}
\caption{Sample HTTP response when the user agent navigates to a fulfillment
URL without the session state that indicates they have paid for the resource.
Note that unlike in Listing~\ref{listing:http-contract}, the response
references a contract that typically is already known to the wallet via its
hash code.}
\label{listing:http-execute}
\end{figure*}
\subsubsection{Discussion} \subsubsection{Discussion}
Various failure modes are considered in this design: Various failure modes are considered in this design: