sign_in_with_apple_user_migrator 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f60fa992a310fa6ba3ebcddb971abb31897d84293702c6f2e14bb6b26663c654
-  data.tar.gz: 498ac47a5d993cf75614c3c1b8278dab75e5fa01cf1d40d6d0a327a00cec1d27
+  metadata.gz: 32bdec7f75c80ec3528d6b13ede6fde69f0235e210686dfd0fb76b49fc624bc1
+  data.tar.gz: eb24fad77153c45ced88544fdc14d62175bfa5e1882c89c139bc9916e70c5041
 SHA512:
-  metadata.gz: 3731f221c5f566f1b530b2c147d9513e2a3be7220184ad7fe40da162d43c74309097e0b39c0c210cfd0216d5dc11cd973b608e24662749db18bf4c0f75f53364
-  data.tar.gz: 447c998bb2eb493b92632973281626a078ecceb0030e6a6ef8260431858693ab80c6ad09cacfc036918960344941f046a40098d76a13b3069bb7c22e71e165e1
+  metadata.gz: 646e350db7c6d8e05afc5709c05c91dd539c9a93237b31ef01a69d7fc1000dfa6cdf092ac200d2ff71b5893d79f50bdf15872340b8df4373463aa76f04265216
+  data.tar.gz: a8f5844ab8ac7f356badd326e5c949a101cb14e8dfb2d19689e1942e23f281c0082f9be5a90e8d603b96f377bb829f035b880b919a09a84e27319bdce9c7f93d

data/lib/sign_in_with_apple_user_migrator/cli.rb

@@ -5,107 +5,133 @@ require_relative '../sign_in_with_apple_user_migrator'
 
 module SignInWithAppleUserMigrator
   class CLI < Thor
+    COMMON_OPTIONS = {
+      client_id: { required: true, desc: 'Client ID' },
+      key_id: { required: true, desc: 'Key ID' },
+      private_key_path: { required: true, desc: 'Private Key Path' },
+      team_id: { required: true, desc: 'Team ID' }
+    }
+
     desc 'generate_user_transfer_ids', 'Generate user transfer IDs'
-    option :client_id, required: true, desc: 'Client ID'
-    option :key_id, required: true, desc: 'Key ID'
-    option :private_key_path, required: true, desc: 'Private Key Path'
-    option :team_id, required: true, desc: 'Team ID'
+    COMMON_OPTIONS.each { |name, opts| option(name, opts) }
     option :transfer_user_id_csv_path, required: true, desc: 'Transfer User ID CSV Path'
     option :target_team_id, required: true, desc: 'Target Team ID'
 
     def generate_user_transfer_ids
-      client_id = options[:client_id]
-      key_id = options[:key_id]
-      private_key_path = options[:private_key_path]
-      team_id = options[:team_id]
+      token_manager = TokenManager.new(**common_options)
       transfer_user_id_csv_path = options[:transfer_user_id_csv_path]
       target_team_id = options[:target_team_id]
 
-      client_secret = SignInWithAppleUserMigrator::ClientSecretGenerator.new(
-        client_id: client_id,
-        key_id: key_id,
-        private_key_path: private_key_path,
-        team_id: team_id,
-      ).generate_client_secret
-
-      access_token = SignInWithAppleUserMigrator::AccessTokenGenerator.new(
-        client_id: client_id,
-        client_secret: client_secret,
-      ).get_access_token
-
-      transfer_id_generator_client = SignInWithAppleUserMigrator::TransferIdGenerator.new(
-        client_id: client_id,
-        client_secret: client_secret,
-        access_token: access_token,
-        target_team_id: target_team_id,
-      )
-
       FileUtils.mkdir_p('tmp')
       result_csv_name = "generated_transfer_ids_#{Time.now.strftime('%Y%m%d%H%M%S')}.csv"
-      result_path = File.join('tmp', result_csv_name)
+      result_csv_path = File.join('tmp', result_csv_name)
       File.write("tmp/#{result_csv_name}", "user_id,transfer_id,error\n")
 
-      CSV.open(result_path, 'w') do |csv|
-        csv << %w[user_id transfer_id error]
+      CSV.open(result_csv_path, 'w') do |result_csv|
+        result_csv << %w[user_id transfer_id error]
 
         CSV.foreach(transfer_user_id_csv_path, headers: true) do |row|
           user_id = row['user_id']
           next if user_id.nil? || user_id.empty?
 
-          transfer_id, error = transfer_id_generator_client.generate_transfer_id(user_id)
-          csv << [user_id, transfer_id, error]
+          client_secret, access_token = token_manager.ensure_valid_token
+          generator = TransferIdGenerator.new(
+            client_id: options[:client_id],
+            client_secret: client_secret,
+            access_token: access_token,
+            target_team_id: target_team_id
+          )
+
+          transfer_id, error = generator.generate_transfer_id(user_id)
+          result_csv << [user_id, transfer_id, error]
         end
       end
+
     end
 
     desc 'migrate_user_transfer_ids', 'Migrate user transfer IDs'
-    option :client_id, required: true, desc: 'Client ID'
-    option :key_id, required: true, desc: 'Key ID'
-    option :private_key_path, required: true, desc: 'Private Key Path'
-    option :team_id, required: true, desc: 'Team ID'
+    COMMON_OPTIONS.each { |name, opts| option(name, opts) }
     option :transfer_id_csv_path, required: true, desc: 'Transfer ID CSV Path'
 
     def migrate_user_transfer_ids
-      client_id = options[:client_id]
-      key_id = options[:key_id]
-      private_key_path = options[:private_key_path]
-      team_id = options[:team_id]
+      token_manager = TokenManager.new(**common_options)
       transfer_id_csv_path = options[:transfer_id_csv_path]
 
-      client_secret = SignInWithAppleUserMigrator::ClientSecretGenerator.new(
-        client_id: client_id,
-        key_id: key_id,
-        private_key_path: private_key_path,
-        team_id: team_id,
-      ).generate_client_secret
-
-      access_token = SignInWithAppleUserMigrator::AccessTokenGenerator.new(
-        client_id: client_id,
-        client_secret: client_secret,
-      ).get_access_token
-
-      transfer_id_exchanger_client = SignInWithAppleUserMigrator::TransferIdExchanger.new(
-        client_id: client_id,
-        client_secret: client_secret,
-        access_token: access_token,
-      )
-
       FileUtils.mkdir_p('tmp')
       result_csv_name = "exchanged_transfer_ids_#{Time.now.strftime('%Y%m%d%H%M%S')}.csv"
-      result_path = File.join('tmp', result_csv_name)
+      result_csv_path = File.join('tmp', result_csv_name)
       File.write("tmp/#{result_csv_name}", "transfer_id,sub,error\n")
 
-      CSV.open(result_path, 'w') do |csv|
-        csv << %w[transfer_id sub email is_private_email error]
+      CSV.open(result_csv_path, 'w') do |result_csv|
+        result_csv << %w[transfer_id sub email is_private_email error]
 
         CSV.foreach(transfer_id_csv_path, headers: true) do |row|
           transfer_id = row['transfer_id']
           next if transfer_id.nil? || transfer_id.empty?
 
-          transfer_id, sub, email, is_private_email, error = transfer_id_exchanger_client.migrate(transfer_id)
-          csv << [transfer_id, sub, email, is_private_email, error]
+          client_secret, access_token = token_manager.ensure_valid_token
+          exchanger = TransferIdExchanger.new(
+            client_id: options[:client_id],
+            client_secret: client_secret,
+            access_token: access_token
+          )
+
+          transfer_id, sub, email, is_private_email, error = exchanger.migrate(transfer_id)
+          result_csv << [transfer_id, sub, email, is_private_email, error]
         end
       end
     end
+
+    private
+      def common_options
+        COMMON_OPTIONS.keys.each_with_object({}) do |key, hash|
+          hash[key] = options[key]
+        end
+      end
+  end
+
+  class TokenManager
+    TOKEN_DURATION = 3600
+    TOKEN_REFRESH_THRESHOLD = 300
+
+    def initialize(client_id:, key_id:, private_key_path:, team_id:)
+      @client_id = client_id
+      @key_id = key_id
+      @private_key_path = private_key_path
+      @team_id = team_id
+      @token_generated_at = nil
+      @client_secret = nil
+      @access_token = nil
+    end
+
+    def ensure_valid_token
+      return [@client_secret, @access_token] if valid_token?
+
+      @token_generated_at = Time.now
+      @client_secret = generate_client_secret
+      @access_token = generate_access_token
+      [@client_secret, @access_token]
+    end
+
+    private
+      def valid_token?
+        !@token_generated_at.nil? && (Time.now - @token_generated_at) <= (TOKEN_DURATION - TOKEN_REFRESH_THRESHOLD)
+      end
+
+      def generate_client_secret
+        SignInWithAppleUserMigrator::ClientSecretGenerator.new(
+          client_id: @client_id,
+          key_id: @key_id,
+          private_key_path: @private_key_path,
+          team_id: @team_id
+        ).generate_client_secret(iat: @token_generated_at.to_i, exp: @token_generated_at.to_i + TOKEN_DURATION)
+      end
+
+      def generate_access_token
+        SignInWithAppleUserMigrator::AccessTokenGenerator.new(
+          client_id: @client_id,
+          client_secret: @client_secret
+        ).get_access_token
+      end
   end
 end

data/lib/sign_in_with_apple_user_migrator/version.rb

@@ -1,3 +1,3 @@
 module SignInWithAppleUserMigrator
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sign_in_with_apple_user_migrator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - sakurahigashi2
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,7 +102,7 @@ licenses:
 - MIT
 metadata:
   documentation_uri: https://github.com/sakurahigashi2/sign_in_with_apple_user_migrator
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.25
+signing_key: 
 specification_version: 4
 summary: Apple Sign In User Migration Tool
 test_files: []