Browse Source

refactoring

pull/23416/head
erdemcaygor 1 year ago
parent
commit
f9102a2971
  1. 2
      npm/ng-packs/apps/dev-app/src/app/app.config.server.ts
  2. 2
      npm/ng-packs/apps/dev-app/src/app/app.config.ts
  3. 19
      npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts
  4. 2
      npm/ng-packs/packages/oauth/src/lib/oauth.module.ts
  5. 2
      npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts
  6. 2
      templates/app-nolayers/angular/src/app/app.config.server.ts
  7. 2
      templates/app-nolayers/angular/src/app/app.config.ts
  8. 6
      templates/app/angular/package.json
  9. 2
      templates/app/angular/src/app/app.config.server.ts
  10. 2
      templates/app/angular/src/app/app.config.ts
  11. 1
      templates/app/angular/tsconfig.json

2
npm/ng-packs/apps/dev-app/src/app/app.config.server.ts

@ -5,7 +5,7 @@ import { withRoutes, provideServerRendering } from '@angular/ssr';
import { appServerRoutes } from './app.routes.server'; import { appServerRoutes } from './app.routes.server';
const serverConfig: ApplicationConfig = { const serverConfig: ApplicationConfig = {
providers: [provideAbpOAuth({ ssr: true }), provideServerRendering(withRoutes(appServerRoutes))], providers: [provideAbpOAuth(), provideServerRendering(withRoutes(appServerRoutes))],
}; };
export const config = mergeApplicationConfig(appConfig, serverConfig); export const config = mergeApplicationConfig(appConfig, serverConfig);

2
npm/ng-packs/apps/dev-app/src/app/app.config.ts

@ -33,7 +33,7 @@ export const appConfig: ApplicationConfig = {
skipGetAppConfiguration: false, skipGetAppConfiguration: false,
}), }),
), ),
provideAbpOAuth({ ssr: false }), provideAbpOAuth(),
provideAbpThemeShared(), provideAbpThemeShared(),
provideSettingManagementConfig(), provideSettingManagementConfig(),
provideAccountConfig(), provideAccountConfig(),

19
npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts

@ -1,44 +1,43 @@
import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; import { inject, Injectable, PLATFORM_ID } from '@angular/core';
import { isPlatformBrowser } from '@angular/common'; import { isPlatformBrowser } from '@angular/common';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
}) })
export class AbpLocalStorageService implements Storage { export class AbpLocalStorageService implements Storage {
private isBrowser: boolean; private platformId = inject(PLATFORM_ID);
constructor(@Inject(PLATFORM_ID) private platformId: unknown) { constructor() {
this.isBrowser = isPlatformBrowser(this.platformId);
} }
[name: string]: any; [name: string]: any;
get length(): number { get length(): number {
return this.isBrowser ? localStorage.length : 0; return isPlatformBrowser(this.platformId) ? localStorage.length : 0;
} }
clear(): void { clear(): void {
if (this.isBrowser) { if (isPlatformBrowser(this.platformId)) {
localStorage.clear(); localStorage.clear();
} }
} }
getItem(key: string): string | null { getItem(key: string): string | null {
if (!this.isBrowser) { if (!isPlatformBrowser(this.platformId)) {
return null; return null;
} }
return localStorage.getItem(key); return localStorage.getItem(key);
} }
key(index: number): string | null { key(index: number): string | null {
if (!this.isBrowser) { if (!isPlatformBrowser(this.platformId)) {
return null; return null;
} }
return localStorage.key(index); return localStorage.key(index);
} }
removeItem(key: string): void { removeItem(key: string): void {
if (this.isBrowser) { if (isPlatformBrowser(this.platformId)) {
localStorage.removeItem(key); localStorage.removeItem(key);
} }
} }
setItem(key: string, value: string): void { setItem(key: string, value: string): void {
if (this.isBrowser) { if (isPlatformBrowser(this.platformId)) {
localStorage.setItem(key, value); localStorage.setItem(key, value);
} }
} }

2
npm/ng-packs/packages/oauth/src/lib/oauth.module.ts

@ -9,7 +9,7 @@ export class AbpOAuthModule {
static forRoot(): ModuleWithProviders<AbpOAuthModule> { static forRoot(): ModuleWithProviders<AbpOAuthModule> {
return { return {
ngModule: AbpOAuthModule, ngModule: AbpOAuthModule,
providers: [provideAbpOAuth({ ssr: false })], providers: [provideAbpOAuth()],
}; };
} }
} }

2
npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts

@ -19,7 +19,7 @@ import { pipeToLogin, checkAccessToken, oAuthStorageFactory } from '../utils';
import { NavigateToManageProfileProvider } from './navigate-to-manage-profile.provider'; import { NavigateToManageProfileProvider } from './navigate-to-manage-profile.provider';
import { ServerTokenStorageService } from '../services/server-token-storage.service'; import { ServerTokenStorageService } from '../services/server-token-storage.service';
export function provideAbpOAuth({ ssr = false }: { ssr?: boolean }) { export function provideAbpOAuth() {
const providers = [ const providers = [
{ {
provide: AuthService, provide: AuthService,

2
templates/app-nolayers/angular/src/app/app.config.server.ts

@ -6,7 +6,7 @@ import {serverRoutes} from "./app.routes.server";
const serverConfig: ApplicationConfig = { const serverConfig: ApplicationConfig = {
providers: [ providers: [
provideAbpOAuth({ ssr: true }), provideAbpOAuth(),
provideServerRendering(withRoutes(serverRoutes)) provideServerRendering(withRoutes(serverRoutes))
] ]
}; };

2
templates/app-nolayers/angular/src/app/app.config.ts

@ -28,7 +28,7 @@ export const appConfig: ApplicationConfig = {
registerLocaleFn: registerLocale(), registerLocaleFn: registerLocale(),
}) })
), ),
provideAbpOAuth({ ssr: false }), provideAbpOAuth(),
provideAbpThemeShared(), provideAbpThemeShared(),
provideSettingManagementConfig(), provideSettingManagementConfig(),
provideAccountConfig(), provideAccountConfig(),

6
templates/app/angular/package.json

@ -8,11 +8,7 @@
"build:prod": "ng build --configuration production", "build:prod": "ng build --configuration production",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint"
"dev:ssr": "ng run MyProjectName:serve-ssr",
"serve:ssr": "node dist/MyProjectName/server/main.js",
"build:ssr": "ng build && ng run MyProjectName:server",
"prerender": "ng run MyProjectName:prerender"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {

2
templates/app/angular/src/app/app.config.server.ts

@ -6,7 +6,7 @@ import {serverRoutes} from "./app.routes.server";
const serverConfig: ApplicationConfig = { const serverConfig: ApplicationConfig = {
providers: [ providers: [
provideAbpOAuth({ ssr: true }), provideAbpOAuth(),
provideServerRendering(withRoutes(serverRoutes)) provideServerRendering(withRoutes(serverRoutes))
] ]
}; };

2
templates/app/angular/src/app/app.config.ts

@ -30,7 +30,7 @@ export const appConfig: ApplicationConfig = {
registerLocaleFn: registerLocale(), registerLocaleFn: registerLocale(),
}) })
), ),
provideAbpOAuth({ssr: false}), provideAbpOAuth(),
provideAbpThemeShared(), provideAbpThemeShared(),
provideSettingManagementConfig(), provideSettingManagementConfig(),
provideAccountConfig(), provideAccountConfig(),

1
templates/app/angular/tsconfig.json

@ -6,7 +6,6 @@
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"moduleResolution": "bundler", "moduleResolution": "bundler",
"importHelpers": true, "importHelpers": true,

Loading…
Cancel
Save