tree 13a6805cd55c7f00ca810e75c8cde0adcd62ca83
parent 847ab621de3da1983ce442be48616619c0330b75
parent ce850b557cd406e4dc546557acbf756484aac198
author Alex Vakulenko <avakulenko@google.com> 1451929928 -0800
committer Alex Vakulenko <avakulenko@google.com> 1451930413 +0000

Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'

483d597 Add 'sessionId' into privet/info
a0a8134 Changed AuthManager::CreateAccessToken and AuthManager::ParseAccessToken
f6a0fd9 examples/ledflasher: fix component
29bd070 Add AuthType enum with string mapping
fd2ef68 Move most of auth logic into SecurityDelegate::CreateAccessToken
4957afb Add privet API tests for local auth
3020c49 Remove unused SecurityDelegate::IsValidPairingCode
0bc02ed Use different secret for auth and access tokens
66f46b8 Change user_id into string
ee7322f Get list of auth modes from AuthManger
66a01e0 Add AuthManager::CreateAccessTokenFromAuth
3d6b552 Hide Config::Load method
20896ab Replace several members of SecurityManager with pointers to Settings
7a25a3d Extracted function to create token from secret and caveats
131b889 Extract macaroon reading and verifying into separate functions
e0df73a Switch to macaroon library to generate and parse access tokens
ce850b5 Add the ability to remove a component from component tree

Change-Id: Id1a2ac3e0852660009e6bc0773db891e335a117c