cafmal 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7538cbd3446a01fa4cba36d7b6b6b0d074f7d2e7
-  data.tar.gz: 58f9df9e4247c5192e55f3779d8c763454e0d26f
+  metadata.gz: 2d6712ce334fc95292bc85613b620f54a5ae86a2
+  data.tar.gz: 696029cbc24ad382f20074fb4ff8b68a70c7f5d4
 SHA512:
-  metadata.gz: 88227c3a8fa2657f990a8d2819634ccf46f9a934c15040d801ed8e8eeb6d024d4c8ce98b493f90529df634ce02fea5a28c8dc267bd13f97cb7a78ff9f51a718e
-  data.tar.gz: 3dd60239cd1a18b264a182e4a6d2d2a9e534e355d8c048c3a4d155b8eadb69c4333baa28baa1fd620cef099f01063ecc8e905fa3753f8bd3f304421036271f85
+  metadata.gz: 0bcbe576328a29f763cd5adaf681e9145e7161848566d83ee577a09203f9d58b924d8d5f81e48ca27f2bf4a4abaeda4f4a954ece956c9d410a18ada34180b96e
+  data.tar.gz: 02e7fcad6e7c1e140716e0d383cc48106f51a9225a0b62fd10ef245a11d39b95e15a3db9d2684ec05fb7a4e5a2eea5d2e5325040d171e00c74307d1f646a252d

data/lib/cafmal/auth.rb

@@ -38,7 +38,7 @@ module Cafmal
         @decoded_token['header'] = JSON.parse(Base64.decode64(@token.split('.')[0]))
         @decoded_token['payload'] = JSON.parse(Base64.decode64(@token.split('.')[1]))
 
-        if (@decoded_token['payload']['role'] == 'user' || @decoded_token['payload']['role'] == 'admin')
+        if (@decoded_token['payload']['role'] != 'worker' && @decoded_token['payload']['role'] != 'alerter')
           team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']))["team_id"]
           event = Cafmal::Event.new(@cafmal_api_url, @token)
           event.create({name: 'user.login', message: "#{email} has logged in.", kind: 'login', severity: 'info', team_id: team_id})
@@ -52,31 +52,52 @@ module Cafmal
 
     # we supply the token here, so web does not have to cache the auth obj
     def logout(token)
-      unless token.nil?
-        headers = {"Content-Type" => "application/json", "Authorization" => "Bearer #{token}"}
+      headers = {"Content-Type" => "application/json", "Authorization" => "Bearer #{token}"}
 
-        decoded_token = {}
-        decoded_token['header'] = JSON.parse(Base64.decode64(token.split('.')[0]))
-        decoded_token['payload'] = JSON.parse(Base64.decode64(token.split('.')[1]))
+      decoded_token = {}
+      decoded_token['header'] = JSON.parse(Base64.decode64(token.split('.')[0]))
+      decoded_token['payload'] = JSON.parse(Base64.decode64(token.split('.')[1]))
 
-        user = JSON.parse(Cafmal::User.new(@cafmal_api_url, token).show(decoded_token['payload']['sub']))
-        team_id = user["team_id"]
-        email = user["email"]
+      user = JSON.parse(Cafmal::User.new(@cafmal_api_url, token).show(decoded_token['payload']['sub']))
+      team_id = user["team_id"]
+      email = user["email"]
 
-        #@TODO if you are the last logged in user, unsilence your team alerts
+      #@TODO if you are the last logged in user, unsilence your team alerts
 
-        # kind has to be login, as it's a label of events
-        event_id = JSON.parse(Cafmal::Event.new(@cafmal_api_url, token).create({name: 'user.logout', message: "#{email} has logged out.", kind: 'login', severity: 'info', team_id: team_id}))
+      # kind has to be login, as it's a label of events
+      event_id = JSON.parse(Cafmal::Event.new(@cafmal_api_url, token).create({name: 'user.logout', message: "#{email} has logged out.", kind: 'login', severity: 'info', team_id: team_id}))
 
-        if event_id.nil?
-          false
-        else
-          @token = nil
-          @decoded_token = nil
-          true
-        end
+      if event_id.nil?
+        false
+      else
+        @token = nil
+        @decoded_token = nil
+        true
       end
+    end
+
+    # refresh token
+    def refresh
+      headers = {"Content-Type" => "application/json", "Authorization" => "Bearer #{@token}"}
+      credentials = {token: @token}.to_json
+      refresh_request = Cafmal::Request::Post.new(@cafmal_api_url + '/user_token_refresh', credentials, headers)
+      if refresh_request.code < 300
+        @token = JSON.parse(refresh_request.response.body)['jwt']
+        @decoded_token = {}
+        @decoded_token['header'] = JSON.parse(Base64.decode64(@token.split('.')[0]))
+        @decoded_token['payload'] = JSON.parse(Base64.decode64(@token.split('.')[1]))
 
+        if (@decoded_token['payload']['role'] != 'worker' && @decoded_token['payload']['role'] != 'alerter')
+          team_id = JSON.parse(Cafmal::User.new(@cafmal_api_url, @token).show(@decoded_token['payload']['sub']))["team_id"]
+          event = Cafmal::Event.new(@cafmal_api_url, @token)
+          event.create({name: 'user.refresh_login', message: "#{@decoded_token['payload']['email']} has refreshed his login.", kind: 'login', severity: 'info', team_id: team_id})
+
+          #@TODO silence all alerts for your team_id, set silenced_at now + 1h
+        end
+        return true
+      else
+        return false
+      end
     end
   end
 end

data/lib/cafmal/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cafmal
-  VERSION = "0.22.0"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cafmal
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Nils Bartels
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler