From 735687be21b08a11bf167663b9336a56eeb05313 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Mon, 8 Apr 2019 20:29:52 +0900
Subject: [PATCH] update token generation

---
 src/models/entities/user.ts                         | 4 ++--
 src/server/api/common/generate-native-user-token.ts | 2 +-
 src/server/api/common/is-native-token.ts            | 2 +-
 src/server/api/endpoints/auth/accept.ts             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/models/entities/user.ts b/src/models/entities/user.ts
index 1ef98cadc2..0a2878c0c9 100644
--- a/src/models/entities/user.ts
+++ b/src/models/entities/user.ts
@@ -255,8 +255,8 @@ export class User {
 	public password: string | null;
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 32, nullable: true, unique: true,
+	@Column('char', {
+		length: 16, nullable: true, unique: true,
 		comment: 'The native access token of the User. It will be null if the origin of the user is local.'
 	})
 	public token: string | null;
diff --git a/src/server/api/common/generate-native-user-token.ts b/src/server/api/common/generate-native-user-token.ts
index 92f8a3a0e8..9d44885630 100644
--- a/src/server/api/common/generate-native-user-token.ts
+++ b/src/server/api/common/generate-native-user-token.ts
@@ -1,3 +1,3 @@
 import rndstr from 'rndstr';
 
-export default () => `!${rndstr('a-zA-Z0-9', 31)}`;
+export default () => `0${rndstr('a-zA-Z0-9', 15)}`;
diff --git a/src/server/api/common/is-native-token.ts b/src/server/api/common/is-native-token.ts
index 6afbc99ab5..22af84aad2 100644
--- a/src/server/api/common/is-native-token.ts
+++ b/src/server/api/common/is-native-token.ts
@@ -1 +1 @@
-export default (token: string) => token.startsWith('!');
+export default (token: string) => token.startsWith('0');
diff --git a/src/server/api/endpoints/auth/accept.ts b/src/server/api/endpoints/auth/accept.ts
index 21a78011dc..0baa6b111c 100644
--- a/src/server/api/endpoints/auth/accept.ts
+++ b/src/server/api/endpoints/auth/accept.ts
@@ -38,7 +38,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Generate access token
-	const accessToken = rndstr('a-zA-Z0-9', 32);
+	const accessToken = '1' + rndstr('a-zA-Z0-9', 15);
 
 	// Fetch exist access token
 	const exist = await AccessTokens.findOne({