openc3 5.19.0 → 6.0.0

data/lib/openc3/models/trigger_group_model.rb

@@ -64,9 +64,9 @@ module OpenC3
       end
     end
 
-    attr_reader :name, :scope, :updated_at
+    attr_reader :name, :scope, :shard, :updated_at
 
-    def initialize(name:, scope:, updated_at: nil)
+    def initialize(name:, scope:, shard: 0, updated_at: nil)
       unless name.is_a?(String)
         raise TriggerGroupInputError.new "invalid group name: '#{name}'"
       end
@@ -75,6 +75,7 @@ module OpenC3
       end
       super("#{scope}#{PRIMARY_KEY}", name: name, scope: scope)
       @microservice_name = "#{scope}__TRIGGER_GROUP__#{name}"
+      @shard = shard.to_i # to_i to handle nil
       @updated_at = updated_at
     end
 
@@ -93,6 +94,7 @@ module OpenC3
       return {
         'name' => @name,
         'scope' => @scope,
+        'shard' => @shard,
         'updated_at' => @updated_at,
       }
     end
@@ -122,11 +124,12 @@ module OpenC3
         name: @microservice_name,
         folder_name: nil,
         cmd: ['ruby', "trigger_group_microservice.rb", @microservice_name],
-        work_dir: '/openc3/lib/openc3/microservices',
+        work_dir: '/openc3-enterprise/lib/openc3-enterprise/microservices',
         options: [],
         topics: topics,
         target_names: [],
         plugin: nil,
+        shard: @shard,
         scope: @scope
       )
       microservice.create

data/lib/openc3/operators/microservice_operator.rb

@@ -42,6 +42,8 @@ module OpenC3
       @new_microservices = {}
       @changed_microservices = {}
       @removed_microservices = {}
+      @shard = ENV['OPENC3_SHARD'] || 0
+      @shard = @shard.to_i
     end
 
     def convert_microservice_to_process_definition(microservice_name, microservice_config)
@@ -65,10 +67,9 @@ module OpenC3
         secrets.each do |type, secret_name, env_name_or_path, secret_store|
           secret_value = @secrets.get(secret_name, secret_store: secret_store, scope: scope)
           if secret_value
-            case type
-            when 'ENV'
+            if type == 'ENV'
               env[env_name_or_path] = secret_value
-            when 'FILE'
+            elsif type == 'FILE'
               FileUtils.mkdir_p(File.dirname(env_name_or_path))
               File.open(env_name_or_path, 'wb') do |file|
                 file.write(secret_value)
@@ -88,6 +89,12 @@ module OpenC3
       # Get all the microservice configuration
       @microservices = MicroserviceModel.all
 
+      # Filter to just this shard
+      @microservices = @microservices.select do |microservice_name, microservice_config|
+        microservice_shard = microservice_config['shard'] || 0
+        microservice_shard == @shard
+      end
+
       # Detect new and changed microservices
       @new_microservices = {}
       @changed_microservices = {}

data/lib/openc3/packets/commands.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -308,12 +308,23 @@ module OpenC3
         item = command.get_item(item_upcase)
         range_check_value = value
 
-        # Convert from state to value if possible
-        if item.states and item.states[value.to_s.upcase]
-          range_check_value = item.states[value.to_s.upcase]
-        end
-
         if range_checking
+          if item.states
+            if item.states[value.to_s.upcase]
+              range_check_value = item.states[value.to_s.upcase]
+            else
+              unless item.states.values.include?(value)
+                if command.raw
+                  # Raw commands report missing value maps
+                  raise "Command parameter '#{command.target_name} #{command.packet_name} #{item_upcase}' = #{value.to_s.upcase} not one of #{item.states.values.join(', ')}"
+                else
+                  # Normal commands report missing state maps
+                  raise "Command parameter '#{command.target_name} #{command.packet_name} #{item_upcase}' = #{value.to_s.upcase} not one of #{item.states.keys.join(', ')}"
+                end
+              end
+            end
+          end
+
           range = item.range
           if range
             # Perform Range Check on command parameter

data/lib/openc3/packets/limits.rb

@@ -50,18 +50,6 @@ module OpenC3
       return @config.limits_sets
     end
 
-    # (see OpenC3::Packet#out_of_limits)
-    def out_of_limits
-      items = []
-      @config.telemetry.each do |target_name, target_packets|
-        target_packets.each do |packet_name, packet|
-          new_items = packet.out_of_limits
-          items.concat(new_items)
-        end
-      end
-      return items
-    end
-
     # @return [Hash(String, Array)] The defined limits groups
     def groups
       return @config.limits_groups

data/lib/openc3/packets/packet.rb

@@ -110,6 +110,9 @@ module OpenC3
     # @return [Boolean] If this packet should be used for identification
     attr_reader :virtual
 
+    # @return [Boolean] If this packet is marked as restricted use
+    attr_accessor :restricted
+
     # Valid format types
     VALUE_TYPES = [:RAW, :CONVERTED, :FORMATTED, :WITH_UNITS]
 
@@ -151,6 +154,7 @@ module OpenC3
         @packet_time = nil
         @ignore_overlap = false
         @virtual = false
+        @restricted = false
         @validator = nil
       end
 
@@ -752,7 +756,7 @@ module OpenC3
           super(item, value, :RAW, buffer)
         rescue ArgumentError => e
           if item.states and String === value and e.message =~ /invalid value for/
-            raise "Unknown state #{value} for #{item.name}"
+            raise "Unknown state #{value} for #{item.name}, must be one of #{item.states.keys.join(', ')}"
           else
             raise e
           end
@@ -1085,6 +1089,9 @@ module OpenC3
       elsif @hidden
         config << "  HIDDEN\n"
       end
+      if @restricted
+        config << "  RESTRICTED\n"
+      end
 
       if @processors
         @processors.each do |_processor_name, processor|
@@ -1145,6 +1152,7 @@ module OpenC3
       config['disabled'] = true if @disabled
       config['hidden'] = true if @hidden
       config['virtual'] = true if @virtual
+      config['restricted'] = true if @restricted
       config['accessor'] = @accessor.class.to_s
       config['accessor_args'] = @accessor.args
       config['validator'] = @validator.class.to_s if @validator
@@ -1201,6 +1209,7 @@ module OpenC3
       packet.disabled = hash['disabled']
       packet.hidden = hash['hidden']
       packet.virtual = hash['virtual']
+      packet.restricted = hash['restricted']
       if hash['accessor']
         begin
           accessor = OpenC3::const_get(hash['accessor'])

data/lib/openc3/packets/packet_config.rb

@@ -34,9 +34,11 @@ require 'openc3/packets/parsers/xtce_converter'
 require 'openc3/utilities/python_proxy'
 require 'openc3/conversions'
 require 'openc3/processors'
+require 'openc3/accessors'
 require 'nokogiri'
 require 'ostruct'
 require 'fileutils'
+require 'tempfile'
 
 module OpenC3
   # Reads a command or telemetry configuration file and builds a hash of packets.
@@ -219,7 +221,7 @@ module OpenC3
               'PARAMETER', 'ID_ITEM', 'ID_PARAMETER', 'ARRAY_ITEM', 'ARRAY_PARAMETER', 'APPEND_ITEM',\
               'APPEND_PARAMETER', 'APPEND_ID_ITEM', 'APPEND_ID_PARAMETER', 'APPEND_ARRAY_ITEM',\
               'APPEND_ARRAY_PARAMETER', 'ALLOW_SHORT', 'HAZARDOUS', 'PROCESSOR', 'META',\
-              'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED', 'VIRTUAL', 'ACCESSOR', 'TEMPLATE', 'TEMPLATE_FILE',\
+              'DISABLE_MESSAGES', 'HIDDEN', 'DISABLED', 'VIRTUAL', 'RESTRICTED', 'ACCESSOR', 'TEMPLATE', 'TEMPLATE_FILE',\
               'RESPONSE', 'ERROR_RESPONSE', 'SCREEN', 'RELATED_ITEM', 'IGNORE_OVERLAP', 'VALIDATOR'
             raise parser.error("No current packet for #{keyword}") unless @current_packet
 
@@ -367,6 +369,32 @@ module OpenC3
       end
     end
 
+    # This method provides way to quickly test packet configs
+    #
+    # require 'openc3/packets/packet_config'
+    #
+    # config = <<END
+    #   ...
+    # END
+    #
+    # pc = PacketConfig.from_config(config, "MYTARGET")
+    # c = pc.commands['CMDADCS']['SET_POINTING_CMD']
+    # c.restore_defaults()
+    # c.write("MYITEM", 5)
+    # puts c.buffer.formatted
+    def self.from_config(config, process_target_name, language = 'ruby')
+      pc = self.new
+      tf = Tempfile.new("pc.txt")
+      tf.write(config)
+      tf.close
+      begin
+        pc.process_file(tf.path, process_target_name, language)
+      ensure
+        tf.unlink
+      end
+      return pc
+    end
+
     protected
 
     def update_id_value_hash(packet, hash)
@@ -480,6 +508,11 @@ module OpenC3
         @current_packet.disabled = true
         @current_packet.virtual = true
 
+      when 'RESTRICTED'
+        usage = "#{keyword}"
+        parser.verify_num_parameters(0, 0, usage)
+        @current_packet.restricted = true
+
       when 'ACCESSOR', 'VALIDATOR'
         usage = "#{keyword} <Class name> <Optional parameters> ..."
         parser.verify_num_parameters(1, nil, usage)

data/lib/openc3/packets/packet_item.rb

@@ -112,8 +112,6 @@ module OpenC3
       @messages_disabled = nil
       @state_colors = nil
       @limits = PacketItemLimits.new
-      @persistence_setting = 1
-      @persistence_count = 0
       @meta = nil
     end
 
@@ -426,15 +424,13 @@ module OpenC3
       config << self.read_conversion.to_config(:READ) if self.read_conversion
       config << self.write_conversion.to_config(:WRITE) if self.write_conversion
 
-      if self.limits
-        if self.limits.values
-          self.limits.values.each do |limits_set, limits_values|
-            config << "    LIMITS #{limits_set} #{self.limits.persistence_setting} #{self.limits.enabled ? 'ENABLED' : 'DISABLED'} #{limits_values[0]} #{limits_values[1]} #{limits_values[2]} #{limits_values[3]}"
-            if limits_values[4] && limits_values[5]
-              config << " #{limits_values[4]} #{limits_values[5]}\n"
-            else
-              config << "\n"
-            end
+      if self.limits.values
+        self.limits.values.each do |limits_set, limits_values|
+          config << "    LIMITS #{limits_set} #{self.limits.persistence_setting} #{self.limits.enabled ? 'ENABLED' : 'DISABLED'} #{limits_values[0]} #{limits_values[1]} #{limits_values[2]} #{limits_values[3]}"
+          if limits_values[4] && limits_values[5]
+            config << " #{limits_values[4]} #{limits_values[5]}\n"
+          else
+            config << "\n"
           end
         end
         config << self.limits.response.to_config if self.limits.response
@@ -489,31 +485,33 @@ module OpenC3
       config['read_conversion'] = self.read_conversion.as_json(*a) if self.read_conversion
       config['write_conversion'] = self.write_conversion.as_json(*a) if self.write_conversion
 
-      if self.limits
-        config['limits'] ||= {}
-        config['limits']['enabled'] = true if self.limits.enabled
-        if self.limits.values
-          config['limits'] ||= {}
-          config['limits']['persistence_setting'] = self.limits.persistence_setting
-          config['limits']['response'] = self.limits.response.to_s if self.limits.response
-          self.limits.values.each do |limits_set, limits_values|
-            limits = {}
-            limits['red_low'] =  limits_values[0]
-            limits['yellow_low'] = limits_values[1]
-            limits['yellow_high'] = limits_values[2]
-            limits['red_high'] = limits_values[3]
-            limits['green_low'] = limits_values[4] if limits_values[4]
-            limits['green_high'] = limits_values[5] if limits_values[5]
-            config['limits'][limits_set] = limits
-          end
+      config['limits'] ||= {}
+      if self.limits.enabled
+        config['limits']['enabled'] = true
+      elsif self.limits.values || (self.state_colors && self.state_colors.length > 0)
+        # Only set to false if there are limits or state colors
+        # to avoid items without limits acting like they can be enabled
+        config['limits']['enabled'] = false
+      end
+      if self.limits.values
+        # Only set these if there are limits.values because persistence_setting has a default
+        # and we don't want keys on the 'limits' hash if there aren't any limits
+        config['limits']['persistence_setting'] = self.limits.persistence_setting if self.limits.persistence_setting
+        config['limits']['response'] = self.limits.response.to_s if self.limits.response
+        self.limits.values.each do |limits_set, limits_values|
+          limits = {}
+          limits['red_low'] =  limits_values[0]
+          limits['yellow_low'] = limits_values[1]
+          limits['yellow_high'] = limits_values[2]
+          limits['red_high'] = limits_values[3]
+          limits['green_low'] = limits_values[4] if limits_values[4]
+          limits['green_high'] = limits_values[5] if limits_values[5]
+          config['limits'][limits_set] = limits
         end
-        config['limits_response'] = self.limits.response.as_json(*a) if self.limits.response
       end
 
       config['meta'] = @meta if @meta
-      if @variable_bit_size
-        config['variable_bit_size'] = @variable_bit_size
-      end
+      config['variable_bit_size'] = @variable_bit_size if @variable_bit_size
       config
     end
 

data/lib/openc3/packets/structure_item.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2024, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -141,7 +141,7 @@ module OpenC3
     end
 
     def key=(key)
-      raise ArgumentError, "key must be a String but is a #{name.class}" unless String === key
+      raise ArgumentError, "key must be a String but is a #{key.class}" unless String === key
       raise ArgumentError, "key must contain at least one character" if key.empty?
 
       @key = key

data/lib/openc3/script/calendar.rb

@@ -98,12 +98,7 @@ module OpenC3
         result = JSON.parse(response.body, :allow_nan => true, :create_additions => true)
         raise "#{error_message} due to #{result['message']}"
       end
-      # TODO: Not sure why the response body is empty (on delete) but check for that
-      if response.body.nil? or response.body.empty?
-        return nil
-      else
-        return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
-      end
+      return JSON.parse(response.body, :allow_nan => true, :create_additions => true)
     end
   end
 end

data/lib/openc3/script/commands.rb

@@ -46,12 +46,10 @@ module OpenC3
           next if Packet::RESERVED_ITEM_NAMES.include?(key)
 
           if value.is_a?(String)
-            value = value.convert_to_value.to_s
-            if value.length > 256
-              value = value[0..255] + "...'"
-            end
             if !value.is_printable?
               value = "BINARY"
+            elsif value.length > 256
+              value = value[0..255] + "...'"
             end
             value.tr!('"', "'")
           elsif value.is_a?(Array)
@@ -120,17 +118,25 @@ module OpenC3
         _cmd_disconnect(cmd, raw, no_range, no_hazardous, *args, scope: scope)
       else
         begin
-          target_name, cmd_name, cmd_params = $api_server.method_missing(cmd, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
-          if log_message.nil? or log_message
-            _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+          begin
+            target_name, cmd_name, cmd_params = $api_server.method_missing(cmd, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
+            if log_message.nil? or log_message
+              _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+            end
+          rescue HazardousError => e
+            # This opens a prompt at which point they can cancel and stop the script
+            # or say Yes and send the command. Thus we don't care about the return value.
+            prompt_for_hazardous(e.target_name, e.cmd_name, e.hazardous_description)
+            target_name, cmd_name, cmd_params = $api_server.method_missing(cmd_no_hazardous, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
+            if log_message.nil? or log_message
+              _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+            end
           end
-        rescue HazardousError => e
-          # This opens a prompt at which point they can cancel and stop the script
-          # or say Yes and send the command. Thus we don't care about the return value.
-          prompt_for_hazardous(e.target_name, e.cmd_name, e.hazardous_description)
-          target_name, cmd_name, cmd_params = $api_server.method_missing(cmd_no_hazardous, *args, timeout: timeout, log_message: log_message, validate: validate, scope: scope, token: token)
+        rescue CriticalCmdError => e
+          # This should not return until the critical command has been approved
+          prompt_for_critical_cmd(e.uuid, e.username, e.target_name, e.cmd_name, e.cmd_params, e.cmd_string)
           if log_message.nil? or log_message
-            _log_cmd(target_name, cmd_name, cmd_params, raw, no_range, no_hazardous)
+            _log_cmd(e.target_name, e.cmd_name, e.cmd_params, raw, no_range, no_hazardous)
           end
         end
       end

data/lib/openc3/script/critical_cmd.rb

@@ -0,0 +1,91 @@
+# encoding: ascii-8bit
+
+# Copyright 2024 OpenC3, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+module OpenC3
+  module Script
+    private
+
+    def critical_cmd_status(uuid, scope: $openc3_scope)
+      begin
+        endpoint = "/openc3-api/criticalcmd/status/#{uuid}"
+        response = $api_server.request('get', endpoint, scope: scope)
+        if response.nil? || response.status != 200
+          raise "Unexpected response to critical_cmd_status: #{response.inspect}"
+        end
+        result = JSON.parse(response.body)
+        return result['status']
+      rescue => error
+        raise "critical_cmd_status failed due to #{error.formatted}"
+      end
+    end
+
+    def critical_cmd_approve(uuid, scope: $openc3_scope)
+      begin
+        endpoint = "/openc3-api/criticalcmd/approve/#{uuid}"
+        response = $api_server.request('post', endpoint, :json => true, scope: scope)
+        if response.nil? || response.status != 200
+          if response
+            parsed = JSON.parse(response.body)
+            raise "critical_cmd_approve error: #{parsed['error']}"
+          else
+            raise "critical_cmd_approve failed"
+          end
+        end
+        return
+      rescue => error
+        raise "critical_cmd_approve failed due to #{error.formatted}"
+      end
+    end
+
+    def critical_cmd_reject(uuid, scope: $openc3_scope)
+      begin
+        endpoint = "/openc3-api/criticalcmd/reject/#{uuid}"
+        response = $api_server.request('post', endpoint, :json => true, scope: scope)
+        if response.nil? || response.status != 200
+          if response
+            parsed = JSON.parse(response.body)
+            raise "critical_cmd_reject error: #{parsed['error']}"
+          else
+            raise "critical_cmd_reject failed"
+          end
+        end
+        return
+      rescue => error
+        raise "critical_cmd_reject failed due to #{error.formatted}"
+      end
+    end
+
+    def critical_cmd_can_approve(uuid, scope: $openc3_scope)
+      begin
+        endpoint = "/openc3-api/criticalcmd/canapprove/#{uuid}"
+        response = $api_server.request('get', endpoint, scope: scope)
+        if response.nil? || response.status != 200
+          raise "Unexpected response to critical_cmd_can_approve: #{response.inspect}"
+        end
+        result = JSON.parse(response.body)
+        if result['status'] == 'ok'
+          return true
+        else
+          return false
+        end
+      rescue => error
+        raise "critical_cmd_can_approve failed due to #{error.formatted}"
+      end
+    end
+  end
+end

data/lib/openc3/script/screen.rb

@@ -70,7 +70,7 @@ module OpenC3
         response = $api_server.request('post', endpoint, :data => data, :json => true, scope: scope)
         if response.nil? || response.status != 200
           if response
-            parsed = JSON.parse(response)
+            parsed = JSON.parse(response.body)
             raise "create_screen error: #{parsed['error']}"
           else
             raise "create_screen failed"
@@ -88,7 +88,7 @@ module OpenC3
         response = $api_server.request('delete', endpoint, scope: scope)
         if response.nil? || response.status != 200
           if response
-            parsed = JSON.parse(response)
+            parsed = JSON.parse(response.body)
             raise "delete_screen error: #{parsed['error']}"
           else
             raise "delete_screen failed"

data/lib/openc3/script/script.rb

@@ -36,6 +36,7 @@ require 'openc3/script/storage'
 require 'openc3/script/web_socket_api'
 require 'openc3/script/packages'
 require 'openc3/script/plugins'
+require 'openc3/script/critical_cmd'
 require 'openc3/utilities/authentication'
 
 $api_server = nil
@@ -108,6 +109,22 @@ module OpenC3
       end
     end
 
+    def prompt_for_critical_cmd(uuid, _username, _target_name, _cmd_name, _cmd_params, cmd_string)
+      puts "Waiting for critical command approval:"
+      puts "  #{cmd_string}"
+      puts "  UUID: #{uuid}"
+      loop do
+        status = critical_cmd_status(uuid)
+        if status == 'APPROVED'
+          return
+        elsif status == 'REJECTED'
+          raise "Critical command rejected"
+        end
+        # Else still waiting
+        wait(0.1)
+      end
+    end
+
     ###########################################################################
     # START PUBLIC API
     ###########################################################################
@@ -116,16 +133,6 @@ module OpenC3
       $disconnect = true
     end
 
-    # DEPRECATED
-    def play_wav_file(wav_filename)
-      # NOOP
-    end
-
-    # DEPRECATED
-    def status_bar(message)
-      # NOOP
-    end
-
     def ask_string(question, blank_or_default = false, password = false)
       answer = ''
       default = ''

data/lib/openc3/script/web_socket_api.rb

@@ -126,7 +126,7 @@ module OpenC3
     # Connect to the websocket with authorization in query params
     def connect
       disconnect()
-      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.token}"
+      final_url = @url + "?scope=#{@scope}&authorization=#{@authentication.token(include_bearer: false)}"
       @stream = WebSocketClientStream.new(final_url, @write_timeout, @read_timeout, @connect_timeout)
       @stream.headers = {
         'Sec-WebSocket-Protocol' => 'actioncable-v1-json, actioncable-unsupported',
@@ -240,7 +240,7 @@ module OpenC3
     end
   end
 
-  # Autonomic Events WebSocket
+  # Autonomic Events WebSocket (Enterprise Only)
   class AutonomicEventsWebSocketApi < CmdTlmWebSocketApi
     def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
       @identifier = {
@@ -251,7 +251,7 @@ module OpenC3
     end
   end
 
-  # Calendar Events WebSocket
+  # Calendar Events WebSocket (Enterprise Only)
   class CalendarEventsWebSocketApi < CmdTlmWebSocketApi
     def initialize(history_count: 0, url: nil, write_timeout: 10.0, read_timeout: 10.0, connect_timeout: 5.0, authentication: nil, scope: $openc3_scope)
       @identifier = {
@@ -355,7 +355,7 @@ module OpenC3
       data_hash['items'] = items if items
       data_hash['packets'] = packets if packets
       data_hash['scope'] = scope
-      data_hash['token'] = @authentication.token
+      data_hash['token'] = @authentication.token(include_bearer: false)
       write_action(data_hash)
     end
 
@@ -384,7 +384,7 @@ module OpenC3
       data_hash['items'] = items if items
       data_hash['packets'] = packets if packets
       data_hash['scope'] = scope
-      data_hash['token'] = @authentication.token
+      data_hash['token'] = @authentication.token(include_bearer: false)
       write_action(data_hash)
     end