Skip to content

Commit 0b517a6

Browse files
jevantangjevantang
committed
refactor: cookie prefix
1 parent 8627239 commit 0b517a6

File tree

7 files changed

+42
-89
lines changed

7 files changed

+42
-89
lines changed

‎app/Auth/AccountGuard.php‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace Fresns\WebsiteEngine\Auth;
1010

1111
use App\Helpers\CacheHelper;
12-
use App\Helpers\ConfigHelper;
1312
use App\Models\File;
1413
use Fresns\WebsiteEngine\Helpers\ApiHelper;
1514
use Fresns\WebsiteEngine\Helpers\DataHelper;
@@ -124,10 +123,8 @@ public function get(?string $key = null): mixed
124123
return $key ? Arr::get($this->account, $key) : $this->account;
125124
}
126125

127-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
128-
129-
$aid = Cookie::get("{$cookiePrefix}aid");
130-
$token = Cookie::get("{$cookiePrefix}aid_token");
126+
$aid = Cookie::get('fresns_aid');
127+
$token = Cookie::get('fresns_aid_token');
131128

132129
if ($aid && $token) {
133130
try {
@@ -172,12 +169,10 @@ public function logout(): void
172169
{
173170
DataHelper::cacheForgetAccountAndUser();
174171

175-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
176-
177-
Cookie::queue(Cookie::forget("{$cookiePrefix}aid"));
178-
Cookie::queue(Cookie::forget("{$cookiePrefix}aid_token"));
179-
Cookie::queue(Cookie::forget("{$cookiePrefix}uid"));
180-
Cookie::queue(Cookie::forget("{$cookiePrefix}uid_token"));
172+
Cookie::queue(Cookie::forget('fresns_aid'));
173+
Cookie::queue(Cookie::forget('fresns_aid_token'));
174+
Cookie::queue(Cookie::forget('fresns_uid'));
175+
Cookie::queue(Cookie::forget('fresns_uid_token'));
181176

182177
$this->account = null;
183178
$this->loggedOut = true;

‎app/Auth/UserGuard.php‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
namespace Fresns\WebsiteEngine\Auth;
1010

1111
use App\Helpers\CacheHelper;
12-
use App\Helpers\ConfigHelper;
1312
use App\Models\File;
1413
use Fresns\WebsiteEngine\Helpers\ApiHelper;
1514
use Fresns\WebsiteEngine\Helpers\DataHelper;
@@ -123,10 +122,8 @@ public function get(?string $key = null): mixed
123122
return $key ? Arr::get($this->user, $key) : $this->user;
124123
}
125124

126-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
127-
128-
$uid = Cookie::get("{$cookiePrefix}uid");
129-
$token = Cookie::get("{$cookiePrefix}uid_token");
125+
$uid = Cookie::get('fresns_uid');
126+
$token = Cookie::get('fresns_uid_token');
130127

131128
if ($uid && $token) {
132129
try {
@@ -168,10 +165,8 @@ public function logout(): void
168165
{
169166
DataHelper::cacheForgetAccountAndUser();
170167

171-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
172-
173-
Cookie::queue(Cookie::forget("{$cookiePrefix}uid"));
174-
Cookie::queue(Cookie::forget("{$cookiePrefix}uid_token"));
168+
Cookie::queue(Cookie::forget('fresns_uid'));
169+
Cookie::queue(Cookie::forget('fresns_uid_token'));
175170

176171
$this->user = null;
177172
$this->loggedOut = true;

‎app/Helpers/ApiHelper.php‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,19 @@ public static function getHeaders()
179179
CacheHelper::put($keyConfig, $cacheKey, $cacheTags);
180180
}
181181

182-
// cookie key name
183-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
184-
185-
$cookieNameLangTag = "{$cookiePrefix}lang_tag";
186-
187-
$cookieNameAid = "{$cookiePrefix}aid";
188-
$cookieNameAidToken = "{$cookiePrefix}aid_token";
189-
$cookieNameUid = "{$cookiePrefix}uid";
190-
$cookieNameUidToken = "{$cookiePrefix}uid_token";
191-
192182
// headers
193183
$headers = [
194184
'X-Fresns-App-Id' => $keyConfig['appId'],
195185
'X-Fresns-Client-Platform-Id' => $keyConfig['platformId'],
196186
'X-Fresns-Client-Version' => fs_theme('version'),
197187
'X-Fresns-Client-Device-Info' => base64_encode(json_encode(AppHelper::getDeviceInfo())),
198188
'X-Fresns-Client-Timezone' => Cookie::get('fresns_timezone'),
199-
'X-Fresns-Client-Lang-Tag' => request()->ajax() ? Cookie::get($cookieNameLangTag) : fs_theme('lang'),
189+
'X-Fresns-Client-Lang-Tag' => request()->ajax() ? Cookie::get('fresns_lang_tag') : fs_theme('lang'),
200190
'X-Fresns-Client-Content-Format' => null,
201-
'X-Fresns-Aid' => Cookie::get($cookieNameAid),
202-
'X-Fresns-Aid-Token' => Cookie::get($cookieNameAidToken),
203-
'X-Fresns-Uid' => Cookie::get($cookieNameUid),
204-
'X-Fresns-Uid-Token' => Cookie::get($cookieNameUidToken),
191+
'X-Fresns-Aid' => Cookie::get('fresns_aid'),
192+
'X-Fresns-Aid-Token' => Cookie::get('fresns_aid_token'),
193+
'X-Fresns-Uid' => Cookie::get('fresns_uid'),
194+
'X-Fresns-Uid-Token' => Cookie::get('fresns_uid_token'),
205195
'X-Fresns-Signature' => null,
206196
'X-Fresns-Signature-Timestamp' => time(),
207197
];

‎app/Helpers/DataHelper.php‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ class DataHelper
2121
// account and user login
2222
public static function accountAndUserCookie(array $authToken): void
2323
{
24-
// cookie key name
25-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
26-
27-
$cookieNameAid = "{$cookiePrefix}aid";
28-
$cookieNameAidToken = "{$cookiePrefix}aid_token";
29-
$cookieNameUid = "{$cookiePrefix}uid";
30-
$cookieNameUidToken = "{$cookiePrefix}uid_token";
31-
3224
$aid = $authToken['aid'];
3325
$aidToken = $authToken['aidToken'];
3426
$uid = $authToken['uid'];
@@ -38,20 +30,20 @@ public static function accountAndUserCookie(array $authToken): void
3830
DataHelper::cacheForgetAccountAndUser($aid, $uid);
3931

4032
if (empty($expiredHours)) {
41-
Cookie::queue(Cookie::forever($cookieNameAid, $aid, '/'));
42-
Cookie::queue(Cookie::forever($cookieNameAidToken, $aidToken, '/'));
43-
Cookie::queue(Cookie::forever($cookieNameUid, $uid, '/'));
44-
Cookie::queue(Cookie::forever($cookieNameUidToken, $uidToken, '/'));
33+
Cookie::queue(Cookie::forever('fresns_aid', $aid, '/'));
34+
Cookie::queue(Cookie::forever('fresns_aid_token', $aidToken, '/'));
35+
Cookie::queue(Cookie::forever('fresns_uid', $uid, '/'));
36+
Cookie::queue(Cookie::forever('fresns_uid_token', $uidToken, '/'));
4537

4638
return;
4739
}
4840

4941
$cookieMinutes = $expiredHours * 60;
5042

51-
Cookie::queue($cookieNameAid, $aid, $cookieMinutes);
52-
Cookie::queue($cookieNameAidToken, $aidToken, $cookieMinutes);
53-
Cookie::queue($cookieNameUid, $uid, $cookieMinutes);
54-
Cookie::queue($cookieNameUidToken, $uidToken, $cookieMinutes);
43+
Cookie::queue('fresns_aid', $aid, $cookieMinutes);
44+
Cookie::queue('fresns_aid_token', $aidToken, $cookieMinutes);
45+
Cookie::queue('fresns_uid', $uid, $cookieMinutes);
46+
Cookie::queue('fresns_uid_token', $uidToken, $cookieMinutes);
5547
}
5648

5749
// get api data
@@ -292,10 +284,8 @@ public static function getFresnsStickyComments(string $pid): array
292284
// cache forget account and user
293285
public static function cacheForgetAccountAndUser(?string $aid = null, ?int $uid = null)
294286
{
295-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
296-
297-
$currentAid = $aid ?: Cookie::get("{$cookiePrefix}aid");
298-
$currentUid = $uid ?: Cookie::get("{$cookiePrefix}uid");
287+
$currentAid = $aid ?: Cookie::get('fresns_aid');
288+
$currentUid = $uid ?: Cookie::get('fresns_uid');
299289

300290
CacheHelper::forgetFresnsMultilingual("fresns_web_account_{$currentAid}", 'fresnsWeb');
301291
CacheHelper::forgetFresnsMultilingual("fresns_web_user_{$currentUid}", 'fresnsWeb');

‎app/Http/Middleware/AccountAuthorize.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Fresns\WebsiteEngine\Http\Middleware;
1010

11-
use App\Helpers\ConfigHelper;
1211
use App\Utilities\ConfigUtility;
1312
use Closure;
1413
use Illuminate\Http\Request;
@@ -22,10 +21,7 @@ public function handle(Request $request, Closure $next)
2221
if (fs_account()->check()) {
2322
return $next($request);
2423
} else {
25-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
26-
$langTag = "{$cookiePrefix}lang_tag";
27-
28-
$accountLoginTip = ConfigUtility::getCodeMessage(31501, 'Fresns', \request()->cookie($langTag));
24+
$accountLoginTip = ConfigUtility::getCodeMessage(31501, 'Fresns', \request()->cookie('fresns_lang_tag'));
2925

3026
return $this->shouldLoginRender($accountLoginTip);
3127
}

‎app/Http/Middleware/UserAuthorize.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace Fresns\WebsiteEngine\Http\Middleware;
1010

11-
use App\Helpers\ConfigHelper;
1211
use App\Utilities\ConfigUtility;
1312
use Closure;
1413
use Illuminate\Http\Request;
@@ -21,10 +20,7 @@ public function handle(Request $request, Closure $next)
2120
if (fs_user()->check()) {
2221
return $next($request);
2322
} else {
24-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
25-
$langTag = "{$cookiePrefix}lang_tag";
26-
27-
$userLoginTip = ConfigUtility::getCodeMessage(31601, 'Fresns', \request()->cookie($langTag));
23+
$userLoginTip = ConfigUtility::getCodeMessage(31601, 'Fresns', \request()->cookie('fresns_lang_tag'));
2824

2925
$redirectURL = url()->current();
3026

‎app/Http/Middleware/WebConfiguration.php‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,23 +110,22 @@ public function checkLangTag(Request $request)
110110
return $defaultLangTag;
111111
}
112112

113-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
114113
$supportedLanguages = ConfigHelper::fresnsConfigLangTags();
115114

116115
// switch language
117116
$switchLang = $request->language;
118117

119118
if ($switchLang && in_array($switchLang, $supportedLanguages)) {
120-
$this->setLangTag($switchLang, $cookiePrefix);
119+
$this->setLangTag($switchLang);
121120

122121
return $switchLang;
123122
}
124123

125124
// cookie locale
126-
$cookieLangTag = Cookie::get("{$cookiePrefix}lang_tag");
125+
$cookieLangTag = Cookie::get('fresns_lang_tag');
127126

128127
if ($cookieLangTag) {
129-
App::setLocale($cookieLangTag, $cookiePrefix);
128+
App::setLocale($cookieLangTag);
130129

131130
return $cookieLangTag;
132131
}
@@ -144,14 +143,14 @@ public function checkLangTag(Request $request)
144143
}
145144

146145
if (! $firstLang) {
147-
$this->setLangTag($defaultLangTag, $cookiePrefix);
146+
$this->setLangTag($defaultLangTag);
148147

149148
return $defaultLangTag;
150149
}
151150

152151
// The language tag are identical
153152
if (in_array($firstLang, $supportedLanguages)) {
154-
$this->setLangTag($firstLang, $cookiePrefix);
153+
$this->setLangTag($firstLang);
155154

156155
return $firstLang;
157156
}
@@ -164,7 +163,7 @@ public function checkLangTag(Request $request)
164163
$newFirstLang = Str::replace('zh-HK', 'zh-Hant', $newFirstLang);
165164

166165
if (in_array($newFirstLang, $supportedLanguages)) {
167-
$this->setLangTag($newFirstLang, $cookiePrefix);
166+
$this->setLangTag($newFirstLang);
168167

169168
return $newFirstLang;
170169
}
@@ -179,7 +178,7 @@ public function checkLangTag(Request $request)
179178

180179
if ($allIntersect) {
181180
$zhLocale = reset($allIntersect);
182-
$this->setLangTag($zhLocale, $cookiePrefix);
181+
$this->setLangTag($zhLocale);
183182

184183
return $zhLocale;
185184
}
@@ -188,23 +187,23 @@ public function checkLangTag(Request $request)
188187
// Not identical, matches the start of the string
189188
foreach ($supportedLanguages as $supportedLangTag) {
190189
if (Str::startsWith($supportedLangTag, $substrLang)) {
191-
$this->setLangTag($supportedLangTag, $cookiePrefix);
190+
$this->setLangTag($supportedLangTag);
192191

193192
return $supportedLangTag;
194193
}
195194
}
196195

197196
// default locale
198-
$this->setLangTag($defaultLangTag, $cookiePrefix);
197+
$this->setLangTag($defaultLangTag);
199198

200199
return $defaultLangTag;
201200
}
202201

203-
public function setLangTag(string $langTag, string $cookiePrefix)
202+
public function setLangTag(string $langTag)
204203
{
205204
App::setLocale($langTag);
206205

207-
Cookie::queue(Cookie::forever("{$cookiePrefix}lang_tag", $langTag, '/', null, false, false));
206+
Cookie::queue(Cookie::forever('fresns_lang_tag', $langTag, '/', null, false, false));
208207
}
209208

210209
public function setHeaders(Request $request, string $langTag)
@@ -219,14 +218,6 @@ public function setHeaders(Request $request, string $langTag)
219218
], 403);
220219
}
221220

222-
// cookie key name
223-
$cookiePrefix = ConfigHelper::fresnsConfigByItemKey('website_cookie_prefix') ?? 'fresns_';
224-
225-
$cookieNameAid = "{$cookiePrefix}aid";
226-
$cookieNameAidToken = "{$cookiePrefix}aid_token";
227-
$cookieNameUid = "{$cookiePrefix}uid";
228-
$cookieNameUidToken = "{$cookiePrefix}uid_token";
229-
230221
$headers = [
231222
'X-Fresns-App-Id' => $keyInfo->app_id,
232223
'X-Fresns-Client-Platform-Id' => $keyInfo->platform_id,
@@ -235,10 +226,10 @@ public function setHeaders(Request $request, string $langTag)
235226
'X-Fresns-Client-Timezone' => Cookie::get('fresns_timezone'),
236227
'X-Fresns-Client-Lang-Tag' => $langTag,
237228
'X-Fresns-Client-Content-Format' => null,
238-
'X-Fresns-Aid' => Cookie::get($cookieNameAid),
239-
'X-Fresns-Aid-Token' => Cookie::get($cookieNameAidToken),
240-
'X-Fresns-Uid' => Cookie::get($cookieNameUid),
241-
'X-Fresns-Uid-Token' => Cookie::get($cookieNameUidToken),
229+
'X-Fresns-Aid' => Cookie::get('fresns_aid'),
230+
'X-Fresns-Aid-Token' => Cookie::get('fresns_aid_token'),
231+
'X-Fresns-Uid' => Cookie::get('fresns_uid'),
232+
'X-Fresns-Uid-Token' => Cookie::get('fresns_uid_token'),
242233
'X-Fresns-Signature' => null,
243234
'X-Fresns-Signature-Timestamp' => time(),
244235
];

0 commit comments

Comments
 (0)