cidaas-javascript-sdk 4.2.0 → 4.2.2

package/CHANGELOG.md

@@ -1,12 +1,38 @@
-# [4.2.0](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/compare/v4.1.0...v4.2.0) (2024-03-14)
+## [4.2.2](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/compare/v4.2.1...v4.2.2) (2024-04-08)
 
 
-### Features
+### Bug Fixes
 
-* add get missing fields from social provider ([fde6303](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/commit/fde630370b0869f836363441b261effa5b2a810f))
+* Fix compatibility with es2016 ([6025bbf](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/commit/6025bbf0e81f1b42308c44d59bd62d05f4bd0556))
+* Fix popup sign out callback not falling back post_logout_redirect_uri ([01cd31f](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/commit/01cd31f01c04220ede7c3e2f414d975e7a95cc67))
+* Fix unable to import authentication module models ([565e0c4](https://gitlab.widas.de/cidaas-public-devkits/cidaas-public-sdks/cidaas-javascript-sdk/commit/565e0c4721834ed53037d2ca8efa616389945da7))
 
 # Changelog
 
+## V4.2.2
+
+### Fixed
+- Fix build failing on es2016 and above versions
+
+## V4.2.1
+
+### Added
+- Add authentication type
+
+### Changed
+- loginWithBrowser can be over-ridden with LoginRedirectOptions 
+- popupSignIn can be over-ridden with PopupSignInOptions
+- silentSignIn can be over-ridden with SilentSignInOptions
+- registerWithBrowser can be over-ridden with LoginRedirectOptions
+- loginCallback accepts url location option
+- popupSignInCallback accepts url and keepOpen option
+- silentSignInCallback accepts url location option
+- logout can be over-ridden with LogoutRedirectOptions
+- popupSignOut can be over-ridden with PopupSignOutOptions
+- logoutCallback accepts url location option
+- popupSignOutCallback accepts url location option
+- getLoginURL can be over-ridden with LoginRequestOptions
+
 ## V4.2.0
 
 ### Added

package/dist/authentication/authentication.model.d.ts

@@ -0,0 +1,62 @@
+import { SigninPopupArgs, SigninRedirectArgs, SigninSilentArgs, SignoutPopupArgs, SignoutRedirectArgs, UserManagerSettings, UserManager, OidcClient, CreateSigninRequestArgs, User as OidcUser, SignoutResponse } from 'oidc-client-ts';
+/**
+ * @augments UserManagerSettings
+ * **/
+export interface OidcSettings extends UserManagerSettings {
+}
+/**
+ * @augments UserManager
+ * */
+export declare class OidcManager extends UserManager {
+    constructor(settings: OidcSettings);
+    getClient(): OidcClient;
+}
+/***
+ * Login request to generate authz url.
+ * It's based of the parameters in OIDC specs
+ * @augments CreateSigninRequestArgs
+ */
+export interface LoginRequestOptions extends CreateSigninRequestArgs {
+}
+/***
+ * Options to override options during redirect login
+ * @augments SigninRedirectArgs
+ */
+export interface LoginRedirectOptions extends SigninRedirectArgs {
+}
+/**
+ * Response state holding sign out errors if any
+ * @augments SignoutResponse
+ * **/
+export interface LogoutResponse extends SignoutResponse {
+}
+/***
+ * Options to override options during redirect logout
+ * @augments SignoutRedirectArgs
+ */
+export interface LogoutRedirectOptions extends SignoutRedirectArgs {
+}
+/***
+ * Options to override options during popup sign in
+ * @augments SigninPopupArgs
+ */
+export interface PopupSignInOptions extends SigninPopupArgs {
+}
+/***
+ * Options to override options during popup sign out
+ * @augments SignoutPopupArgs
+ */
+export interface PopupSignOutOptions extends SignoutPopupArgs {
+}
+/***
+ * Options to override options during silent sign in
+ * @augments SigninSilentArgs
+ */
+export interface SilentSignInOptions extends SigninSilentArgs {
+}
+/**
+ * Authenticated user information including token, id_token and claims
+ * @augments OidcUser
+ * **/
+export declare class User extends OidcUser {
+}

package/dist/authentication/authentication.model.js

@@ -0,0 +1,18 @@
+import { UserManager, User as OidcUser } from 'oidc-client-ts';
+/**
+ * @augments UserManager
+ * */
+export class OidcManager extends UserManager {
+    constructor(settings) {
+        super(settings);
+    }
+    getClient() {
+        return this._client;
+    }
+}
+/**
+ * Authenticated user information including token, id_token and claims
+ * @augments OidcUser
+ * **/
+export class User extends OidcUser {
+}

package/dist/authentication/index.d.ts

@@ -1,8 +1,9 @@
-import { UserManager, UserManagerSettings } from "oidc-client-ts";
+import { OidcManager, OidcSettings, LoginRedirectOptions, LogoutRedirectOptions, PopupSignInOptions, PopupSignOutOptions, SilentSignInOptions, LogoutResponse } from './authentication.model';
+export * from './authentication.model';
 export declare class Authentication {
-    webAuthSettings: UserManagerSettings;
-    userManager: UserManager;
-    constructor(webAuthSettings: UserManagerSettings, userManager: UserManager);
+    webAuthSettings: OidcSettings;
+    userManager: OidcManager;
+    constructor(webAuthSettings: OidcSettings, userManager: OidcManager);
     /**
      * To login through cidaas sdk, call **loginWithBrowser()**. This will redirect you to the hosted login page.
      * once login successful, it will automatically redirects you to the redirect url whatever you mentioned in the options.
@@ -17,9 +18,10 @@ export declare class Authentication {
      * cidaas.registerWithBrowser();
      * ```
      *
-     * @param view_type: either 'login' or 'register'
+     * @param {string} view_type either 'login' or 'register'
+     * @param {LoginRedirectOptions} options optional login options to override the webauth configuration
      */
-    loginOrRegisterWithBrowser(view_type: string): Promise<void>;
+    loginOrRegisterWithBrowser(view_type: string, options?: LoginRedirectOptions): Promise<void>;
     /**
      * Once login successful, it will automatically redirects you to the redirect url whatever you mentioned in the options.
      * To complete the login process, call **loginCallback()**. This will parses the access_token, id_token and whatever in hash in the redirect url.
@@ -31,16 +33,18 @@ export declare class Authentication {
      *  // your failure code here
      * });
      * ```
+     * @param {string} url optional url to read sign in state from
      */
-    loginCallback(): Promise<import("oidc-client-ts").User>;
+    loginCallback(url?: string): Promise<import("oidc-client-ts").User>;
     /**
      * To use the **logout()** method, you need set the redirect url, if not it will automatically redirect to the login page
      * @example
      * ```js
      * cidaas.logout();
      * ```
+     * @param {LogoutRedirectOptions} options optional logout options to override webauth configurations
      */
-    logout(): Promise<void>;
+    logout(options?: LogoutRedirectOptions): Promise<void>;
     /**
      * **logoutCallback()** will parses the details of userState after logout.
      * @example
@@ -51,8 +55,9 @@ export declare class Authentication {
      *  // your failure code here
      * });
      * ```
+     * @param {string} url optional url to read signout state from,
      */
-    logoutCallback(): Promise<import("oidc-client-ts").SignoutResponse>;
+    logoutCallback(url?: string): Promise<LogoutResponse>;
     /**
      * **popupSignIn()** will open the hosted login page in pop up window.
      * @example
@@ -63,8 +68,9 @@ export declare class Authentication {
      *  // your failure code here
      * });
      * ```
+     * @param {LogoutRedirectOptions} options optional popup sign-in options to override webauth configurations
      */
-    popupSignIn(): Promise<import("oidc-client-ts").User>;
+    popupSignIn(options?: PopupSignInOptions): Promise<import("oidc-client-ts").User>;
     /**
      * To complete the popup login process, call **popupSignInCallback()** from the popup login window.
      * Popup window will be closed after doing callback
@@ -72,8 +78,10 @@ export declare class Authentication {
      * ```js
      * cidaas.popupSignInCallback();
      * ```
+     * @param {string} url optional url to read sign-in callback state from
+     * @param {boolean} keepOpen true to keep the popup open even after sign in, else false
      */
-    popupSignInCallback(): Promise<void>;
+    popupSignInCallback(url?: string, keepOpen?: boolean): Promise<void>;
     /**
      * **popupSignOut()** will open the hosted logout page in pop up window.
      * @example
@@ -84,8 +92,10 @@ export declare class Authentication {
      *   // your failure code here
      * });
      * ```
+     *
+     * @param {PopupSignOutOptions} options optional options to over-ride logout options using popup window
      */
-    popupSignOut(): Promise<void>;
+    popupSignOut(options?: PopupSignOutOptions): Promise<void>;
     /**
      * calling **popupSignOutCallback()** from the popup window complete popup logout process.
      * Popup window won't be closed after doing callback
@@ -97,8 +107,11 @@ export declare class Authentication {
      *   // your failure code here
      * });
      * ```
+     *
+     * @param {string} url optional url to override to check for sign out state
+     * @param {boolean} keepOpen true to keep the popup open even after sign out, else false
      */
-    popupSignOutCallback(): Promise<void>;
+    popupSignOutCallback(url?: string, keepOpen?: boolean): Promise<void>;
     /**
      * **silentSignIn()** will open the hosted login page in an iframe.
      * this function could only be called from the same domain. Cross Domain is not supported for security purpose.
@@ -110,14 +123,17 @@ export declare class Authentication {
      *  // your failure code here
      * });
      * ```
+     * @param {SilentSignInOptions} options options to over-ride the client config for silent sign in
      */
-    silentSignIn(): Promise<import("oidc-client-ts").User>;
+    silentSignIn(options?: SilentSignInOptions): Promise<import("oidc-client-ts").User>;
     /**
      * To complete the silent login process, call **silentSignInCallback()** from the iframe. This will complete the login process in iframe.
      * @example
      * ```js
      * cidaas.silentSignInCallback();
+     *
      * ```
+     * @param {string} url optional url to read sign in state from
      */
-    silentSignInCallback(callbackurl?: string): Promise<void>;
+    silentSignInCallback(url?: string): Promise<void>;
 }

package/dist/authentication/index.js

@@ -1,8 +1,6 @@
-"use strict";
-exports.__esModule = true;
-exports.Authentication = void 0;
-var Authentication = /** @class */ (function () {
-    function Authentication(webAuthSettings, userManager) {
+export * from './authentication.model';
+export class Authentication {
+    constructor(webAuthSettings, userManager) {
         this.webAuthSettings = webAuthSettings;
         this.userManager = userManager;
     }
@@ -20,9 +18,10 @@ var Authentication = /** @class */ (function () {
      * cidaas.registerWithBrowser();
      * ```
      *
-     * @param view_type: either 'login' or 'register'
+     * @param {string} view_type either 'login' or 'register'
+     * @param {LoginRedirectOptions} options optional login options to override the webauth configuration
      */
-    Authentication.prototype.loginOrRegisterWithBrowser = function (view_type) {
+    loginOrRegisterWithBrowser(view_type, options) {
         var _a;
         if (!this.webAuthSettings.extraQueryParams) {
             this.webAuthSettings.extraQueryParams = {};
@@ -31,11 +30,8 @@ var Authentication = /** @class */ (function () {
         if (this.webAuthSettings.response_type.indexOf("id_token") == -1 && ((_a = this.webAuthSettings.scope) === null || _a === void 0 ? void 0 : _a.indexOf("openid")) != -1 && !this.webAuthSettings.extraQueryParams.nonce) {
             this.webAuthSettings.extraQueryParams.nonce = new Date().getTime().toString();
         }
-        return this.userManager.signinRedirect({
-            extraQueryParams: this.webAuthSettings.extraQueryParams,
-            redirect_uri: this.webAuthSettings.redirect_uri
-        });
-    };
+        return this.userManager.signinRedirect(Object.assign({ extraQueryParams: this.webAuthSettings.extraQueryParams, redirect_uri: this.webAuthSettings.redirect_uri }, (options && Object.assign({}, options) || {})));
+    }
     ;
     /**
      * Once login successful, it will automatically redirects you to the redirect url whatever you mentioned in the options.
@@ -48,20 +44,22 @@ var Authentication = /** @class */ (function () {
      *  // your failure code here
      * });
      * ```
+     * @param {string} url optional url to read sign in state from
      */
-    Authentication.prototype.loginCallback = function () {
-        return this.userManager.signinRedirectCallback();
-    };
+    loginCallback(url) {
+        return this.userManager.signinRedirectCallback(url);
+    }
     /**
      * To use the **logout()** method, you need set the redirect url, if not it will automatically redirect to the login page
      * @example
      * ```js
      * cidaas.logout();
      * ```
+     * @param {LogoutRedirectOptions} options optional logout options to override webauth configurations
      */
-    Authentication.prototype.logout = function () {
-        return this.userManager.signoutRedirect({ state: this.webAuthSettings });
-    };
+    logout(options) {
+        return this.userManager.signoutRedirect(options);
+    }
     /**
      * **logoutCallback()** will parses the details of userState after logout.
      * @example
@@ -72,10 +70,11 @@ var Authentication = /** @class */ (function () {
      *  // your failure code here
      * });
      * ```
+     * @param {string} url optional url to read signout state from,
      */
-    Authentication.prototype.logoutCallback = function () {
-        return this.userManager.signoutRedirectCallback();
-    };
+    logoutCallback(url) {
+        return this.userManager.signoutRedirectCallback(url);
+    }
     ;
     /**
      * **popupSignIn()** will open the hosted login page in pop up window.
@@ -87,10 +86,11 @@ var Authentication = /** @class */ (function () {
      *  // your failure code here
      * });
      * ```
+     * @param {LogoutRedirectOptions} options optional popup sign-in options to override webauth configurations
      */
-    Authentication.prototype.popupSignIn = function () {
-        return this.userManager.signinPopup();
-    };
+    popupSignIn(options) {
+        return this.userManager.signinPopup(options);
+    }
     ;
     /**
      * To complete the popup login process, call **popupSignInCallback()** from the popup login window.
@@ -99,10 +99,12 @@ var Authentication = /** @class */ (function () {
      * ```js
      * cidaas.popupSignInCallback();
      * ```
+     * @param {string} url optional url to read sign-in callback state from
+     * @param {boolean} keepOpen true to keep the popup open even after sign in, else false
      */
-    Authentication.prototype.popupSignInCallback = function () {
-        return this.userManager.signinPopupCallback();
-    };
+    popupSignInCallback(url, keepOpen) {
+        return this.userManager.signinPopupCallback(url, keepOpen);
+    }
     ;
     /**
      * **popupSignOut()** will open the hosted logout page in pop up window.
@@ -114,10 +116,12 @@ var Authentication = /** @class */ (function () {
      *   // your failure code here
      * });
      * ```
+     *
+     * @param {PopupSignOutOptions} options optional options to over-ride logout options using popup window
      */
-    Authentication.prototype.popupSignOut = function () {
-        return this.userManager.signoutPopup({ state: this.webAuthSettings });
-    };
+    popupSignOut(options) {
+        return this.userManager.signoutPopup(options);
+    }
     ;
     /**
      * calling **popupSignOutCallback()** from the popup window complete popup logout process.
@@ -130,10 +134,13 @@ var Authentication = /** @class */ (function () {
      *   // your failure code here
      * });
      * ```
+     *
+     * @param {string} url optional url to override to check for sign out state
+     * @param {boolean} keepOpen true to keep the popup open even after sign out, else false
      */
-    Authentication.prototype.popupSignOutCallback = function () {
-        return this.userManager.signoutPopupCallback(this.webAuthSettings.post_logout_redirect_uri, true);
-    };
+    popupSignOutCallback(url, keepOpen = true) {
+        return this.userManager.signoutPopupCallback(url, keepOpen);
+    }
     ;
     /**
      * **silentSignIn()** will open the hosted login page in an iframe.
@@ -146,25 +153,23 @@ var Authentication = /** @class */ (function () {
      *  // your failure code here
      * });
      * ```
+     * @param {SilentSignInOptions} options options to over-ride the client config for silent sign in
      */
-    Authentication.prototype.silentSignIn = function () {
-        return this.userManager.signinSilent({
-            state: this.webAuthSettings,
-            silentRequestTimeoutInSeconds: 60
-        });
-    };
+    silentSignIn(options) {
+        return this.userManager.signinSilent(Object.assign({ silentRequestTimeoutInSeconds: 60 }, (options && Object.assign({}, options) || {})));
+    }
     ;
     /**
      * To complete the silent login process, call **silentSignInCallback()** from the iframe. This will complete the login process in iframe.
      * @example
      * ```js
      * cidaas.silentSignInCallback();
+     *
      * ```
+     * @param {string} url optional url to read sign in state from
      */
-    Authentication.prototype.silentSignInCallback = function (callbackurl) {
-        return this.userManager.signinSilentCallback(callbackurl);
-    };
+    silentSignInCallback(url) {
+        return this.userManager.signinSilentCallback(url);
+    }
     ;
-    return Authentication;
-}());
-exports.Authentication = Authentication;
+}

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 import { WebAuth } from "./web-auth/WebAuth";
+export * from './authentication';
 export { WebAuth };

package/dist/index.js

@@ -1,5 +1,3 @@
-"use strict";
-exports.__esModule = true;
-exports.WebAuth = void 0;
-var WebAuth_1 = require("./web-auth/WebAuth");
-exports.WebAuth = WebAuth_1.WebAuth;
+import { WebAuth } from "./web-auth/WebAuth";
+export * from './authentication';
+export { WebAuth };

package/dist/web-auth/ConsentService.js

@@ -1,12 +1,9 @@
-"use strict";
-exports.__esModule = true;
-exports.ConsentService = void 0;
-var Helper_1 = require("./Helper");
+import { Helper } from "./Helper";
 /**
  * Consent Management
  * For the first time login, the user needs to accept the terms and conditions.
  */
-var ConsentService;
+export var ConsentService;
 (function (ConsentService) {
     /**
      * To get consent details , call **getConsentDetails()**.
@@ -28,7 +25,7 @@ var ConsentService;
      */
     function getConsentDetails(options) {
         var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/v2/consent/usage/public/info";
-        return Helper_1.Helper.createHttpPromise(options, _serviceURL, false, "POST");
+        return Helper.createHttpPromise(options, _serviceURL, false, "POST");
     }
     ConsentService.getConsentDetails = getConsentDetails;
     ;
@@ -50,7 +47,7 @@ var ConsentService;
      */
     function acceptConsent(options) {
         var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/v2/consent/usage/accept";
-        return Helper_1.Helper.createHttpPromise(options, _serviceURL, false, "POST");
+        return Helper.createHttpPromise(options, _serviceURL, false, "POST");
     }
     ConsentService.acceptConsent = acceptConsent;
     ;
@@ -71,8 +68,8 @@ var ConsentService;
      * ```
      */
     function getConsentVersionDetails(options) {
-        var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/v2/consent/versions/details/" + options.consentid + "?locale=" + options.locale;
-        return Helper_1.Helper.createHttpPromise(undefined, _serviceURL, false, "GET", options.access_token);
+        const _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/v2/consent/versions/details/" + options.consentid + "?locale=" + options.locale;
+        return Helper.createHttpPromise(undefined, _serviceURL, false, "GET", options.access_token);
     }
     ConsentService.getConsentVersionDetails = getConsentVersionDetails;
     ;
@@ -89,7 +86,7 @@ var ConsentService;
      */
     function acceptScopeConsent(options) {
         var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/consent/scope/accept";
-        return Helper_1.Helper.createHttpPromise(options, _serviceURL, false, "POST");
+        return Helper.createHttpPromise(options, _serviceURL, false, "POST");
     }
     ConsentService.acceptScopeConsent = acceptScopeConsent;
     ;
@@ -106,7 +103,7 @@ var ConsentService;
      */
     function acceptClaimConsent(options) {
         var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/consent/claim/accept";
-        return Helper_1.Helper.createHttpPromise(options, _serviceURL, false, "POST");
+        return Helper.createHttpPromise(options, _serviceURL, false, "POST");
     }
     ConsentService.acceptClaimConsent = acceptClaimConsent;
     ;
@@ -129,8 +126,8 @@ var ConsentService;
      */
     function revokeClaimConsent(options) {
         var _serviceURL = window.webAuthSettings.authority + "/consent-management-srv/consent/claim/revoke";
-        return Helper_1.Helper.createHttpPromise(options, _serviceURL, false, "POST", options.access_token);
+        return Helper.createHttpPromise(options, _serviceURL, false, "POST", options.access_token);
     }
     ConsentService.revokeClaimConsent = revokeClaimConsent;
     ;
-})(ConsentService = exports.ConsentService || (exports.ConsentService = {}));
+})(ConsentService || (ConsentService = {}));

package/dist/web-auth/Entities.js

@@ -1,8 +1,5 @@
-"use strict";
-exports.__esModule = true;
-exports.ValidateResetPasswordEntity = exports.UpdateReviewDeviceEntity = exports.GroupValidationEntity = exports.TokenIntrospectionEntity = exports.FindUserEntity = exports.PhysicalVerificationLoginRequest = exports.AccessTokenRequest = void 0;
-var AccessTokenRequest = /** @class */ (function () {
-    function AccessTokenRequest() {
+export class AccessTokenRequest {
+    constructor() {
         this.user_agent = "";
         this.ip_address = "";
         this.accept_language = "";
@@ -15,17 +12,11 @@ var AccessTokenRequest = /** @class */ (function () {
         // device code flow
         this.device_code = "";
     }
-    return AccessTokenRequest;
-}());
-exports.AccessTokenRequest = AccessTokenRequest;
-var PhysicalVerificationLoginRequest = /** @class */ (function () {
-    function PhysicalVerificationLoginRequest() {
-    }
-    return PhysicalVerificationLoginRequest;
-}());
-exports.PhysicalVerificationLoginRequest = PhysicalVerificationLoginRequest;
-var FindUserEntity = /** @class */ (function () {
-    function FindUserEntity() {
+}
+export class PhysicalVerificationLoginRequest {
+}
+export class FindUserEntity {
+    constructor() {
         this.sub = "";
         this.email = "";
         this.mobile = "";
@@ -36,43 +27,33 @@ var FindUserEntity = /** @class */ (function () {
         this.webfinger = "";
         this.sub_not = "";
     }
-    return FindUserEntity;
-}());
-exports.FindUserEntity = FindUserEntity;
-var TokenIntrospectionEntity = /** @class */ (function () {
-    function TokenIntrospectionEntity() {
+}
+export class TokenIntrospectionEntity {
+    constructor() {
         this.token = "";
         this.strictGroupValidation = false;
         this.strictScopeValidation = false;
         this.strictRoleValidation = false;
         this.strictValidation = false;
     }
-    return TokenIntrospectionEntity;
-}());
-exports.TokenIntrospectionEntity = TokenIntrospectionEntity;
-var GroupValidationEntity = /** @class */ (function () {
-    function GroupValidationEntity() {
+}
+export class GroupValidationEntity {
+    constructor() {
         this.strictRoleValidation = false;
         this.strictValidation = false;
     }
-    return GroupValidationEntity;
-}());
-exports.GroupValidationEntity = GroupValidationEntity;
-var UpdateReviewDeviceEntity = /** @class */ (function () {
-    function UpdateReviewDeviceEntity() {
+}
+export class UpdateReviewDeviceEntity {
+    constructor() {
         this.userId = "";
         this.device = "";
         this.browser = "";
         this.location = "";
     }
-    return UpdateReviewDeviceEntity;
-}());
-exports.UpdateReviewDeviceEntity = UpdateReviewDeviceEntity;
-var ValidateResetPasswordEntity = /** @class */ (function () {
-    function ValidateResetPasswordEntity() {
+}
+export class ValidateResetPasswordEntity {
+    constructor() {
         this.resetRequestId = "";
         this.code = "";
     }
-    return ValidateResetPasswordEntity;
-}());
-exports.ValidateResetPasswordEntity = ValidateResetPasswordEntity;
+}