gds-sso 6.0.0 → 7.0.0

data/README.md

@@ -35,10 +35,11 @@ Create a `config/initializers/gds-sso.rb` that looks like:
 The user model must include the GDS::SSO::User module.
 
 It should have the following fields:
+
     string   "name"
     string   "email"
     string   "uid"
-    string   "organisation"
+    string   "organisation_slug"
     array    "permissions"
     boolean  "remotely_signed_out", :default => false
 

data/app/controllers/api/user_controller.rb

@@ -33,7 +33,7 @@ class Api::UserController < ApplicationController
           extra: {
             user: {
               permissions: user_json['permissions'],
-              organisation: user_json['organisation'],
+              organisation_slug: user_json['organisation_slug'],
             }
           })
     end

data/lib/gds-sso/user.rb

@@ -4,7 +4,7 @@ module GDS
   module SSO
     module User
       def included(base)
-        attr_accessible :uid, :email, :name, :permissions, :organisation, as: :oauth
+        attr_accessible :uid, :email, :name, :permissions, :organisation_slug, as: :oauth
       end
 
       def has_permission?(permission)
@@ -19,7 +19,7 @@ module GDS
           'email'         => auth_hash['info']['email'],
           'name'          => auth_hash['info']['name'],
           'permissions'   => auth_hash['extra']['user']['permissions'],
-          'organisation'  => auth_hash['extra']['user']['organisation'],
+          'organisation_slug'  => auth_hash['extra']['user']['organisation_slug'],
         }
       end
 

data/lib/gds-sso/version.rb

@@ -1,5 +1,5 @@
 module GDS
   module SSO
-    VERSION = "6.0.0"
+    VERSION = "7.0.0"
   end
 end

data/lib/gds-sso/warden_config.rb

@@ -110,7 +110,7 @@ Warden::Strategies.add(:gds_bearer_token) do
       'extra' => {
         'user' => {
           'permissions' => input['permissions'],
-          'organisation' => input['organisation'],
+          'organisation_slug' => input['organisation_slug'],
         }
       }
     }

data/spec/controller/api_user_controller_spec.rb

@@ -7,7 +7,7 @@ def user_update_json
       "name" => "Joshua Marshall",
       "email" => "user@domain.com",
       "permissions" => ["signin", "new permission"],
-      "organisation" => "justice-league"
+      "organisation_slug" => "justice-league"
     }
   }.to_json
 end
@@ -61,7 +61,7 @@ describe Api::UserController, type: :controller do
       expected_permissions = ["signin", "new permission"]
       assert_equal expected_permissions, @user_to_update.permissions
       expected_organisation = "justice-league"
-      assert_equal expected_organisation, @user_to_update.organisation
+      assert_equal expected_organisation, @user_to_update.organisation_slug
     end
   end
 

data/spec/internal/app/models/user.rb

@@ -3,5 +3,5 @@ class User < ActiveRecord::Base
 
   serialize :permissions, Array
 
-  attr_accessible :uid, :email, :name, :permissions, :organisation, as: :oauth
+  attr_accessible :uid, :email, :name, :permissions, :organisation_slug, as: :oauth
 end

data/spec/internal/db/schema.rb

@@ -5,6 +5,6 @@ ActiveRecord::Schema.define do
     t.string "email",       :null => false
     t.boolean "remotely_signed_out"
     t.text   "permissions"
-    t.string "organisation"
+    t.string "organisation_slug"
   end
 end