Merge branch 'develop' into standalone_develop

2022-03-31 13:04:02 +08:00 · 2022-03-31 13:04:02 +08:00 · 7fd41e13e4
parent b25db9d37f 9ced678f91
commit 7fd41e13e4
1 changed files with 8 additions and 6 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -796,14 +796,16 @@ class User < Owner
        trace_user.refresh_token
        trace_user.save
      end
+      return trace_user.token
    else
-      trace_user = TraceUser.new
-      trace_user.build_self_data
-      trace_user.build_token 
-      trace_user.save
-    end
+      tu = TraceUser.new
+      tu.user = self
+      tu.build_self_data
+      tu.build_token 
+      tu.save

-    trace_user.token
+      return tu.token
+    end
  end

  protected