Skip to content

Commit f68e2f6

Browse files
committed
fix Typo in ENV var
1 parent a40ee74 commit f68e2f6

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

server/.env.template

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ KUBERO_AUDIT_LIMIT=1000
7171
#GITHUB_CLIENT_CALLBACKURL=http://kubero.lacolhost.com/api/auth/github/callback
7272
#GITHUB_CLIENT_ORG=
7373

74-
#OAUTO2_CLIENT_NAME=Gitea
75-
#OAUTO2_CLIENT_AUTH_URL=http://gitea.lacolhost.com:3000/login/oauth/authorize
76-
#OAUTO2_CLIENT_TOKEN_URL=http://gitea.lacolhost.com:3000/login/oauth/access_token
74+
#OAUTH2_CLIENT_NAME=Gitea
75+
#OAUTH2_CLIENT_AUTH_URL=http://gitea.lacolhost.com:3000/login/oauth/authorize
76+
#OAUTH2_CLIENT_TOKEN_URL=http://gitea.lacolhost.com:3000/login/oauth/access_token
7777
#OAUTH2_CLIENT_ID=
7878
#OAUTH2_CLIENT_SECRET=
7979
#OAUTH2_CLIENT_CALLBACKURL=http://kubero.lacolhost.com/api/auth/oauth2/callback

server/src/auth/strategies/oauth2.strategy.spec.ignore.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ describe('Oauth2Strategy', () => {
3939
});
4040

4141
it('should call super with correct options when all env vars are set', () => {
42-
process.env.OAUTO2_CLIENT_AUTH_URL = 'https://auth.example.com';
43-
process.env.OAUTO2_CLIENT_TOKEN_URL = 'https://token.example.com';
42+
process.env.OAUTH2_CLIENT_AUTH_URL = 'https://auth.example.com';
43+
process.env.OAUTH2_CLIENT_TOKEN_URL = 'https://token.example.com';
4444
process.env.OAUTH2_CLIENT_ID = 'clientid';
4545
process.env.OAUTH2_CLIENT_SECRET = 'secret';
4646
process.env.OAUTH2_CLIENT_CALLBACKURL = 'https://callback.example.com';
@@ -63,7 +63,7 @@ describe('Oauth2Strategy', () => {
6363

6464
it('should log error and not call super if env vars are missing', () => {
6565
const LoggerMock = require('@nestjs/common').Logger;
66-
process.env.OAUTO2_CLIENT_AUTH_URL = '';
66+
process.env.OAUTH2_CLIENT_AUTH_URL = '';
6767
const loggerInstance = new LoggerMock(Oauth2Strategy.name);
6868
const errorSpy = jest.spyOn(loggerInstance, 'error');
6969
new Oauth2Strategy();

server/src/auth/strategies/oauth2.strategy.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ export class Oauth2Strategy extends PassportStrategy(Strategy) {
1212
constructor() {
1313
const logger = new Logger(Oauth2Strategy.name);
1414

15-
if (!process.env.OAUTO2_CLIENT_AUTH_URL) {
15+
if (!process.env.OAUTH2_CLIENT_AUTH_URL) {
1616
logger.error(
17-
'OAUTO2_CLIENT_AUTH_URL is not defined in the environment variables',
17+
'OAUTH2_CLIENT_AUTH_URL is not defined in the environment variables',
1818
);
1919
return;
2020
}
21-
if (!process.env.OAUTO2_CLIENT_TOKEN_URL) {
21+
if (!process.env.OAUTH2_CLIENT_TOKEN_URL) {
2222
logger.error(
23-
'OAUTO2_CLIENT_TOKEN_URL is not defined in the environment variables',
23+
'OAUTH2_CLIENT_TOKEN_URL is not defined in the environment variables',
2424
);
2525
return;
2626
}
@@ -44,8 +44,8 @@ export class Oauth2Strategy extends PassportStrategy(Strategy) {
4444
}
4545

4646
super({
47-
authorizationURL: process.env.OAUTO2_CLIENT_AUTH_URL,
48-
tokenURL: process.env.OAUTO2_CLIENT_TOKEN_URL,
47+
authorizationURL: process.env.OAUTH2_CLIENT_AUTH_URL,
48+
tokenURL: process.env.OAUTH2_CLIENT_TOKEN_URL,
4949
clientID: process.env.OAUTH2_CLIENT_ID,
5050
clientSecret: process.env.OAUTH2_CLIENT_SECRET,
5151
callbackURL: process.env.OAUTH2_CLIENT_CALLBACKURL,

server/src/config/config.service.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,14 @@ describe('ConfigService', () => {
304304
});
305305

306306
it('should getOauth2Enabled', () => {
307-
process.env.OAUTO2_CLIENT_AUTH_URL = 'auth';
308-
process.env.OAUTO2_CLIENT_TOKEN_URL = 'token';
307+
process.env.OAUTH2_CLIENT_AUTH_URL = 'auth';
308+
process.env.OAUTH2_CLIENT_TOKEN_URL = 'token';
309309
process.env.OAUTH2_CLIENT_ID = 'id';
310310
process.env.OAUTH2_CLIENT_SECRET = 'secret';
311311
process.env.OAUTH2_CLIENT_CALLBACKURL = 'cb';
312312
expect(ConfigService.getOauth2Enabled()).toBe(true);
313-
delete process.env.OAUTO2_CLIENT_AUTH_URL;
314-
delete process.env.OAUTO2_CLIENT_TOKEN_URL;
313+
delete process.env.OAUTH2_CLIENT_AUTH_URL;
314+
delete process.env.OAUTH2_CLIENT_TOKEN_URL;
315315
delete process.env.OAUTH2_CLIENT_ID;
316316
delete process.env.OAUTH2_CLIENT_SECRET;
317317
delete process.env.OAUTH2_CLIENT_CALLBACKURL;

server/src/config/config.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ export class ConfigService {
505505

506506
public static getOauth2Enabled(): boolean {
507507
let enabled = false;
508-
process.env.OAUTO2_CLIENT_AUTH_URL == undefined ||
509-
process.env.OAUTO2_CLIENT_TOKEN_URL == undefined ||
508+
process.env.OAUTH2_CLIENT_AUTH_URL == undefined ||
509+
process.env.OAUTH2_CLIENT_TOKEN_URL == undefined ||
510510
process.env.OAUTH2_CLIENT_ID == undefined ||
511511
process.env.OAUTH2_CLIENT_SECRET == undefined ||
512512
process.env.OAUTH2_CLIENT_CALLBACKURL == undefined

0 commit comments

Comments
 (0)