diff --git a/build.gradle b/build.gradle index dd4565cbc..53a34e0eb 100644 --- a/build.gradle +++ b/build.gradle @@ -395,6 +395,13 @@ subprojects { implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}" //阿里云 implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" + // https://mvnrepository.com/artifact/io.opentracing/opentracing-util + implementation 'io.opentracing:opentracing-util:0.33.0' + // https://mvnrepository.com/artifact/io.opentracing/opentracing-api + implementation 'io.opentracing:opentracing-api:0.33.0' + implementation 'io.opentracing:opentracing-noop:0.33.0' + + //腾讯云 implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}" //json diff --git a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java index 440f42155..825438e92 100644 --- a/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java +++ b/maxkey-authentications/maxkey-authentication-sms/src/main/java/org/maxkey/password/sms/SmsOtpAuthnService.java @@ -71,7 +71,7 @@ public class SmsOtpAuthnService { if(smsProvider.getProvider().equalsIgnoreCase("aliyun")) { SmsOtpAuthnAliyun aliyun = new SmsOtpAuthnAliyun( smsProvider.getAppKey(), - smsProvider.getAppSecret(), + PasswordReciprocal.getInstance().decoder(smsProvider.getAppSecret()), smsProvider.getTemplateId(), smsProvider.getSignName() ); @@ -82,7 +82,7 @@ public class SmsOtpAuthnService { }else if(smsProvider.getProvider().equalsIgnoreCase("tencentcloud")) { SmsOtpAuthnTencentCloud tencentCloud = new SmsOtpAuthnTencentCloud( smsProvider.getAppKey(), - smsProvider.getAppSecret(), + PasswordReciprocal.getInstance().decoder(smsProvider.getAppSecret()), smsProvider.getSmsSdkAppId(), smsProvider.getTemplateId(), smsProvider.getSignName() @@ -94,7 +94,7 @@ public class SmsOtpAuthnService { }else if(smsProvider.getProvider().equalsIgnoreCase("neteasesms")) { SmsOtpAuthnYunxin yunxin = new SmsOtpAuthnYunxin( smsProvider.getAppKey(), - smsProvider.getAppSecret(), + PasswordReciprocal.getInstance().decoder(smsProvider.getAppSecret()), smsProvider.getTemplateId() ); if(redisOptTokenStore != null) { diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java new file mode 100644 index 000000000..9c2ba3b40 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/AuthMaxkeyRequest.java @@ -0,0 +1,58 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package me.zhyd.oauth.request; +import com.alibaba.fastjson.JSONObject; +import me.zhyd.oauth.cache.AuthStateCache; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.enums.AuthUserGender; +import me.zhyd.oauth.enums.scope.AuthHuaweiScope; +import me.zhyd.oauth.exception.AuthException; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthToken; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.utils.AuthScopeUtils; +import me.zhyd.oauth.utils.HttpUtils; +import me.zhyd.oauth.utils.UrlBuilder; + +import java.util.HashMap; +import java.util.Map; + +import static me.zhyd.oauth.enums.AuthResponseStatus.SUCCESS; + +public class AuthMaxkeyRequest extends AuthDefaultRequest { + + public static final String KEY = "maxkey"; + public AuthMaxkeyRequest(AuthConfig config) { + super(config, WeLinkAuthDefaultSource.HUAWEI_WELINK); + } + + public AuthMaxkeyRequest(AuthConfig config, AuthStateCache authStateCache) { + super(config, MaxkeyAuthDefaultSource.MAXKEY, authStateCache); + } + + @Override + protected AuthToken getAccessToken(AuthCallback authCallback) { + return null; + } + + @Override + protected AuthUser getUserInfo(AuthToken authToken) { + return null; + } +} diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java new file mode 100644 index 000000000..d0bb19ce0 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/me/zhyd/oauth/request/MaxkeyAuthDefaultSource.java @@ -0,0 +1,51 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package me.zhyd.oauth.request; + +import me.zhyd.oauth.config.AuthSource; + +public enum MaxkeyAuthDefaultSource implements AuthSource{ + + + MAXKEY { + @Override + public String authorize() { + return "https://login.welink.huaweicloud.com/connect/oauth2/sns_authorize"; + } + + @Override + public String accessToken() { + return "https://open.welink.huaweicloud.com/api/auth/v2/tickets"; + } + + @Override + public String userInfo() { + return "https://open.welink.huaweicloud.com/api/contact/v1/users"; + } + + @Override + public String refresh() { + return ""; + } + + @Override + public Class getTargetClass() { + return AuthHuaweiWeLinkRequest.class; + } + } +} diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index 79b61334a..46ca58eb0 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -22,6 +22,8 @@ package org.maxkey.authn.support.socialsignon; import javax.servlet.http.HttpServletRequest; +import me.zhyd.oauth.request.AuthMaxkeyRequest; +import org.apache.commons.lang3.StringUtils; import org.maxkey.authn.LoginCredential; import org.maxkey.authn.annotation.CurrentUser; import org.maxkey.authn.jwt.AuthJwt; @@ -30,18 +32,18 @@ import org.maxkey.entity.Message; import org.maxkey.entity.SocialsAssociate; import org.maxkey.entity.SocialsProvider; import org.maxkey.entity.UserInfo; +import org.maxkey.uuid.UUID; import org.maxkey.web.WebContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import me.zhyd.oauth.request.AuthRequest; +import java.util.Map; + /** * @author Crystal.Sea * @@ -50,7 +52,7 @@ import me.zhyd.oauth.request.AuthRequest; @RequestMapping(value = "/logon/oauth20") public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ final static Logger _logger = LoggerFactory.getLogger(SocialSignOnEndpoint.class); - + @RequestMapping(value={"/authorize/{provider}"}, method = RequestMethod.GET) @ResponseBody public ResponseEntity authorize( HttpServletRequest request, @@ -59,13 +61,13 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ _logger.trace("SocialSignOn provider : " + provider); String instId = WebContext.getInst().getId(); String originURL =WebContext.getHttpContextPath(request,false); - String authorizationUrl = + String authorizationUrl = buildAuthRequest( instId, provider, originURL + applicationConfig.getFrontendUri() ).authorize(authTokenService.genRandomJwt()); - + _logger.trace("authorize SocialSignOn : " + authorizationUrl); return new Message((Object)authorizationUrl).buildResponse(); } @@ -85,7 +87,8 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ if(authRequest == null ) { _logger.error("build authRequest fail ."); } - String state = authTokenService.genRandomJwt(); + String state = UUID.generate().toString(); + //String state = authTokenService.genRandomJwt(); authRequest.authorize(state); SocialsProvider socialSignOnProvider = socialSignOnProviderService.get(instId,provider); @@ -94,10 +97,14 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ scanQrProvider.setRedirectUri( socialSignOnProviderService.getRedirectUri( originURL + applicationConfig.getFrontendUri(), provider)); + //缓存state票据在缓存或者是redis中五分钟过期 + if (provider.equalsIgnoreCase(AuthMaxkeyRequest.KEY)) { + socialSignOnProviderService.setToken(state); + } return new Message(scanQrProvider).buildResponse(); - } - + } + @RequestMapping(value={"/bind/{provider}"}, method = RequestMethod.GET) public ResponseEntity bind(@PathVariable String provider, @@ -105,7 +112,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ HttpServletRequest request) { //auth call back may exception try { - String originURL =WebContext.getHttpContextPath(request,false); + String originURL = WebContext.getHttpContextPath(request,false); SocialsAssociate socialsAssociate = this.authCallback(userInfo.getInstId(),provider,originURL + applicationConfig.getFrontendUri()); socialsAssociate.setSocialUserInfo(accountJsonString); @@ -125,6 +132,8 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ return new Message(Message.ERROR).buildResponse(); } + + @RequestMapping(value={"/callback/{provider}"}, method = RequestMethod.GET) public ResponseEntity callback(@PathVariable String provider, HttpServletRequest request) { @@ -134,15 +143,20 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ String instId = WebContext.getInst().getId(); SocialsAssociate socialsAssociate = this.authCallback(instId,provider,originURL + applicationConfig.getFrontendUri()); + + SocialsAssociate socialssssociate1 = this.socialsAssociateService.get(socialsAssociate); - socialsAssociate=this.socialsAssociateService.get(socialsAssociate); - - _logger.debug("Loaded SocialSignOn Socials Associate : "+socialsAssociate); - - if(null == socialsAssociate) { - return new Message(Message.ERROR).buildResponse(); - } + _logger.debug("Loaded SocialSignOn Socials Associate : "+socialssssociate1); + if (null == socialssssociate1) { + //如果存在第三方ID并且在数据库无法找到映射关系，则进行绑定逻辑 + if (StringUtils.isNotEmpty(socialsAssociate.getSocialUserId())) { + //返回message为第三方用户标识 + return new Message(Message.PROMPT,socialsAssociate.getSocialUserId()).buildResponse(); + } + } + + socialsAssociate = socialssssociate1; _logger.debug("Social Sign On from {} mapping to user {}", socialsAssociate.getProvider(),socialsAssociate.getUsername()); @@ -163,4 +177,99 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ return new Message(Message.ERROR).buildResponse(); } } + + + /** + * 提供给第三方应用关联用户接口 + * @return + */ + @RequestMapping(value={"/workweixin/qr/auth/login"}, method = {RequestMethod.POST}) + public ResponseEntity qrAuthLogin( + @RequestParam Map param, + HttpServletRequest request) { + + try { + if (null == param){ + return new Message(Message.ERROR).buildResponse(); + } + String token = param.get("token"); + String username = param.get("username"); + //判断token是否合法 + String redisusername = this.socialSignOnProviderService.getToken(token); + if (StringUtils.isNotEmpty(redisusername)){ + //设置token和用户绑定 + boolean flag = this.socialSignOnProviderService.bindtoken(token,username); + if (flag) { + return new Message().buildResponse(); + } + } else { + return new Message(Message.WARNING,"Invalid token").buildResponse(); + } + }catch(Exception e) { + _logger.error("qrAuthLogin Exception ",e); + } + return new Message(Message.ERROR).buildResponse(); + } + + + /** + * maxkey 监听扫码回调 + * @param provider + * @param state + * @param request + * @return + */ + @RequestMapping(value={"/qrcallback/{provider}/{state}"}, method = RequestMethod.GET) + public ResponseEntity qrcallback(@PathVariable String provider,@PathVariable String state, + HttpServletRequest request) { + try { + //判断只有maxkey扫码 + if (!provider.equalsIgnoreCase(AuthMaxkeyRequest.KEY)) { + return new Message(Message.ERROR).buildResponse(); + } + + String loginName = socialSignOnProviderService.getToken(state); + if (StringUtils.isEmpty(loginName)) { + //二维码过期 + return new Message(Message.PROMPT).buildResponse(); + } + if("-1".equalsIgnoreCase(loginName)){ + //暂无用户扫码 + return new Message(Message.WARNING).buildResponse(); + } + String instId = WebContext.getInst().getId(); + + SocialsAssociate socialsAssociate = new SocialsAssociate(); + socialsAssociate.setProvider(provider); + socialsAssociate.setSocialUserId(loginName); + socialsAssociate.setInstId(instId); + + + socialsAssociate = this.socialsAssociateService.get(socialsAssociate); + + _logger.debug("qrcallback Loaded SocialSignOn Socials Associate : "+socialsAssociate); + + if(null == socialsAssociate) { + return new Message(Message.ERROR).buildResponse(); + } + + _logger.debug("qrcallback Social Sign On from {} mapping to user {}", socialsAssociate.getProvider(),socialsAssociate.getUsername()); + + LoginCredential loginCredential =new LoginCredential( + socialsAssociate.getUsername(),"",ConstsLoginType.SOCIALSIGNON); + SocialsProvider socialSignOnProvider = socialSignOnProviderService.get(instId,provider); + loginCredential.setProvider(socialSignOnProvider.getProviderName()); + + Authentication authentication = authenticationProvider.authenticate(loginCredential,true); + //socialsAssociate.setAccessToken(JsonUtils.object2Json(this.accessToken)); + socialsAssociate.setSocialUserInfo(accountJsonString); + //socialsAssociate.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); + + this.socialsAssociateService.update(socialsAssociate); + return new Message(authTokenService.genAuthJwt(authentication)).buildResponse(); + }catch(Exception e) { + _logger.error("qrcallback Exception ",e); + return new Message(Message.ERROR).buildResponse(); + } + } } diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java index 8f0422713..6624ff3c3 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnProviderService.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.TimeUnit; +import org.maxkey.authn.support.socialsignon.token.RedisTokenStore; import org.maxkey.constants.ConstsTimeInterval; import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.entity.SocialsProvider; @@ -54,6 +55,9 @@ public class SocialSignOnProviderService{ HashMapsocialSignOnProviderMaps = new HashMap(); private final JdbcTemplate jdbcTemplate; + + + RedisTokenStore redisTokenStore; public SocialSignOnProviderService(JdbcTemplate jdbcTemplate) { this.jdbcTemplate=jdbcTemplate; @@ -62,6 +66,17 @@ public class SocialSignOnProviderService{ public SocialsProvider get(String instId,String provider){ return socialSignOnProviderMaps.get(instId + "_" + provider); } + public void setToken(String token){ + this.redisTokenStore.store(token); + } + + public boolean bindtoken(String token,String loginName){ + return this.redisTokenStore.bindtoken(token,loginName); + } + + public String getToken(String token){ + return this.redisTokenStore.get(token); + } public String getRedirectUri(String baseUri,String provider) { return baseUri + "/passport/callback/"+provider; @@ -129,10 +144,10 @@ public class SocialSignOnProviderService{ authRequest = new AuthWeChatEnterpriseWebRequest(authConfig); }else if(provider.equalsIgnoreCase("welink")) { authRequest = new AuthHuaweiWeLinkRequest(authConfig); - } - - - + }else if(provider.equalsIgnoreCase("maxkey")) { + authRequest = new AuthMaxkeyRequest(authConfig); + } + return authRequest; } @@ -234,4 +249,9 @@ public class SocialSignOnProviderService{ return socialsProvider; } } + + + public void setRedisTokenStore(RedisTokenStore redisTokenStore) { + this.redisTokenStore = redisTokenStore; + } } diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java new file mode 100644 index 000000000..891f20811 --- /dev/null +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/token/RedisTokenStore.java @@ -0,0 +1,82 @@ +/* + * Copyright [2020] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.maxkey.authn.support.socialsignon.token; + +import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; +import org.maxkey.constants.ConstsTimeInterval; +import org.maxkey.persistence.redis.RedisConnection; +import org.maxkey.persistence.redis.RedisConnectionFactory; + +import java.util.concurrent.ConcurrentHashMap; + +public class RedisTokenStore { + + protected int validitySeconds = ConstsTimeInterval.ONE_MINUTE * 2; + + + private final ConcurrentHashMap tokenStore = new ConcurrentHashMap(); + + public RedisTokenStore() { + super(); + } + + public static String PREFIX = "REDIS_QRSCRAN_SERVICE_"; + + + public void store(String token) { + tokenStore.put(PREFIX + token,"-1"); + /* DateTime currentDateTime = new DateTime(); + RedisConnection conn = connectionFactory.getConnection(); + conn.getConn().setex(PREFIX + token, validitySeconds, "-1"); + conn.close();*/ + } + + public boolean bindtoken(String token,String loginname) { + boolean flag = false; + try { + /* DateTime currentDateTime = new DateTime(); + RedisConnection conn = connectionFactory.getConnection(); + conn.getConn().setex(PREFIX + token, validitySeconds, loginname); + //conn.setexObject(PREFIX + token, validitySeconds, loginname); + conn.close();*/ + tokenStore.put(PREFIX + token,loginname); + return true; + }catch (Exception e) { + + } + return flag; + } + + public String get(String token) { + /* RedisConnection conn = connectionFactory.getConnection(); + String value = conn.get(PREFIX + token); + if(StringUtils.isNotEmpty(value) && !"-1".equalsIgnoreCase(value)) { + conn.delete(PREFIX + token); + return value; + }*/ + + String value = tokenStore.get(PREFIX + token); + if(StringUtils.isNotEmpty(value) && !"-1".equalsIgnoreCase(value)) { + tokenStore.remove(PREFIX + token); + return value; + } + return value; + } + +} diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java index c29b80b18..a100d59db 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java @@ -20,10 +20,14 @@ package org.maxkey.autoconfigure; import java.io.IOException; import org.maxkey.authn.support.socialsignon.service.JdbcSocialsAssociateService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; +import org.maxkey.authn.support.socialsignon.token.RedisTokenStore; +import org.maxkey.constants.ConstsPersistence; import org.maxkey.entity.SocialsProvider; +import org.maxkey.persistence.redis.RedisConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; @@ -40,10 +44,17 @@ public class SocialSignOnAutoConfiguration implements InitializingBean { @Bean(name = "socialSignOnProviderService") @ConditionalOnClass(SocialsProvider.class) public SocialSignOnProviderService socialSignOnProviderService( - JdbcTemplate jdbcTemplate) throws IOException { + @Value("${maxkey.server.persistence}") int persistence, + JdbcTemplate jdbcTemplate, + RedisConnectionFactory redisConnFactory + ) throws IOException { SocialSignOnProviderService socialSignOnProviderService = new SocialSignOnProviderService(jdbcTemplate); //load default Social Providers from database socialSignOnProviderService.loadSocials("1"); + + RedisTokenStore redisTokenStore = new RedisTokenStore(); + socialSignOnProviderService.setRedisTokenStore(redisTokenStore); + _logger.debug("SocialSignOnProviderService inited."); return socialSignOnProviderService; } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.ts index d24046c09..68dce8b8e 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/config/socials-provider/socials-provider.component.ts @@ -123,7 +123,7 @@ export class SocialsProviderComponent implements OnInit { onAdd(e: MouseEvent): void { e.preventDefault(); const modal = this.modalService.create({ - //nzContent: SocialsProviderEditerComponent, + //nzContent: SocialsProviderBindUserComponent, nzViewContainerRef: this.viewContainerRef, nzComponentParams: { isEdit: false, @@ -143,7 +143,7 @@ export class SocialsProviderComponent implements OnInit { e.preventDefault(); const modal = this.modalService.create({ - //nzContent: SocialsProviderEditerComponent, + //nzContent: SocialsProviderBindUserComponent, nzViewContainerRef: this.viewContainerRef, nzComponentParams: { isEdit: true, diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/callback.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/callback.component.ts index de9b0f321..0f25a3a64 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/callback.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/callback.component.ts @@ -14,13 +14,14 @@ * limitations under the License. */ -import { Inject, Optional, Component, OnInit } from '@angular/core'; +import { Inject, Optional, Component, OnInit, ViewContainerRef } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ReuseTabService } from '@delon/abc/reuse-tab'; import { SettingsService } from '@delon/theme'; - +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { AuthnService } from '../../service/authn.service'; import { SocialsProviderService } from '../../service/socials-provider.service'; +import {SocialsProviderBindUserComponent} from "./socials-provider-bind-user/socials-provider-bind-user.component"; @Component({ selector: 'app-callback', @@ -30,6 +31,8 @@ export class CallbackComponent implements OnInit { provider = ''; constructor( + private viewContainerRef: ViewContainerRef, + private modalService: NzModalService, private router: Router, private socialsProviderService: SocialsProviderService, private settingsService: SettingsService, @@ -50,6 +53,11 @@ export class CallbackComponent implements OnInit { // 设置用户Token信息 this.authnService.auth(res.data); } + else if (res.code === 102) { + //绑定用户 + this.openBindUser(res.message) + return; + } this.authnService.navigate({}); }); } else { @@ -60,4 +68,25 @@ export class CallbackComponent implements OnInit { }); } } + + openBindUser(socialUserId: String) { + console.log("bind user : ",this.provider,socialUserId); + const modal = this.modalService.create({ + nzContent: SocialsProviderBindUserComponent, + nzViewContainerRef: this.viewContainerRef, + nzComponentParams: { + socialUserId: socialUserId, + provider: this.provider + }, + nzOnOk: () => new Promise(resolve => setTimeout(resolve, 1000)) + }); + // Return a result when closed + modal.afterClose.subscribe(result => { + if (result.refresh) { + + } + }); + + + } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.html index 8b959a880..c39df04c3 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.html +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.html @@ -82,8 +82,11 @@ -
-
+
+
+
+ 二维码过期 刷新 +
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.less b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.less index e710ca7f2..4f5c948ef 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.less +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.less @@ -1,5 +1,6 @@ @import '@delon/theme/index'; + :host { display: block; width: 368px; @@ -81,4 +82,4 @@ input{ .qrcode iframe{ border: 0; -} \ No newline at end of file +} diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts index 0e3b9f7e2..79926ebfb 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/login/login.component.ts @@ -31,6 +31,7 @@ import { ImageCaptchaService } from '../../../service/image-captcha.service'; import { SocialsProviderService } from '../../../service/socials-provider.service'; import { CONSTS } from '../../../shared/consts'; + import { stringify } from 'querystring'; @Component({ @@ -54,6 +55,7 @@ export class UserLoginComponent implements OnInit, OnDestroy { loginType = 'normal'; loading = false; passwordVisible = false; + qrexpire = false; imageCaptcha = ''; captchaType = ''; state = ''; @@ -287,6 +289,10 @@ export class UserLoginComponent implements OnInit, OnDestroy { } getQrCode(): void { + this.qrexpire = false; + if (this.interval$) { + clearInterval(this.interval$); + } this.authnService.clearUser(); this.socialsProviderService.scanqrcode(this.socials.qrScan).subscribe(res => { if (res.code === 0) { @@ -294,11 +300,14 @@ export class UserLoginComponent implements OnInit, OnDestroy { this.qrScanWorkweixin(res.data); } else if (this.socials.qrScan === 'dingtalk') { this.qrScanDingtalk(res.data); - } else if (this.socials.qrScan === 'feishu') { + } else if (this.socials.qrScan === 'maxkey') { + this.qrScanMaxkey(res.data); + }else if (this.socials.qrScan === 'feishu') { this.qrScanFeishu(res.data); } } }); + } // #endregion @@ -364,4 +373,46 @@ export class UserLoginComponent implements OnInit, OnDestroy { }); } // #region QR Scan end + + qrScanMaxkey(data: any) { + // @ts-ignore + document.getElementById("div_qrcodelogin").innerHTML=''; + // @ts-ignore + var qrcode = new QRCode("div_qrcodelogin", { + width: 200, + height: 200, + colorDark : "#000000", + colorLight : "#ffffff" + }).makeCode(data.state); + //3分钟监听二维码 + this.count = 90; + this.interval$ = setInterval(() => { + this.count -= 1; + if(this.loginType != 'qrscan') { + clearInterval(this.interval$); + } + if (this.count <= 0) { + clearInterval(this.interval$); + } + //轮询发送监听请求 + this.socialsProviderService.qrcallback(this.socials.qrScan,data.state).subscribe(res => { + if (res.code === 0) { + // 清空路由复用信息 + this.reuseTabService.clear(); + // 设置用户Token信息 + this.authnService.auth(res.data); + this.authnService.navigate({}); + clearInterval(this.interval$); + } else if (res.code === 102) { + // 二维码过期 + clearInterval(this.interval$); + this.qrexpire = true; + this.cdr.detectChanges(); + } else if (res.code === 103) { + // 暂无用户扫码 + } + }); + this.cdr.detectChanges(); + }, 2000); + } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/passport.module.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/passport.module.ts index 9247f3d5a..d012235ea 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/passport.module.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/passport.module.ts @@ -17,8 +17,8 @@ import { NgModule } from '@angular/core'; import { SharedModule } from '@shared'; import { NzStepsModule } from 'ng-zorro-antd/steps'; - import { CallbackComponent } from './callback.component'; +import { SocialsProviderBindUserComponent } from './socials-provider-bind-user/socials-provider-bind-user.component'; import { ForgotComponent } from './forgot/forgot.component'; import { UserLockComponent } from './lock/lock.component'; import { UserLoginComponent } from './login/login.component'; @@ -26,7 +26,7 @@ import { PassportRoutingModule } from './passport-routing.module'; import { UserRegisterResultComponent } from './register-result/register-result.component'; import { UserRegisterComponent } from './register/register.component'; -const COMPONENTS = [UserLoginComponent, UserRegisterResultComponent, UserRegisterComponent, UserLockComponent, CallbackComponent]; +const COMPONENTS = [SocialsProviderBindUserComponent,UserLoginComponent, UserRegisterResultComponent, UserRegisterComponent, UserLockComponent, CallbackComponent]; @NgModule({ imports: [SharedModule, PassportRoutingModule, NzStepsModule], diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.html b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.html new file mode 100644 index 000000000..06001f05e --- /dev/null +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.html @@ -0,0 +1,30 @@ +
绑定
+
+
+ + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.less b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.less new file mode 100644 index 000000000..e69de29bb diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.spec.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.spec.ts new file mode 100644 index 000000000..2fa8ef69e --- /dev/null +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.spec.ts @@ -0,0 +1,42 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SocialsProviderBindUserComponent } from './socials-provider-bind-user.component'; + +describe('SocialsProviderBindUserComponent', () => { + let component: SocialsProviderBindUserComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ SocialsProviderBindUserComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(SocialsProviderBindUserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.ts b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.ts new file mode 100644 index 000000000..610ae5c07 --- /dev/null +++ b/maxkey-web-frontend/maxkey-web-app/src/app/routes/passport/socials-provider-bind-user/socials-provider-bind-user.component.ts @@ -0,0 +1,124 @@ +/* + * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Component, ChangeDetectorRef, Input, OnInit, Inject } from '@angular/core'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { I18NService } from '@core'; +import { _HttpClient, ALAIN_I18N_TOKEN, SettingsService } from '@delon/theme'; +import format from 'date-fns/format'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; +import { AuthnService } from "../../../service/authn.service"; +import { SocialsProviderService } from "../../../service/socials-provider.service"; +import { ReuseTabService } from "@delon/abc/reuse-tab"; + +@Component({ + selector: 'app-socials-provider-binduser', + templateUrl: './socials-provider-bind-user.component.html', + styles: [ + ` + nz-form-item { + width: 100%; + } + ` + ], + styleUrls: ['./socials-provider-bind-user.component.less'] +}) +export class SocialsProviderBindUserComponent implements OnInit { + @Input() socialUserId?: String; + @Input() provider?: String; + loading = false; + count = 0; + formGroup: FormGroup = new FormGroup({}); + interval$: any; + constructor( + private modalRef: NzModalRef, + private fb: FormBuilder, + private authnService: AuthnService, + private msg: NzMessageService, + private socialsProviderService: SocialsProviderService, + @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService, + @Inject(ReuseTabService) + private reuseTabService: ReuseTabService, + private cdr: ChangeDetectorRef + ) {} + + ngOnInit(): void { + this.formGroup = this.fb.group({ + telephone: [null, [Validators.required]], + verificationCode: [null, [Validators.required]] + }); + console.log("bind open form : ",this.provider,this.socialUserId) + } + + onClose(e: MouseEvent): void { + e.preventDefault(); + this.modalRef.destroy({ refresh: false }); + } + + onSubmit(e: MouseEvent): void { + console.log("this.formGroup.valid",this.formGroup.valid) + //表单验证 + if (this.formGroup.valid) { + let request = { + username: this.socialUserId, + mobile: this.formGroup.get('telephone')?.value, + code: this.formGroup.get('verificationCode')?.value, + authType: this.provider + } + this.authnService.bindSocialsUser(request).subscribe(res => { + if (res.code === 0) { + // 清空路由复用信息 + this.reuseTabService.clear(); + // 设置用户Token信息 + this.authnService.auth(res.data); + this.authnService.navigate({}); + } else { + this.msg.error(`绑定失败`); + } + }); + + } else { + Object.values(this.formGroup.controls).forEach(control => { + if (control.invalid) { + control.markAsDirty(); + control.updateValueAndValidity({ onlySelf: true }); + } + }); + } + + e.preventDefault(); + } + + sendOtpCode(): void { + + this.authnService.produceOtp({ mobile:this.formGroup.get('telephone')?.value}).subscribe(res => { + if (res.code !== 0) { + this.msg.error(`发送失败`); + }else { + this.msg.success(`发送成功`); + } + }); + this.count = 59; + this.interval$ = setInterval(() => { + this.count -= 1; + if (this.count <= 0) { + clearInterval(this.interval$); + } + this.cdr.detectChanges(); + }, 1000); + } +} diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts b/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts index 5bbc345cb..6f60fc904 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/service/authn.service.ts @@ -61,6 +61,10 @@ export class AuthnService { return this.http.post('/login/signin?_allow_anonymous=true', authParam); } + bindSocialsUser(authParam: any) { + return this.http.post('/login/signin/bindusersocials?_allow_anonymous=true', authParam); + } + //退出 logout() { this.cookieService.delete(CONSTS.CONGRESS, '/'); diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/service/socials-provider.service.ts b/maxkey-web-frontend/maxkey-web-app/src/app/service/socials-provider.service.ts index d16d006c9..0127d04e6 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/service/socials-provider.service.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/service/socials-provider.service.ts @@ -43,7 +43,15 @@ export class SocialsProviderService extends BaseService { return this.getByParams(params, `/logon/oauth20/callback/${provider}?_allow_anonymous=true`); } + bindUser(provider: string, params: NzSafeAny): Observable> { + return this.getByParams(params, `/logon/oauth20/binduser/${provider}?_allow_anonymous=true`); + } + bind(provider: string, params: NzSafeAny): Observable> { return this.getByParams(params, `/logon/oauth20/bind/${provider}?_allow_anonymous=true`); } + + qrcallback(provider: string, token: string ): Observable> { + return this.getByParams({}, `/logon/oauth20/qrcallback/${provider}/${token}?_allow_anonymous=true`); + } } diff --git a/maxkey-web-frontend/maxkey-web-app/src/assets/qrcode/qrcode.min.js b/maxkey-web-frontend/maxkey-web-app/src/assets/qrcode/qrcode.min.js new file mode 100644 index 000000000..0e8d21720 --- /dev/null +++ b/maxkey-web-frontend/maxkey-web-app/src/assets/qrcode/qrcode.min.js @@ -0,0 +1,614 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype={addData:function(data){var newData=new QR8bitByte(data);this.dataList.push(newData);this.dataCache=null;},isDark:function(row,col){if(row<0||this.moduleCount<=row||col<0||this.moduleCount<=col){throw new Error(row+","+col);} + return this.modules[row][col];},getModuleCount:function(){return this.moduleCount;},make:function(){this.makeImpl(false,this.getBestMaskPattern());},makeImpl:function(test,maskPattern){this.moduleCount=this.typeNumber*4+17;this.modules=new Array(this.moduleCount);for(var row=0;row=7){this.setupTypeNumber(test);} + if(this.dataCache==null){this.dataCache=QRCodeModel.createData(this.typeNumber,this.errorCorrectLevel,this.dataList);} + this.mapData(this.dataCache,maskPattern);},setupPositionProbePattern:function(row,col){for(var r=-1;r<=7;r++){if(row+r<=-1||this.moduleCount<=row+r)continue;for(var c=-1;c<=7;c++){if(col+c<=-1||this.moduleCount<=col+c)continue;if((0<=r&&r<=6&&(c==0||c==6))||(0<=c&&c<=6&&(r==0||r==6))||(2<=r&&r<=4&&2<=c&&c<=4)){this.modules[row+r][col+c]=true;}else{this.modules[row+r][col+c]=false;}}}},getBestMaskPattern:function(){var minLostPoint=0;var pattern=0;for(var i=0;i<8;i++){this.makeImpl(true,i);var lostPoint=QRUtil.getLostPoint(this);if(i==0||minLostPoint>lostPoint){minLostPoint=lostPoint;pattern=i;}} + return pattern;},createMovieClip:function(target_mc,instance_name,depth){var qr_mc=target_mc.createEmptyMovieClip(instance_name,depth);var cs=1;this.make();for(var row=0;row>i)&1)==1);this.modules[Math.floor(i/3)][i%3+this.moduleCount-8-3]=mod;} + for(var i=0;i<18;i++){var mod=(!test&&((bits>>i)&1)==1);this.modules[i%3+this.moduleCount-8-3][Math.floor(i/3)]=mod;}},setupTypeInfo:function(test,maskPattern){var data=(this.errorCorrectLevel<<3)|maskPattern;var bits=QRUtil.getBCHTypeInfo(data);for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<6){this.modules[i][8]=mod;}else if(i<8){this.modules[i+1][8]=mod;}else{this.modules[this.moduleCount-15+i][8]=mod;}} + for(var i=0;i<15;i++){var mod=(!test&&((bits>>i)&1)==1);if(i<8){this.modules[8][this.moduleCount-i-1]=mod;}else if(i<9){this.modules[8][15-i-1+1]=mod;}else{this.modules[8][15-i-1]=mod;}} + this.modules[this.moduleCount-8][8]=(!test);},mapData:function(data,maskPattern){var inc=-1;var row=this.moduleCount-1;var bitIndex=7;var byteIndex=0;for(var col=this.moduleCount-1;col>0;col-=2){if(col==6)col--;while(true){for(var c=0;c<2;c++){if(this.modules[row][col-c]==null){var dark=false;if(byteIndex>>bitIndex)&1)==1);} + var mask=QRUtil.getMask(maskPattern,row,col-c);if(mask){dark=!dark;} + this.modules[row][col-c]=dark;bitIndex--;if(bitIndex==-1){byteIndex++;bitIndex=7;}}} + row+=inc;if(row<0||this.moduleCount<=row){row-=inc;inc=-inc;break;}}}}};QRCodeModel.PAD0=0xEC;QRCodeModel.PAD1=0x11;QRCodeModel.createData=function(typeNumber,errorCorrectLevel,dataList){var rsBlocks=QRRSBlock.getRSBlocks(typeNumber,errorCorrectLevel);var buffer=new QRBitBuffer();for(var i=0;itotalDataCount*8){throw new Error("code length overflow. (" + +buffer.getLengthInBits() + +">" + +totalDataCount*8 + +")");} + if(buffer.getLengthInBits()+4<=totalDataCount*8){buffer.put(0,4);} + while(buffer.getLengthInBits()%8!=0){buffer.putBit(false);} + while(true){if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD0,8);if(buffer.getLengthInBits()>=totalDataCount*8){break;} + buffer.put(QRCodeModel.PAD1,8);} + return QRCodeModel.createBytes(buffer,rsBlocks);};QRCodeModel.createBytes=function(buffer,rsBlocks){var offset=0;var maxDcCount=0;var maxEcCount=0;var dcdata=new Array(rsBlocks.length);var ecdata=new Array(rsBlocks.length);for(var r=0;r=0)?modPoly.get(modIndex):0;}} + var totalCodeCount=0;for(var i=0;i=0){d^=(QRUtil.G15<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G15)));} + return((data<<10)|d)^QRUtil.G15_MASK;},getBCHTypeNumber:function(data){var d=data<<12;while(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)>=0){d^=(QRUtil.G18<<(QRUtil.getBCHDigit(d)-QRUtil.getBCHDigit(QRUtil.G18)));} + return(data<<12)|d;},getBCHDigit:function(data){var digit=0;while(data!=0){digit++;data>>>=1;} + return digit;},getPatternPosition:function(typeNumber){return QRUtil.PATTERN_POSITION_TABLE[typeNumber-1];},getMask:function(maskPattern,i,j){switch(maskPattern){case QRMaskPattern.PATTERN000:return(i+j)%2==0;case QRMaskPattern.PATTERN001:return i%2==0;case QRMaskPattern.PATTERN010:return j%3==0;case QRMaskPattern.PATTERN011:return(i+j)%3==0;case QRMaskPattern.PATTERN100:return(Math.floor(i/2)+Math.floor(j/3))%2==0;case QRMaskPattern.PATTERN101:return(i*j)%2+(i*j)%3==0;case QRMaskPattern.PATTERN110:return((i*j)%2+(i*j)%3)%2==0;case QRMaskPattern.PATTERN111:return((i*j)%3+(i+j)%2)%2==0;default:throw new Error("bad maskPattern:"+maskPattern);}},getErrorCorrectPolynomial:function(errorCorrectLength){var a=new QRPolynomial([1],0);for(var i=0;i5){lostPoint+=(3+sameCount-5);}}} + for(var row=0;row=256){n-=255;} + return QRMath.EXP_TABLE[n];},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)};for(var i=0;i<8;i++){QRMath.EXP_TABLE[i]=1<>>(7-index%8))&1)==1;},put:function(num,length){for(var i=0;i>>(length-i-1))&1)==1);}},getLengthInBits:function(){return this.length;},putBit:function(bit){var bufIndex=Math.floor(this.length/8);if(this.buffer.length<=bufIndex){this.buffer.push(0);} + if(bit){this.buffer[bufIndex]|=(0x80>>>(this.length%8));} + this.length++;}};var QRCodeLimitLength=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]]; + + function _isSupportCanvas() { + return typeof CanvasRenderingContext2D != "undefined"; + } + + // android 2.x doesn't support Data-URI spec + function _getAndroid() { + var android = false; + var sAgent = navigator.userAgent; + + if (/android/i.test(sAgent)) { // android + android = true; + var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i); + + if (aMat && aMat[1]) { + android = parseFloat(aMat[1]); + } + } + + return android; + } + + var svgDrawer = (function() { + + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + + this.clear(); + + function makeSVG(tag, attrs) { + var el = document.createElementNS('http://www.w3.org/2000/svg', tag); + for (var k in attrs) + if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]); + return el; + } + + var svg = makeSVG("svg" , {'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight}); + svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink"); + _el.appendChild(svg); + + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorLight, "width": "100%", "height": "100%"})); + svg.appendChild(makeSVG("rect", {"fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template"})); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + if (oQRCode.isDark(row, col)) { + var child = makeSVG("use", {"x": String(col), "y": String(row)}); + child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template") + svg.appendChild(child); + } + } + } + }; + Drawing.prototype.clear = function () { + while (this._el.hasChildNodes()) + this._el.removeChild(this._el.lastChild); + }; + return Drawing; + })(); + + var useSVG = document.documentElement.tagName.toLowerCase() === "svg"; + + // Drawing in DOM by using Table tag + var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + var aHTML = ['']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
'); + _el.innerHTML = aHTML.join(''); + + // Fix the margin values as real size. + var elTable = _el.childNodes[0]; + var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2; + var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2; + + if (nLeftMarginTable > 0 && nTopMarginTable > 0) { + elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px"; + } + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._el.innerHTML = ''; + }; + + return Drawing; + })() : (function () { // Drawing in Canvas + function _onMakeImage() { + this._elImage.src = this._elCanvas.toDataURL("image/png"); + this._elImage.style.display = "inline"; + this._elCanvas.style.display = "none"; + } + + // Android 2.1 bug workaround + // http://code.google.com/p/android/issues/detail?id=5141 + if (this._android && this._android <= 2.1) { + var factor = 1 / window.devicePixelRatio; + var drawImage = CanvasRenderingContext2D.prototype.drawImage; + CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) { + if (("nodeName" in image) && /img/i.test(image.nodeName)) { + for (var i = arguments.length - 1; i >= 1; i--) { + arguments[i] = arguments[i] * factor; + } + } else if (typeof dw == "undefined") { + arguments[1] *= factor; + arguments[2] *= factor; + arguments[3] *= factor; + arguments[4] *= factor; + } + + drawImage.apply(this, arguments); + }; + } + + /** + * Check whether the user's browser supports Data URI or not + * + * @private + * @param {Function} fSuccess Occurs if it supports Data URI + * @param {Function} fFail Occurs if it doesn't support Data URI + */ + function _safeSetDataURI(fSuccess, fFail) { + var self = this; + self._fFail = fFail; + self._fSuccess = fSuccess; + + // Check it just once + if (self._bSupportDataURI === null) { + var el = document.createElement("img"); + var fOnError = function() { + self._bSupportDataURI = false; + + if (self._fFail) { + self._fFail.call(self); + } + }; + var fOnSuccess = function() { + self._bSupportDataURI = true; + + if (self._fSuccess) { + self._fSuccess.call(self); + } + }; + + el.onabort = fOnError; + el.onerror = fOnError; + el.onload = fOnSuccess; + el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data. + return; + } else if (self._bSupportDataURI === true && self._fSuccess) { + self._fSuccess.call(self); + } else if (self._bSupportDataURI === false && self._fFail) { + self._fFail.call(self); + } + }; + + /** + * Drawing QRCode by using canvas + * + * @constructor + * @param {HTMLElement} el + * @param {Object} htOption QRCode Options + */ + var Drawing = function (el, htOption) { + this._bIsPainted = false; + this._android = _getAndroid(); + + this._htOption = htOption; + this._elCanvas = document.createElement("canvas"); + this._elCanvas.width = htOption.width; + this._elCanvas.height = htOption.height; + el.appendChild(this._elCanvas); + this._el = el; + this._oContext = this._elCanvas.getContext("2d"); + this._bIsPainted = false; + this._elImage = document.createElement("img"); + this._elImage.alt = "Scan me!"; + this._elImage.style.display = "none"; + this._el.appendChild(this._elImage); + this._bSupportDataURI = null; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _elImage = this._elImage; + var _oContext = this._oContext; + var _htOption = this._htOption; + + var nCount = oQRCode.getModuleCount(); + var nWidth = _htOption.width / nCount; + var nHeight = _htOption.height / nCount; + var nRoundedWidth = Math.round(nWidth); + var nRoundedHeight = Math.round(nHeight); + + _elImage.style.display = "none"; + this.clear(); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + var bIsDark = oQRCode.isDark(row, col); + var nLeft = col * nWidth; + var nTop = row * nHeight; + _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.lineWidth = 1; + _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.fillRect(nLeft, nTop, nWidth, nHeight); + + // 안티 앨리어싱 방지 처리 + _oContext.strokeRect( + Math.floor(nLeft) + 0.5, + Math.floor(nTop) + 0.5, + nRoundedWidth, + nRoundedHeight + ); + + _oContext.strokeRect( + Math.ceil(nLeft) - 0.5, + Math.ceil(nTop) - 0.5, + nRoundedWidth, + nRoundedHeight + ); + } + } + + this._bIsPainted = true; + }; + + /** + * Make the image from Canvas if the browser supports Data URI. + */ + Drawing.prototype.makeImage = function () { + if (this._bIsPainted) { + _safeSetDataURI.call(this, _onMakeImage); + } + }; + + /** + * Return whether the QRCode is painted or not + * + * @return {Boolean} + */ + Drawing.prototype.isPainted = function () { + return this._bIsPainted; + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height); + this._bIsPainted = false; + }; + + /** + * @private + * @param {Number} nNumber + */ + Drawing.prototype.round = function (nNumber) { + if (!nNumber) { + return nNumber; + } + + return Math.floor(nNumber * 1000) / 1000; + }; + + return Drawing; + })(); + + /** + * Get the type by string length + * + * @private + * @param {String} sText + * @param {Number} nCorrectLevel + * @return {Number} type + */ + function _getTypeNumber(sText, nCorrectLevel) { + var nType = 1; + var length = _getUTF8Length(sText); + + for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) { + var nLimit = 0; + + switch (nCorrectLevel) { + case QRErrorCorrectLevel.L : + nLimit = QRCodeLimitLength[i][0]; + break; + case QRErrorCorrectLevel.M : + nLimit = QRCodeLimitLength[i][1]; + break; + case QRErrorCorrectLevel.Q : + nLimit = QRCodeLimitLength[i][2]; + break; + case QRErrorCorrectLevel.H : + nLimit = QRCodeLimitLength[i][3]; + break; + } + + if (length <= nLimit) { + break; + } else { + nType++; + } + } + + if (nType > QRCodeLimitLength.length) { + throw new Error("Too long data"); + } + + return nType; + } + + function _getUTF8Length(sText) { + var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a'); + return replacedText.length + (replacedText.length != sText ? 3 : 0); + } + + /** + * @class QRCode + * @constructor + * @example + * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie"); + * + * @example + * var oQRCode = new QRCode("test", { + * text : "http://naver.com", + * width : 128, + * height : 128 + * }); + * + * oQRCode.clear(); // Clear the QRCode. + * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode. + * + * @param {HTMLElement|String} el target element or 'id' attribute of element. + * @param {Object|String} vOption + * @param {String} vOption.text QRCode link data + * @param {Number} [vOption.width=256] + * @param {Number} [vOption.height=256] + * @param {String} [vOption.colorDark="#000000"] + * @param {String} [vOption.colorLight="#ffffff"] + * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H] + */ + QRCode = function (el, vOption) { + this._htOption = { + width : 256, + height : 256, + typeNumber : 4, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRErrorCorrectLevel.H + }; + + if (typeof vOption === 'string') { + vOption = { + text : vOption + }; + } + + // Overwrites options + if (vOption) { + for (var i in vOption) { + this._htOption[i] = vOption[i]; + } + } + + if (typeof el == "string") { + el = document.getElementById(el); + } + + if (this._htOption.useSVG) { + Drawing = svgDrawer; + } + + this._android = _getAndroid(); + this._el = el; + this._oQRCode = null; + this._oDrawing = new Drawing(this._el, this._htOption); + + if (this._htOption.text) { + this.makeCode(this._htOption.text); + } + }; + + /** + * Make the QRCode + * + * @param {String} sText link data + */ + QRCode.prototype.makeCode = function (sText) { + this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel); + this._oQRCode.addData(sText); + this._oQRCode.make(); + this._el.title = ""; + this._oDrawing.draw(this._oQRCode); + this.makeImage(); + }; + + /** + * Make the Image from Canvas element + * - It occurs automatically + * - Android below 3 doesn't support Data-URI spec. + * + * @private + */ + QRCode.prototype.makeImage = function () { + if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) { + this._oDrawing.makeImage(); + } + }; + + /** + * Clear the QRCode + */ + QRCode.prototype.clear = function () { + this._oDrawing.clear(); + }; + + /** + * @name QRCode.CorrectLevel + */ + QRCode.CorrectLevel = QRErrorCorrectLevel; +})(); diff --git a/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts b/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts index 22597535b..19f85f6ea 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts @@ -27,7 +27,7 @@ export const environment = { production: false, useHash: true, api: { - baseUrl: 'http://sso.maxkey.top:9527/sign/', + baseUrl: '/sign/', refreshTokenEnabled: true, refreshTokenType: 're-request' }, diff --git a/maxkey-web-frontend/maxkey-web-app/src/index.html b/maxkey-web-frontend/maxkey-web-app/src/index.html index d6a909213..8bbdd0285 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/index.html +++ b/maxkey-web-frontend/maxkey-web-app/src/index.html @@ -27,6 +27,7 @@ +