fidor_starter_kits 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 714384718ce26e4cc8ab8768f8e0ea3e83c75052
-  data.tar.gz: d7d856ad3b65c284c40eff20352ea90f56d48629
+  metadata.gz: 30fdb6f18b6e5fc63cf4c0fa3c62ae153c937b84
+  data.tar.gz: 824c624eb90dccf800c6d193d8d9258ab6f369d5
 SHA512:
-  metadata.gz: 9150c839dad0cbef014ceb05570ed302605108875399c9f8c335f0404859b8dbb0f01ad26eedd9eb8192088490ee28d2e60867d4de7c97067ff3132960cad3f1
-  data.tar.gz: fa9162749d414caeb0f4dcf324c0309a46cb057ae2d26e3444ee3602ea2bae140471d7474e96ea83261a463fd595bf9c39f2a79014110d0c85933e35b6cba1d6
+  metadata.gz: 91857810606f02f9be3e5112e21e8a5420d45a9246ff47bd1fa9e2d0ae2455d07d9fa08894e230af79e892bdb3f0c36a21ccc1c70120f02f7f8a9f54288800e2
+  data.tar.gz: d349653302eb2728b4c867f2458b26f381cb748d8cc7e8eb0bfe747e91a594bfdb893f74e6c510b60d33d60efd153a4289f701164f0c6a90a735f7f6f85201b4

data/lib/fidor_starter_kits/version.rb

@@ -1,3 +1,3 @@
 module FidorStarterKits
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

data/starter_kits/golang_transactions/example.go

@@ -121,6 +121,7 @@ func render(endpoint string, w http.ResponseWriter, r *http.Request) {
 			w.Write([]byte(err.Error()))
 		} else {
 			api_req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", accessToken))
+			api_req.Header.Set("Accept", "application/vnd.fidor.de; version=1,text/json")
 
 			client := &http.Client{}
 			if api_resp, err := client.Do(api_req); err != nil {
@@ -210,15 +211,18 @@ func retrieveTokenFromCode(code string, target_endpoint string) (token string, e
 	// assemble the API endpoint URL and request payload
 	redirect_uri := fmt.Sprintf("%s/oauth?ep=%s", fidorConfig.AppUrl, target_endpoint)
 	tokenPayload := url.Values{
-		"client_id":     {fidorConfig.ClientId},
-		"client_secret": {fidorConfig.ClientSecret},
-		"code":          {code},
-		"redirect_uri":  {url.QueryEscape(redirect_uri)},
-		"grant_type":    {"authorization_code"},
+		"client_id": {fidorConfig.ClientId},
+		//"client_secret": {fidorConfig.ClientSecret},
+		"code":         {code},
+		"redirect_uri": {url.QueryEscape(redirect_uri)},
+		"grant_type":   {"authorization_code"},
 	}
 	// Call the Oauth `token` endpoint
 	tokenUrl := fmt.Sprintf("%s/token", fidorConfig.FidorOauthUrl)
-	if resp, err := http.PostForm(tokenUrl, tokenPayload); err != nil {
+	req, _ := http.NewRequest("POST", tokenUrl, strings.NewReader(tokenPayload.Encode()))
+	req.SetBasicAuth(fidorConfig.ClientId, fidorConfig.ClientSecret)
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	if resp, err := http.DefaultClient.Do(req); err != nil {
 		println(err)
 		return "", err
 	} else {

data/starter_kits/node_tx/example.js

@@ -77,7 +77,8 @@ function retrieve_access_token_from_code( code, target_endpoint, cb ) {
     method: "POST",
     path  : oauth_url.path+"/token",
     port  : oauth_url.port,
-    host  : oauth_url.hostname
+    host  : oauth_url.hostname,
+    auth  : fidor_config.client_id+":"+fidor_config.client_secret
   }
 
   // ... what to send
@@ -85,7 +86,7 @@ function retrieve_access_token_from_code( code, target_endpoint, cb ) {
   var postData = {
     code          : code,
     client_id     : fidor_config.client_id,
-    client_secret : fidor_config.client_secret,
+    // client_secret : fidor_config.client_secret, // deprecated, please use basic auth, see. postOptions, above
     redirect_uri  : encodeURIComponent(redirect_uri),
     grant_type    : "authorization_code"
   }
@@ -205,7 +206,8 @@ function render (endpoint, req, res) {
       port: api_endpoint.port,
       method: "GET",
       headers: {
-        "Authorization": "Bearer "+access_token
+        "Authorization": "Bearer "+access_token,
+        "Accept": "application/vnd.fidor.de; version=1,text/json"
       }
     }
 

data/starter_kits/ruby_oauth_plain/example.rb

@@ -21,13 +21,15 @@ get '/' do
   post_params = { client_id: @client_id,
                   redirect_uri: CGI::escape(@app_url),
                   code: code,
-                  client_secret: @client_secret,
+                  #client_secret: @client_secret,
                   grant_type: 'authorization_code' }
-  resp = HTTParty.post(token_url, body: post_params )
+  auth = {:username => @client_id, :password => @client_secret}
+  resp = HTTParty.post(token_url, body: post_params, basic_auth: auth )
 
   # GET current user setting the access-token in the request header
   user = HTTParty.get( "#{@fidor_api_url}/users/current",
-                       headers: { 'Authorization' => "Bearer #{resp['access_token']}"} )
+                       headers: { 'Authorization' => "Bearer #{resp['access_token']}",
+                                  'Accept'        => "application/vnd.fidor.de; version=1,text/json"} )
 
   "<h2>Hello #{user['email']}</h2>
    <i>May i present the access token response:</i>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fidor_starter_kits
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip