discourse_api 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc919ed6b4b910836e7c49ee0eeeba549089ab0
-  data.tar.gz: 66a670a076264fed42fc8763358c94a698d2fc0d
+  metadata.gz: e3f92e1ed90f6df6ffb356583eedab8e43328a3c
+  data.tar.gz: 0351cf6da95703da9b167590833a72aacb59f688
 SHA512:
-  metadata.gz: d29e787eb57d150ee9ceac985e41ac185a56316a2083a59f756e9f4a04ca3bb1ee0440cc772f33198c7222b1ff322dc67080c8ff1ac0610a550938a8b09c4c69
-  data.tar.gz: 696ff6e30a2c947d7a3c4906ebff3cc43b55b71ca7c3c95e77d530b083ceece1a7bf6ffd2899da18a5976f7fc7becc817fc472c572e201f531979e5426b05f6e
+  metadata.gz: 27c8905ba8c68f2a06e11fa6dab834006c062676609242585ff5cc993b721247f78867b07d0ea617c56b9b4ea6a45b89d323232cadd8267b381a262b687bd56c
+  data.tar.gz: c32b0b29622c8ccff5e48bdb427f5dab52289ee481e6f60a8d36d036821dee69e5c6a19d7bfa5fe870ea3f96aff9e007e7fedaca0b8c9625c352d64e45fa8769

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.16.1] - 2017-06-23
+### Fixed
+- `user_sso` should use `user_id` instead of `username`
+- `upload_file` should also include optional `user_id` param
+
 ## [0.16.0] - 2017-05-14
 ### Added
 - added `upload_file`

data/lib/discourse_api/api/uploads.rb

@@ -3,7 +3,7 @@ module DiscourseApi
     module Uploads
       def upload_file(args)
         args = API.params(args)
-                  .optional(:file, :url)
+                  .optional(:file, :url, :user_id)
                   .default(type: 'composer', synchronous: true)
                   .to_h
         post('/uploads', args)

data/lib/discourse_api/api/users.rb

@@ -10,8 +10,8 @@ module DiscourseApi
         response[:body]['user']
       end
 
-      def user_sso(username)
-        response = get("/admin/users/#{username.downcase}")
+      def user_sso(user_id)
+        response = get("/admin/users/#{user_id}.json")
         response[:body]['single_sign_on_record']
       end
 

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

data/spec/discourse_api/api/users_spec.rb

@@ -24,6 +24,23 @@ describe DiscourseApi::API::Users do
     end
   end
 
+  describe "#user_sso" do
+    before do
+      stub_get("http://localhost:3000/admin/users/15.json?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("admin_user.json"), headers: { content_type: "application/json" })
+    end
+
+    it "requests the correct resource" do
+      subject.user_sso(15)
+      expect(a_get("http://localhost:3000/admin/users/15.json?api_key=test_d7fd0429940&api_username=test_user")).to have_been_made
+    end
+
+    it "has single_sign_on_record" do
+      user_sso = subject.user_sso(15)
+      expect(user_sso).to be_a Hash
+      expect(user_sso).to have_key("external_id")
+    end
+  end
+
   describe "#update_avatar" do
     before do
       stub_post("http://localhost:3000/uploads?api_key=test_d7fd0429940&api_username=test_user").to_return(body: fixture("upload_avatar.json"), headers: { content_type: "application/json" })

data/spec/fixtures/admin_user.json

@@ -0,0 +1,96 @@
+{
+  "id": 4,
+  "username": "47f6974294f6e3eb9686",
+  "avatar_template": "/letter_avatar_proxy/v2/letter/4/8e8cbc/{size}.png",
+  "active": false,
+  "admin": false,
+  "moderator": false,
+  "last_seen_at": null,
+  "last_emailed_at": null,
+  "created_at": "2017-06-23T16:30:22.539Z",
+  "last_seen_age": null,
+  "last_emailed_age": null,
+  "created_at_age": "17m",
+  "username_lower": "47f6974294f6e3eb9686",
+  "trust_level": 0,
+  "trust_level_locked": false,
+  "flag_level": 0,
+  "title": null,
+  "suspended_at": null,
+  "suspended_till": null,
+  "suspended": null,
+  "blocked": false,
+  "time_read": "< 1m",
+  "staged": false,
+  "days_visited": 0,
+  "posts_read_count": 0,
+  "topics_entered": 0,
+  "post_count": 0,
+  "name": "47f6974294f6e3eb9686f898f98a67d7",
+  "can_send_activation_email": true,
+  "can_activate": true,
+  "can_deactivate": true,
+  "ip_address": "192.168.56.1",
+  "registration_ip_address": null,
+  "can_grant_admin": true,
+  "can_revoke_admin": false,
+  "can_grant_moderation": true,
+  "can_revoke_moderation": false,
+  "can_impersonate": true,
+  "like_count": 0,
+  "like_given_count": 0,
+  "topic_count": 0,
+  "flags_given_count": 0,
+  "flags_received_count": 0,
+  "private_topics_count": 0,
+  "can_delete_all_posts": true,
+  "can_be_deleted": true,
+  "can_be_anonymized": true,
+  "suspend_reason": null,
+  "primary_group_id": null,
+  "badge_count": 0,
+  "warnings_received_count": 0,
+  "bounce_score": 0,
+  "reset_bounce_score_after": null,
+  "can_view_action_logs": true,
+  "single_sign_on_record": {
+    "user_id": 4,
+    "external_id": "847",
+    "last_payload": "nonce=bcbe1f1b1202fe597feaa2e3f23d566c&name=47f6974294f6e3eb9686f898f98a67d7&username=47f6974294f6e3eb9686f898f98a67d7&email=47f6974294f6e3eb9686f898f98a67d7%40test.com&require_activation=true&external_id=847",
+    "created_at": "2017-06-23T16:30:22.658Z",
+    "updated_at": "2017-06-23T16:30:22.658Z",
+    "external_username": "47f6974294f6e3eb9686f898f98a67d7",
+    "external_email": "47f6974294f6e3eb9686f898f98a67d7@test.com",
+    "external_name": "47f6974294f6e3eb9686f898f98a67d7",
+    "external_avatar_url": null
+  },
+  "approved_by": null,
+  "suspended_by": null,
+  "groups": [
+    {
+      "id": 10,
+      "automatic": true,
+      "name": "trust_level_0",
+      "display_name": "trust_level_0",
+      "user_count": 6,
+      "alias_level": 0,
+      "visible": true,
+      "automatic_membership_email_domains": null,
+      "automatic_membership_retroactive": false,
+      "primary_group": false,
+      "title": null,
+      "grant_trust_level": null,
+      "incoming_email": null,
+      "has_messages": false,
+      "flair_url": null,
+      "flair_bg_color": null,
+      "flair_color": null,
+      "bio_raw": null,
+      "bio_cooked": null,
+      "public": false,
+      "allow_membership_requests": false,
+      "full_name": null,
+      "default_notification_level": 3
+    }
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Sam Saffron
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -246,6 +246,7 @@ files:
 - spec/discourse_api/api/uploads_spec.rb
 - spec/discourse_api/api/users_spec.rb
 - spec/discourse_api/client_spec.rb
+- spec/fixtures/admin_user.json
 - spec/fixtures/api.json
 - spec/fixtures/backups.json
 - spec/fixtures/badges.json
@@ -326,6 +327,7 @@ test_files:
 - spec/discourse_api/api/uploads_spec.rb
 - spec/discourse_api/api/users_spec.rb
 - spec/discourse_api/client_spec.rb
+- spec/fixtures/admin_user.json
 - spec/fixtures/api.json
 - spec/fixtures/backups.json
 - spec/fixtures/badges.json